diff --git a/.editorconfig b/.editorconfig
index 872a068c7c6..58d0d332bbe 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,7 +9,7 @@ indent_style = space
 tab_width = 4
 
 # New line preferences
-#end_of_line = crlf
+end_of_line = crlf:suggestion
 insert_final_newline = true
 trim_trailing_whitespace = true
 
@@ -104,6 +104,7 @@ csharp_preferred_modifier_order = public, private, protected, internal, new, abs
 
 # 'using' directive preferences
 csharp_using_directive_placement = outside_namespace:silent
+csharp_style_namespace_declarations = file_scoped:suggestion
 
 #### C# Formatting Rules ####
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0e0d3ae890c..dc6e26cbeaa 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,10 @@
 {
     "omnisharp.analyzeOpenDocumentsOnly": true,
-    "dotnet.defaultSolution": "SpaceStation14.sln"
+    "dotnet.defaultSolution": "SpaceStation14.sln",
+    "json.schemas": [
+        {
+            "fileMatch": [ "**/meta.json" ],
+            "url": "https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/.github/rsi-schema.json"
+        }
+    ]
 }
diff --git a/Content.Client/Access/AccessOverlay.cs b/Content.Client/Access/AccessOverlay.cs
index 2be3d07e90d..59c9441036d 100644
--- a/Content.Client/Access/AccessOverlay.cs
+++ b/Content.Client/Access/AccessOverlay.cs
@@ -9,20 +9,20 @@ namespace Content.Client.Access;
 
 public sealed class AccessOverlay : Overlay
 {
+    private const string TextFontPath = "/Fonts/NotoSans/NotoSans-Regular.ttf";
+    private const int TextFontSize = 12;
+
     private readonly IEntityManager _entityManager;
-    private readonly EntityLookupSystem _lookup;
-    private readonly SharedTransformSystem _xform;
+    private readonly SharedTransformSystem _transformSystem;
     private readonly Font _font;
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
 
-    public AccessOverlay(IEntityManager entManager, IResourceCache cache, EntityLookupSystem lookup, SharedTransformSystem xform)
+    public AccessOverlay(IEntityManager entityManager, IResourceCache resourceCache, SharedTransformSystem transformSystem)
     {
-        _entityManager = entManager;
-        _lookup = lookup;
-        _xform = xform;
-
-        _font = cache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 12);
+        _entityManager = entityManager;
+        _transformSystem = transformSystem;
+        _font = resourceCache.GetFont(TextFontPath, TextFontSize);
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -30,52 +30,65 @@ protected override void Draw(in OverlayDrawArgs args)
         if (args.ViewportControl == null)
             return;
 
-        var readerQuery = _entityManager.GetEntityQuery<AccessReaderComponent>();
-        var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
-
-        foreach (var ent in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldAABB,
-                         LookupFlags.Static | LookupFlags.Approximate))
+        var textBuffer = new StringBuilder();
+        var query = _entityManager.EntityQueryEnumerator<AccessReaderComponent, TransformComponent>();
+        while (query.MoveNext(out var uid, out var accessReader, out var transform))
         {
-            if (!readerQuery.TryGetComponent(ent, out var reader) ||
-                !xformQuery.TryGetComponent(ent, out var xform))
+            textBuffer.Clear();
+
+            var entityName = _entityManager.ToPrettyString(uid);
+            textBuffer.AppendLine(entityName.Prototype);
+            textBuffer.Append("UID: ");
+            textBuffer.Append(entityName.Uid.Id);
+            textBuffer.Append(", NUID: ");
+            textBuffer.Append(entityName.Nuid.Id);
+            textBuffer.AppendLine();
+
+            if (!accessReader.Enabled)
             {
+                textBuffer.AppendLine("-Disabled");
                 continue;
             }
 
-            var text = new StringBuilder();
-            var index = 0;
-            var a = $"{_entityManager.ToPrettyString(ent)}";
-            text.Append(a);
-
-            foreach (var list in reader.AccessLists)
+            if (accessReader.AccessLists.Count > 0)
             {
-                a = $"Tag {index}";
-                text.AppendLine(a);
-
-                foreach (var entry in list)
+                var groupNumber = 0;
+                foreach (var accessList in accessReader.AccessLists)
                 {
-                    a = $"- {entry}";
-                    text.AppendLine(a);
+                    groupNumber++;
+                    foreach (var entry in accessList)
+                    {
+                        textBuffer.Append("+Set ");
+                        textBuffer.Append(groupNumber);
+                        textBuffer.Append(": ");
+                        textBuffer.Append(entry.Id);
+                        textBuffer.AppendLine();
+                    }
                 }
-
-                index++;
             }
-
-            string textStr;
-
-            if (text.Length >= 2)
+            else
             {
-                textStr = text.ToString();
-                textStr = textStr[..^2];
+                textBuffer.AppendLine("+Unrestricted");
             }
-            else
+
+            foreach (var key in accessReader.AccessKeys)
             {
-                textStr = "";
+                textBuffer.Append("+Key ");
+                textBuffer.Append(key.OriginStation);
+                textBuffer.Append(": ");
+                textBuffer.Append(key.Id);
+                textBuffer.AppendLine();
             }
 
-            var screenPos = args.ViewportControl.WorldToScreen(_xform.GetWorldPosition(xform));
+            foreach (var tag in accessReader.DenyTags)
+            {
+                textBuffer.Append("-Tag ");
+                textBuffer.AppendLine(tag.Id);
+            }
 
-            args.ScreenHandle.DrawString(_font, screenPos, textStr, Color.Gold);
+            var accessInfoText = textBuffer.ToString();
+            var screenPos = args.ViewportControl.WorldToScreen(_transformSystem.GetWorldPosition(transform));
+            args.ScreenHandle.DrawString(_font, screenPos, accessInfoText, Color.Gold);
         }
     }
 }
diff --git a/Content.Client/Access/Commands/ShowAccessReadersCommand.cs b/Content.Client/Access/Commands/ShowAccessReadersCommand.cs
index 7c804dd9698..cb6cb6cf6bb 100644
--- a/Content.Client/Access/Commands/ShowAccessReadersCommand.cs
+++ b/Content.Client/Access/Commands/ShowAccessReadersCommand.cs
@@ -7,8 +7,16 @@ namespace Content.Client.Access.Commands;
 public sealed class ShowAccessReadersCommand : IConsoleCommand
 {
     public string Command => "showaccessreaders";
-    public string Description => "Shows all access readers in the viewport";
-    public string Help => $"{Command}";
+
+    public string Description => "Toggles showing access reader permissions on the map";
+    public string Help => """
+        Overlay Info:
+        -Disabled | The access reader is disabled
+        +Unrestricted | The access reader has no restrictions
+        +Set [Index]: [Tag Name]| A tag in an access set (accessor needs all tags in the set to be allowed by the set)
+        +Key [StationUid]: [StationRecordKeyId] | A StationRecordKey that is allowed
+        -Tag [Tag Name] | A tag that is not allowed (takes priority over other allows)
+        """;
     public void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         var collection = IoCManager.Instance;
@@ -26,10 +34,9 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
 
         var entManager = collection.Resolve<IEntityManager>();
         var cache = collection.Resolve<IResourceCache>();
-        var lookup = entManager.System<EntityLookupSystem>();
         var xform = entManager.System<SharedTransformSystem>();
 
-        overlay.AddOverlay(new AccessOverlay(entManager, cache, lookup, xform));
+        overlay.AddOverlay(new AccessOverlay(entManager, cache, xform));
         shell.WriteLine($"Set access reader debug overlay to true");
     }
 }
diff --git a/Content.Client/Access/UI/AccessLevelControl.xaml b/Content.Client/Access/UI/AccessLevelControl.xaml
new file mode 100644
index 00000000000..56968d89839
--- /dev/null
+++ b/Content.Client/Access/UI/AccessLevelControl.xaml
@@ -0,0 +1,4 @@
+<GridContainer xmlns="https://spacestation14.io"
+               Columns="5"
+               HorizontalAlignment="Center">
+</GridContainer>
diff --git a/Content.Client/Access/UI/AccessLevelControl.xaml.cs b/Content.Client/Access/UI/AccessLevelControl.xaml.cs
new file mode 100644
index 00000000000..34db80b7af9
--- /dev/null
+++ b/Content.Client/Access/UI/AccessLevelControl.xaml.cs
@@ -0,0 +1,52 @@
+using System.Linq;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Content.Shared.Access;
+using Content.Shared.Access.Systems;
+
+namespace Content.Client.Access.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class AccessLevelControl : GridContainer
+{
+    public readonly Dictionary<ProtoId<AccessLevelPrototype>, Button> ButtonsList = new();
+
+    public AccessLevelControl()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototypeManager prototypeManager)
+    {
+        foreach (var access in accessLevels)
+        {
+            if (!prototypeManager.TryIndex(access, out var accessLevel))
+            {
+                Logger.Error($"Unable to find accesslevel for {access}");
+                continue;
+            }
+
+            var newButton = new Button
+            {
+                Text = accessLevel.GetAccessLevelName(),
+                ToggleMode = true,
+            };
+            AddChild(newButton);
+            ButtonsList.Add(accessLevel.ID, newButton);
+        }
+    }
+
+    public void UpdateState(
+        List<ProtoId<AccessLevelPrototype>> pressedList,
+        List<ProtoId<AccessLevelPrototype>>? enabledList = null)
+    {
+        foreach (var (accessName, button) in ButtonsList)
+        {
+            button.Pressed = pressedList.Contains(accessName);
+            button.Disabled = !(enabledList?.Contains(accessName) ?? true);
+        }
+    }
+}
diff --git a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
index 0c23542f798..c1b63dc4d05 100644
--- a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
+++ b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
@@ -64,7 +64,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window?.UpdateState(castState);
         }
 
-        public void SubmitData(List<string> newAccessList)
+        public void SubmitData(List<ProtoId<AccessLevelPrototype>> newAccessList)
         {
             SendMessage(new WriteToTargetAccessReaderIdMessage(newAccessList));
         }
diff --git a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
index 2fd00571215..6025c3b551f 100644
--- a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
+++ b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
@@ -16,7 +16,6 @@ public sealed partial class AccessOverriderWindow : DefaultWindow
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-        private readonly ISawmill _logMill = default!;
         private readonly AccessOverriderBoundUserInterface _owner;
         private readonly Dictionary<string, Button> _accessButtons = new();
 
@@ -25,7 +24,7 @@ public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototype
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
-            _logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill);
+            var logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill);
 
             _owner = owner;
 
@@ -33,13 +32,13 @@ public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototype
             {
                 if (!prototypeManager.TryIndex(access, out var accessLevel))
                 {
-                    _logMill.Error($"Unable to find accesslevel for {access}");
+                    logMill.Error($"Unable to find accesslevel for {access}");
                     continue;
                 }
 
                 var newButton = new Button
                 {
-                    Text = GetAccessLevelName(accessLevel),
+                    Text = accessLevel.GetAccessLevelName(),
                     ToggleMode = true,
                 };
 
@@ -49,14 +48,6 @@ public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototype
             }
         }
 
-        private static string GetAccessLevelName(AccessLevelPrototype prototype)
-        {
-            if (prototype.Name is { } name)
-                return Loc.GetString(name);
-
-            return prototype.ID;
-        }
-
         public void UpdateState(AccessOverriderBoundUserInterfaceState state)
         {
             PrivilegedIdLabel.Text = state.PrivilegedIdName;
@@ -105,7 +96,7 @@ 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 => x.Key).ToList());
+                _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId<AccessLevelPrototype>(x.Key)).ToList());
         }
     }
 }
diff --git a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
index 898792aa030..5b7011c195a 100644
--- a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
+++ b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
+using Content.Shared.Access;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
@@ -28,7 +29,6 @@ protected override void Open()
             if (EntMan.TryGetComponent<IdCardConsoleComponent>(Owner, out var idCard))
             {
                 accessLevels = idCard.AccessLevels;
-                accessLevels.Sort();
             }
             else
             {
@@ -65,7 +65,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window?.UpdateState(castState);
         }
 
-        public void SubmitData(string newFullName, string newJobTitle, List<string> newAccessList, string newJobPrototype)
+        public void SubmitData(string newFullName, string newJobTitle, List<ProtoId<AccessLevelPrototype>> newAccessList, string newJobPrototype)
         {
             if (newFullName.Length > MaxFullNameLength)
                 newFullName = newFullName[..MaxFullNameLength];
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
index c29adc8ebd3..a2f5f3382bb 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
@@ -30,10 +30,6 @@
             <Label Text="{Loc 'id-card-console-window-job-selection-label'}" />
             <OptionButton Name="JobPresetOptionButton" />
         </GridContainer>
-        <GridContainer Name="AccessLevelGrid" Columns="5" HorizontalAlignment="Center">
-
-            <!-- Access level buttons are added here by the C# code -->
-
-        </GridContainer>
+        <Control Name="AccessLevelControlContainer" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
index bf5984e8096..298912e7d53 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@@ -20,7 +20,7 @@ public sealed partial class IdCardConsoleWindow : DefaultWindow
 
         private readonly IdCardConsoleBoundUserInterface _owner;
 
-        private readonly Dictionary<string, Button> _accessButtons = new();
+        private AccessLevelControl _accessButtons = new();
         private readonly List<string> _jobPrototypeIds = new();
 
         private string? _lastFullName;
@@ -66,36 +66,18 @@ public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeMana
 
             JobPresetOptionButton.OnItemSelected += SelectJobPreset;
 
-            foreach (var access in accessLevels)
-            {
-                if (!prototypeManager.TryIndex<AccessLevelPrototype>(access, out var accessLevel))
-                {
-                    _logMill.Error($"Unable to find accesslevel for {access}");
-                    continue;
-                }
+            _accessButtons.Populate(accessLevels, prototypeManager);
+            AccessLevelControlContainer.AddChild(_accessButtons);
 
-                var newButton = new Button
-                {
-                    Text = GetAccessLevelName(accessLevel),
-                    ToggleMode = true,
-                };
-                AccessLevelGrid.AddChild(newButton);
-                _accessButtons.Add(accessLevel.ID, newButton);
-                newButton.OnPressed += _ => SubmitData();
+            foreach (var (id, button) in _accessButtons.ButtonsList)
+            {
+                button.OnPressed += _ => SubmitData();
             }
         }
 
-        private static string GetAccessLevelName(AccessLevelPrototype prototype)
-        {
-            if (prototype.Name is { } name)
-                return Loc.GetString(name);
-
-            return prototype.ID;
-        }
-
         private void ClearAllAccess()
         {
-            foreach (var button in _accessButtons.Values)
+            foreach (var button in _accessButtons.ButtonsList.Values)
             {
                 if (button.Pressed)
                 {
@@ -119,7 +101,7 @@ private void SelectJobPreset(OptionButton.ItemSelectedEventArgs args)
             // this is a sussy way to do this
             foreach (var access in job.Access)
             {
-                if (_accessButtons.TryGetValue(access, out var button) && !button.Disabled)
+                if (_accessButtons.ButtonsList.TryGetValue(access, out var button) && !button.Disabled)
                 {
                     button.Pressed = true;
                 }
@@ -134,7 +116,7 @@ private void SelectJobPreset(OptionButton.ItemSelectedEventArgs args)
 
                 foreach (var access in groupPrototype.Tags)
                 {
-                    if (_accessButtons.TryGetValue(access, out var button) && !button.Disabled)
+                    if (_accessButtons.ButtonsList.TryGetValue(access, out var button) && !button.Disabled)
                     {
                         button.Pressed = true;
                     }
@@ -184,15 +166,10 @@ public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
 
             JobPresetOptionButton.Disabled = !interfaceEnabled;
 
-            foreach (var (accessName, button) in _accessButtons)
-            {
-                button.Disabled = !interfaceEnabled;
-                if (interfaceEnabled)
-                {
-                    button.Pressed = state.TargetIdAccessList?.Contains(accessName) ?? false;
-                    button.Disabled = (!state.AllowedModifyAccessList?.Contains(accessName)) ?? true;
-                }
-            }
+            _accessButtons.UpdateState(state.TargetIdAccessList?.ToList() ??
+                                       new List<ProtoId<AccessLevelPrototype>>(),
+                                       state.AllowedModifyAccessList?.ToList() ??
+                                       new List<ProtoId<AccessLevelPrototype>>());
 
             var jobIndex = _jobPrototypeIds.IndexOf(state.TargetIdJobPrototype);
             if (jobIndex >= 0)
@@ -215,7 +192,7 @@ private void SubmitData()
                 FullNameLineEdit.Text,
                 JobTitleLineEdit.Text,
                 // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
-                _accessButtons.Where(x => x.Value.Pressed).Select(x => x.Key).ToList(),
+                _accessButtons.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList(),
                 jobProtoDirty ? _jobPrototypeIds[JobPresetOptionButton.SelectedId] : string.Empty);
         }
     }
diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs
index 237f24e3eae..223bf7876ac 100644
--- a/Content.Client/Alerts/ClientAlertsSystem.cs
+++ b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -49,24 +49,23 @@ public IReadOnlyDictionary<AlertKey, AlertState>? ActiveAlerts
 
     protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
     {
-        if (_playerManager.LocalEntity != alerts.Owner)
-            return;
-
-        SyncAlerts?.Invoke(this, alerts.Comp.Alerts);
+        UpdateHud(alerts);
     }
 
-    protected override void AfterClearAlert(Entity<AlertsComponent> alertsComponent)
+    protected override void AfterClearAlert(Entity<AlertsComponent> alerts)
     {
-        if (_playerManager.LocalEntity != alertsComponent.Owner)
-            return;
+        UpdateHud(alerts);
+    }
 
-        SyncAlerts?.Invoke(this, alertsComponent.Comp.Alerts);
+    private void ClientAlertsHandleState(Entity<AlertsComponent> alerts, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateHud(alerts);
     }
 
-    private void ClientAlertsHandleState(EntityUid uid, AlertsComponent component, ref AfterAutoHandleStateEvent args)
+    private void UpdateHud(Entity<AlertsComponent> entity)
     {
-        if (_playerManager.LocalEntity == uid)
-            SyncAlerts?.Invoke(this, component.Alerts);
+        if (_playerManager.LocalEntity == entity.Owner)
+            SyncAlerts?.Invoke(this, entity.Comp.Alerts);
     }
 
     private void OnPlayerAttached(EntityUid uid, AlertsComponent component, LocalPlayerAttachedEvent args)
diff --git a/Content.Client/Alerts/UpdateAlertSpriteEvent.cs b/Content.Client/Alerts/UpdateAlertSpriteEvent.cs
new file mode 100644
index 00000000000..4f182c458cc
--- /dev/null
+++ b/Content.Client/Alerts/UpdateAlertSpriteEvent.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Alert;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Alerts;
+
+/// <summary>
+/// Event raised on an entity with alerts in order to allow it to update visuals for the alert sprite entity.
+/// </summary>
+[ByRefEvent]
+public record struct UpdateAlertSpriteEvent
+{
+    public Entity<SpriteComponent> SpriteViewEnt;
+
+    public AlertPrototype Alert;
+
+    public UpdateAlertSpriteEvent(Entity<SpriteComponent> spriteViewEnt, AlertPrototype alert)
+    {
+        SpriteViewEnt = spriteViewEnt;
+        Alert = alert;
+    }
+}
diff --git a/Content.Client/Announcements/Systems/AnnouncerSystem.cs b/Content.Client/Announcements/Systems/AnnouncerSystem.cs
new file mode 100644
index 00000000000..de76396f705
--- /dev/null
+++ b/Content.Client/Announcements/Systems/AnnouncerSystem.cs
@@ -0,0 +1,69 @@
+using Content.Client.Audio;
+using Content.Shared.Announcements.Events;
+using Content.Shared.Announcements.Systems;
+using Content.Shared.CCVar;
+using Robust.Client.Audio;
+using Robust.Client.Player;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Audio.Sources;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.Announcements.Systems;
+
+public sealed class AnnouncerSystem : SharedAnnouncerSystem
+{
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly IResourceCache _cache = default!;
+    [Dependency] private readonly IAudioManager _audioManager = default!;
+
+    private IAudioSource? AnnouncerSource { get; set; }
+    private float AnnouncerVolume { get; set; }
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        AnnouncerVolume = _config.GetCVar(CCVars.AnnouncerVolume) * 100f / ContentAudioSystem.AnnouncerMultiplier;
+
+        SubscribeNetworkEvent<AnnouncementSendEvent>(OnAnnouncementReceived);
+        _config.OnValueChanged(CCVars.AnnouncerVolume, OnAnnouncerVolumeChanged);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        _config.UnsubValueChanged(CCVars.AnnouncerVolume, OnAnnouncerVolumeChanged);
+    }
+
+
+    private void OnAnnouncerVolumeChanged(float value)
+    {
+        AnnouncerVolume = value;
+
+        if (AnnouncerSource != null)
+            AnnouncerSource.Gain = AnnouncerVolume;
+    }
+
+    private void OnAnnouncementReceived(AnnouncementSendEvent ev)
+    {
+        if (!ev.Recipients.Contains(_player.LocalSession!.UserId)
+            || !_cache.TryGetResource<AudioResource>(GetAnnouncementPath(ev.AnnouncementId, ev.AnnouncerId),
+                out var resource))
+            return;
+
+        var source = _audioManager.CreateAudioSource(resource);
+        if (source != null)
+        {
+            source.Gain = AnnouncerVolume * SharedAudioSystem.VolumeToGain(ev.AudioParams.Volume);
+            source.Global = true;
+        }
+
+        AnnouncerSource?.Dispose();
+        AnnouncerSource = source;
+        AnnouncerSource?.StartPlaying();
+    }
+}
diff --git a/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml b/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml
index ac4adf7e0e4..36a750d0098 100644
--- a/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml
+++ b/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml
@@ -1,9 +1,9 @@
-<controls:FancyWindow
+<controls:FancyWindow
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Title="{Loc 'anomaly-scanner-ui-title'}"
-    MinSize="350 260"
-    SetSize="350 260">
+    MinSize="350 400"
+    SetSize="350 400">
     <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="10 0 10 10">
         <RichTextLabel Name="TextDisplay"></RichTextLabel>
     </BoxContainer>
diff --git a/Content.Client/Audio/AmbientSoundSystem.cs b/Content.Client/Audio/AmbientSoundSystem.cs
index 9d30cabb1ec..0206017baef 100644
--- a/Content.Client/Audio/AmbientSoundSystem.cs
+++ b/Content.Client/Audio/AmbientSoundSystem.cs
@@ -50,7 +50,6 @@ protected override void QueueUpdate(EntityUid uid, AmbientSoundComponent ambienc
     private static AudioParams _params = AudioParams.Default
         .WithVariation(0.01f)
         .WithLoop(true)
-        .WithAttenuation(Attenuation.LinearDistance)
         .WithMaxDistance(7f);
 
     /// <summary>
diff --git a/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs b/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs
index 0fdcc7a86dd..92c5b7a4191 100644
--- a/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs
+++ b/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs
@@ -23,8 +23,8 @@ public sealed partial class ContentAudioSystem
     [Dependency] private readonly IStateManager _stateManager = default!;
     [Dependency] private readonly IResourceCache _resourceCache = default!;
 
-    private readonly AudioParams _lobbySoundtrackParams = new(-5f, 1, "Master", 0, 0, 0, false, 0f);
-    private readonly AudioParams _roundEndSoundEffectParams = new(-5f, 1, "Master", 0, 0, 0, false, 0f);
+    private readonly AudioParams _lobbySoundtrackParams = new(-5f, 1, 0, 0, 0, false, 0f);
+    private readonly AudioParams _roundEndSoundEffectParams = new(-5f, 1, 0, 0, 0, false, 0f);
 
     /// <summary>
     /// EntityUid of lobby restart sound component.
diff --git a/Content.Client/Audio/ContentAudioSystem.cs b/Content.Client/Audio/ContentAudioSystem.cs
index f62b34b492c..a79ff74e797 100644
--- a/Content.Client/Audio/ContentAudioSystem.cs
+++ b/Content.Client/Audio/ContentAudioSystem.cs
@@ -29,7 +29,8 @@ public sealed partial class ContentAudioSystem : SharedContentAudioSystem
     public const float AmbientMusicMultiplier = 3f;
     public const float LobbyMultiplier = 3f;
     public const float InterfaceMultiplier = 2f;
-    
+    public const float AnnouncerMultiplier = 3f;
+
     public override void Initialize()
     {
         base.Initialize();
diff --git a/Content.Client/Camera/CameraRecoilSystem.cs b/Content.Client/Camera/CameraRecoilSystem.cs
index 3e04cd5bf19..2a0b6258cc0 100644
--- a/Content.Client/Camera/CameraRecoilSystem.cs
+++ b/Content.Client/Camera/CameraRecoilSystem.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Shared.Camera;
 using Content.Shared.CCVar;
+using Content.Shared.Contests;
 using Robust.Shared.Configuration;
 
 namespace Content.Client.Camera;
@@ -8,6 +9,7 @@ namespace Content.Client.Camera;
 public sealed class CameraRecoilSystem : SharedCameraRecoilSystem
 {
     [Dependency] private readonly IConfigurationManager _configManager = default!;
+    [Dependency] private readonly ContestsSystem _contests = default!;
 
     private float _intensity;
 
@@ -37,15 +39,15 @@ public override void KickCamera(EntityUid uid, Vector2 recoil, CameraRecoilCompo
         if (!Resolve(uid, ref component, false))
             return;
 
-        recoil *= _intensity;
+        var massRatio = _contests.MassContest(uid);
+        var maxRecoil = KickMagnitudeMax / massRatio;
+        recoil *= _intensity / massRatio;
 
-        // Use really bad math to "dampen" kicks when we're already kicked.
         var existing = component.CurrentKick.Length();
-        var dampen = existing / KickMagnitudeMax;
-        component.CurrentKick += recoil * (1 - dampen);
+        component.CurrentKick += recoil * (1 - existing);
 
-        if (component.CurrentKick.Length() > KickMagnitudeMax)
-            component.CurrentKick = component.CurrentKick.Normalized() * KickMagnitudeMax;
+        if (component.CurrentKick.Length() > maxRecoil)
+            component.CurrentKick = component.CurrentKick.Normalized() * maxRecoil;
 
         component.LastKickTime = 0;
     }
diff --git a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
index 482acb3c877..d3365702bcf 100644
--- a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
@@ -27,6 +27,11 @@ protected override void Open()
             SendMessage(new BountyPrintLabelMessage(id));
         };
 
+        _menu.OnSkipButtonPressed += id =>
+        {
+            SendMessage(new BountySkipMessage(id));
+        };
+
         _menu.OpenCentered();
     }
 
@@ -37,7 +42,7 @@ protected override void UpdateState(BoundUserInterfaceState message)
         if (message is not CargoBountyConsoleState state)
             return;
 
-        _menu?.UpdateEntries(state.Bounties);
+        _menu?.UpdateEntries(state.Bounties, state.UntilNextSkip);
     }
 
     protected override void Dispose(bool disposing)
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml b/Content.Client/Cargo/UI/BountyEntry.xaml
index 60446327b35..7c61323bd55 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml
@@ -13,7 +13,18 @@
                 </BoxContainer>
                 <Control MinWidth="10"/>
                 <BoxContainer Orientation="Vertical" MinWidth="120">
-                    <Button Name="PrintButton" Text="{Loc 'bounty-console-label-button-text'}" HorizontalExpand="False" HorizontalAlignment="Right"/>
+                    <BoxContainer Orientation="Horizontal" MinWidth="120">
+                        <Button Name="PrintButton"
+                                Text="{Loc 'bounty-console-label-button-text'}"
+                                HorizontalExpand="False"
+                                HorizontalAlignment="Right"
+                                StyleClasses="OpenRight"/>
+                        <Button Name="SkipButton"
+                                Text="{Loc 'bounty-console-skip-button-text'}"
+                                HorizontalExpand="False"
+                                HorizontalAlignment="Right"
+                                StyleClasses="OpenLeft"/>
+                    </BoxContainer>
                     <RichTextLabel Name="IdLabel" HorizontalAlignment="Right" Margin="0 0 5 0"/>
                 </BoxContainer>
             </BoxContainer>
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml.cs b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
index 1fc8a4986a2..027d7b3e801 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml.cs
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
@@ -1,11 +1,13 @@
 using Content.Client.Message;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
+using Content.Shared.Random;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using Serilog;
 
 namespace Content.Client.Cargo.UI;
 
@@ -14,15 +16,19 @@ public sealed partial class BountyEntry : BoxContainer
 {
     [Dependency] private readonly IPrototypeManager _prototype = default!;
 
-    public Action? OnButtonPressed;
+    public Action? OnLabelButtonPressed;
+    public Action? OnSkipButtonPressed;
 
     public TimeSpan EndTime;
+    public TimeSpan UntilNextSkip;
 
-    public BountyEntry(CargoBountyData bounty)
+    public BountyEntry(CargoBountyData bounty, TimeSpan untilNextSkip)
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
+        UntilNextSkip = untilNextSkip;
+
         if (!_prototype.TryIndex<CargoBountyPrototype>(bounty.Bounty, out var bountyPrototype))
             return;
 
@@ -38,6 +44,27 @@ public BountyEntry(CargoBountyData bounty)
         DescriptionLabel.SetMarkup(Loc.GetString("bounty-console-description-label", ("description", Loc.GetString(bountyPrototype.Description))));
         IdLabel.SetMarkup(Loc.GetString("bounty-console-id-label", ("id", bounty.Id)));
 
-        PrintButton.OnPressed += _ => OnButtonPressed?.Invoke();
+        PrintButton.OnPressed += _ => OnLabelButtonPressed?.Invoke();
+        SkipButton.OnPressed += _ => OnSkipButtonPressed?.Invoke();
+    }
+
+    private void UpdateSkipButton(float deltaSeconds)
+    {
+        UntilNextSkip -= TimeSpan.FromSeconds(deltaSeconds);
+        if (UntilNextSkip > TimeSpan.Zero)
+        {
+            SkipButton.Label.Text = UntilNextSkip.ToString("mm\\:ss");
+            SkipButton.Disabled = true;
+            return;
+        }
+
+        SkipButton.Label.Text = Loc.GetString("bounty-console-skip-button-text");
+        SkipButton.Disabled = false;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+        UpdateSkipButton(args.DeltaSeconds);
     }
 }
diff --git a/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
index 2f1756dd18b..3767b45e4be 100644
--- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
@@ -10,19 +10,21 @@ namespace Content.Client.Cargo.UI;
 public sealed partial class CargoBountyMenu : FancyWindow
 {
     public Action<string>? OnLabelButtonPressed;
+    public Action<string>? OnSkipButtonPressed;
 
     public CargoBountyMenu()
     {
         RobustXamlLoader.Load(this);
     }
 
-    public void UpdateEntries(List<CargoBountyData> bounties)
+    public void UpdateEntries(List<CargoBountyData> bounties, TimeSpan untilNextSkip)
     {
         BountyEntriesContainer.Children.Clear();
         foreach (var b in bounties)
         {
-            var entry = new BountyEntry(b);
-            entry.OnButtonPressed += () => OnLabelButtonPressed?.Invoke(b.Id);
+            var entry = new BountyEntry(b, untilNextSkip);
+            entry.OnLabelButtonPressed += () => OnLabelButtonPressed?.Invoke(b.Id);
+            entry.OnSkipButtonPressed += () => OnSkipButtonPressed?.Invoke(b.Id);
 
             BountyEntriesContainer.AddChild(entry);
         }
diff --git a/Content.Client/Chemistry/Components/HyposprayComponent.cs b/Content.Client/Chemistry/Components/HyposprayComponent.cs
deleted file mode 100644
index 705b79ad84c..00000000000
--- a/Content.Client/Chemistry/Components/HyposprayComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.FixedPoint;
-
-namespace Content.Client.Chemistry.Components
-{
-    [RegisterComponent]
-    public sealed partial class HyposprayComponent : SharedHyposprayComponent
-    {
-        [ViewVariables]
-        public FixedPoint2 CurrentVolume;
-        [ViewVariables]
-        public FixedPoint2 TotalVolume;
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool UiUpdateNeeded;
-    }
-}
diff --git a/Content.Client/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Client/Chemistry/EntitySystems/HypospraySystem.cs
new file mode 100644
index 00000000000..ee7aa3aafe3
--- /dev/null
+++ b/Content.Client/Chemistry/EntitySystems/HypospraySystem.cs
@@ -0,0 +1,15 @@
+using Content.Client.Chemistry.UI;
+using Content.Client.Items;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+
+namespace Content.Client.Chemistry.EntitySystems;
+
+public sealed class HypospraySystem : SharedHypospraySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        Subs.ItemStatus<HyposprayComponent>(ent => new HyposprayStatusControl(ent, _solutionContainers));
+    }
+}
diff --git a/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
index 12eb7f3d14d..0131a283c8c 100644
--- a/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
@@ -1,4 +1,3 @@
-using Content.Client.Chemistry.Components;
 using Content.Client.Chemistry.UI;
 using Content.Client.Items;
 using Content.Shared.Chemistry.Components;
@@ -13,17 +12,5 @@ public override void Initialize()
     {
         base.Initialize();
         Subs.ItemStatus<InjectorComponent>(ent => new InjectorStatusControl(ent, SolutionContainers));
-        SubscribeLocalEvent<HyposprayComponent, ComponentHandleState>(OnHandleHyposprayState);
-        Subs.ItemStatus<HyposprayComponent>(ent => new HyposprayStatusControl(ent));
-    }
-
-    private void OnHandleHyposprayState(EntityUid uid, HyposprayComponent component, ref ComponentHandleState args)
-    {
-        if (args.Current is not HyposprayComponentState cState)
-            return;
-
-        component.CurrentVolume = cState.CurVolume;
-        component.TotalVolume = cState.MaxVolume;
-        component.UiUpdateNeeded = true;
     }
 }
diff --git a/Content.Client/Chemistry/UI/HyposprayStatusControl.cs b/Content.Client/Chemistry/UI/HyposprayStatusControl.cs
index bd85cd546cc..4a4d90dc4d5 100644
--- a/Content.Client/Chemistry/UI/HyposprayStatusControl.cs
+++ b/Content.Client/Chemistry/UI/HyposprayStatusControl.cs
@@ -1,6 +1,8 @@
-using Content.Client.Chemistry.Components;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.FixedPoint;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
@@ -9,34 +11,48 @@ namespace Content.Client.Chemistry.UI;
 
 public sealed class HyposprayStatusControl : Control
 {
-    private readonly HyposprayComponent _parent;
+    private readonly Entity<HyposprayComponent> _parent;
     private readonly RichTextLabel _label;
+    private readonly SharedSolutionContainerSystem _solutionContainers;
 
-    public HyposprayStatusControl(HyposprayComponent parent)
+    private FixedPoint2 PrevVolume;
+    private FixedPoint2 PrevMaxVolume;
+    private bool PrevOnlyAffectsMobs;
+
+    public HyposprayStatusControl(Entity<HyposprayComponent> parent, SharedSolutionContainerSystem solutionContainers)
     {
         _parent = parent;
-        _label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}};
+        _solutionContainers = solutionContainers;
+        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
         AddChild(_label);
-
-        Update();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
-        if (!_parent.UiUpdateNeeded)
+
+        if (!_solutionContainers.TryGetSolution(_parent.Owner, _parent.Comp.SolutionName, out _, out var solution))
             return;
-        Update();
-    }
 
-    public void Update()
-    {
+        // only updates the UI if any of the details are different than they previously were
+        if (PrevVolume == solution.Volume
+            && PrevMaxVolume == solution.MaxVolume
+            && PrevOnlyAffectsMobs == _parent.Comp.OnlyAffectsMobs)
+            return;
+
+        PrevVolume = solution.Volume;
+        PrevMaxVolume = solution.MaxVolume;
+        PrevOnlyAffectsMobs = _parent.Comp.OnlyAffectsMobs;
 
-        _parent.UiUpdateNeeded = false;
+        var modeStringLocalized = Loc.GetString(_parent.Comp.OnlyAffectsMobs switch
+        {
+            false => "hypospray-all-mode-text",
+            true => "hypospray-mobs-only-mode-text",
+        });
 
-        _label.SetMarkup(Loc.GetString(
-            "hypospray-volume-text",
-            ("currentVolume", _parent.CurrentVolume),
-            ("totalVolume", _parent.TotalVolume)));
+        _label.SetMarkup(Loc.GetString("hypospray-volume-label",
+            ("currentVolume", solution.Volume),
+            ("totalVolume", solution.MaxVolume),
+            ("modeString", modeStringLocalized)));
     }
 }
diff --git a/Content.Client/Chemistry/UI/InjectorStatusControl.cs b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
index 9cb699330c2..ba1f97cd1e4 100644
--- a/Content.Client/Chemistry/UI/InjectorStatusControl.cs
+++ b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
@@ -17,6 +17,7 @@ public sealed class InjectorStatusControl : Control
 
     private FixedPoint2 PrevVolume;
     private FixedPoint2 PrevMaxVolume;
+    private FixedPoint2 PrevTransferAmount;
     private InjectorToggleMode PrevToggleState;
 
     public InjectorStatusControl(Entity<InjectorComponent> parent, SharedSolutionContainerSystem solutionContainers)
@@ -37,11 +38,13 @@ protected override void FrameUpdate(FrameEventArgs args)
         // only updates the UI if any of the details are different than they previously were
         if (PrevVolume == solution.Volume
             && PrevMaxVolume == solution.MaxVolume
+            && PrevTransferAmount == _parent.Comp.TransferAmount
             && PrevToggleState == _parent.Comp.ToggleState)
             return;
 
         PrevVolume = solution.Volume;
         PrevMaxVolume = solution.MaxVolume;
+        PrevTransferAmount = _parent.Comp.TransferAmount;
         PrevToggleState = _parent.Comp.ToggleState;
 
         // Update current volume and injector state
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index fbe9d5ec5bb..7e78ac7d707 100644
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -133,7 +133,7 @@ private bool TryGetDefaultVisuals(EntityUid uid, ClothingComponent clothing, str
         else if (TryComp(uid, out SpriteComponent? sprite))
             rsi = sprite.BaseRSI;
 
-        if (rsi == null || rsi.Path == null)
+        if (rsi == null)
             return false;
 
         var correctedSlot = slot;
diff --git a/Content.Client/Clothing/Systems/WaddleClothingSystem.cs b/Content.Client/Clothing/Systems/WaddleClothingSystem.cs
new file mode 100644
index 00000000000..b8ac3c207bf
--- /dev/null
+++ b/Content.Client/Clothing/Systems/WaddleClothingSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Clothing.Components;
+using Content.Shared.Movement.Components;
+using Content.Shared.Inventory.Events;
+
+namespace Content.Client.Clothing.Systems;
+
+public sealed class WaddleClothingSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<WaddleWhenWornComponent, GotEquippedEvent>(OnGotEquipped);
+        SubscribeLocalEvent<WaddleWhenWornComponent, GotUnequippedEvent>(OnGotUnequipped);
+    }
+
+    private void OnGotEquipped(EntityUid entity, WaddleWhenWornComponent comp, GotEquippedEvent args)
+    {
+        var waddleAnimComp = EnsureComp<WaddleAnimationComponent>(args.Equipee);
+
+        waddleAnimComp.AnimationLength = comp.AnimationLength;
+        waddleAnimComp.HopIntensity = comp.HopIntensity;
+        waddleAnimComp.RunAnimationLengthMultiplier = comp.RunAnimationLengthMultiplier;
+        waddleAnimComp.TumbleIntensity = comp.TumbleIntensity;
+    }
+
+    private void OnGotUnequipped(EntityUid entity, WaddleWhenWornComponent comp, GotUnequippedEvent args)
+    {
+        RemComp<WaddleAnimationComponent>(args.Equipee);
+    }
+}
diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 956f2fd0351..c1958acba7f 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -26,6 +26,11 @@
   <ItemGroup>
     <Folder Include="Spawners\" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Lobby\UI\LobbyCharacterPanel.xaml.cs">
+      <DependentUpon>LobbyCharacterPanel.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
 </Project>
diff --git a/Content.Client/Disposal/Systems/DisposalUnitSystem.cs b/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
index 8c40c784219..b9e4a386604 100644
--- a/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
+++ b/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
@@ -96,24 +96,22 @@ private void OnAppearanceChange(EntityUid uid, SharedDisposalUnitComponent unit,
     private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, SpriteComponent sprite, AppearanceComponent appearance)
     {
         if (!_appearanceSystem.TryGetData<VisualState>(uid, Visuals.VisualState, out var state, appearance))
-        {
             return;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.Unanchored, state == VisualState.UnAnchored);
         sprite.LayerSetVisible(DisposalUnitVisualLayers.Base, state == VisualState.Anchored);
-        sprite.LayerSetVisible(DisposalUnitVisualLayers.BaseFlush, state is VisualState.Flushing or VisualState.Charging);
+        sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayFlush, state is VisualState.OverlayFlushing or VisualState.OverlayCharging);
 
         var chargingState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.BaseCharging, out var chargingLayer)
             ? sprite.LayerGetState(chargingLayer)
             : new RSI.StateId(DefaultChargeState);
 
         // This is a transient state so not too worried about replaying in range.
-        if (state == VisualState.Flushing)
+        if (state == VisualState.OverlayFlushing)
         {
             if (!_animationSystem.HasRunningAnimation(uid, AnimationKey))
             {
-                var flushState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.BaseFlush, out var flushLayer)
+                var flushState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.OverlayFlush, out var flushLayer)
                     ? sprite.LayerGetState(flushLayer)
                     : new RSI.StateId(DefaultFlushState);
 
@@ -125,7 +123,7 @@ private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, Sprite
                     {
                         new AnimationTrackSpriteFlick
                         {
-                            LayerKey = DisposalUnitVisualLayers.BaseFlush,
+                            LayerKey = DisposalUnitVisualLayers.OverlayFlush,
                             KeyFrames =
                             {
                                 // Play the flush animation
@@ -154,26 +152,18 @@ private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, Sprite
                 _animationSystem.Play(uid, anim, AnimationKey);
             }
         }
-        else if (state == VisualState.Charging)
-        {
-            sprite.LayerSetState(DisposalUnitVisualLayers.BaseFlush, chargingState);
-        }
+        else if (state == VisualState.OverlayCharging)
+            sprite.LayerSetState(DisposalUnitVisualLayers.OverlayFlush, new RSI.StateId("disposal-charging"));
         else
-        {
             _animationSystem.Stop(uid, AnimationKey);
-        }
 
         if (!_appearanceSystem.TryGetData<HandleState>(uid, Visuals.Handle, out var handleState, appearance))
-        {
             handleState = HandleState.Normal;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayEngaged, handleState != HandleState.Normal);
 
         if (!_appearanceSystem.TryGetData<LightStates>(uid, Visuals.Light, out var lightState, appearance))
-        {
             lightState = LightStates.Off;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayCharging,
                 (lightState & LightStates.Charging) != 0);
@@ -189,7 +179,7 @@ public enum DisposalUnitVisualLayers : byte
     Unanchored,
     Base,
     BaseCharging,
-    BaseFlush,
+    OverlayFlush,
     OverlayCharging,
     OverlayReady,
     OverlayFull,
diff --git a/Content.Client/Doors/DoorSystem.cs b/Content.Client/Doors/DoorSystem.cs
index 473ae97059a..bc52730b0e7 100644
--- a/Content.Client/Doors/DoorSystem.cs
+++ b/Content.Client/Doors/DoorSystem.cs
@@ -4,14 +4,12 @@
 using Robust.Client.GameObjects;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
-using Robust.Shared.Timing;
 
 namespace Content.Client.Doors;
 
 public sealed class DoorSystem : SharedDoorSystem
 {
     [Dependency] private readonly AnimationPlayerSystem _animationSystem = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IResourceCache _resourceCache = default!;
 
     public override void Initialize()
diff --git a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs
new file mode 100644
index 00000000000..cd7ea717ce3
--- /dev/null
+++ b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs
@@ -0,0 +1,59 @@
+using Content.Shared.Access;
+using Content.Shared.Doors.Electronics;
+using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Doors.Electronics;
+
+public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    private DoorElectronicsConfigurationMenu? _window;
+
+    public DoorElectronicsBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+        List<ProtoId<AccessLevelPrototype>> accessLevels = new();
+
+        foreach (var accessLevel in _prototypeManager.EnumeratePrototypes<AccessLevelPrototype>())
+        {
+            if (accessLevel.Name != null)
+            {
+                accessLevels.Add(accessLevel.ID);
+            }
+        }
+
+        accessLevels.Sort();
+
+        _window = new DoorElectronicsConfigurationMenu(this, accessLevels, _prototypeManager);
+        _window.OnClose += Close;
+        _window.OpenCentered();
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        var castState = (DoorElectronicsConfigurationState) 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 b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml
new file mode 100644
index 00000000000..4cd59f38b23
--- /dev/null
+++ b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml
@@ -0,0 +1,6 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                xmlns:ui="clr-namespace:Content.Client.UserInterface"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <Control Name="AccessLevelControlContainer" />
+
+</controls:FancyWindow>
diff --git a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs
new file mode 100644
index 00000000000..c01f13a462e
--- /dev/null
+++ b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs
@@ -0,0 +1,41 @@
+using System.Linq;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Content.Client.Access.UI;
+using Content.Client.Doors.Electronics;
+using Content.Shared.Access;
+using Content.Shared.Doors.Electronics;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
+
+namespace Content.Client.Doors.Electronics;
+
+[GenerateTypedNameReferences]
+public sealed partial class DoorElectronicsConfigurationMenu : FancyWindow
+{
+    private readonly DoorElectronicsBoundUserInterface _owner;
+    private AccessLevelControl _buttonsList = new();
+
+    public DoorElectronicsConfigurationMenu(DoorElectronicsBoundUserInterface ui, List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototypeManager prototypeManager)
+    {
+        RobustXamlLoader.Load(this);
+
+        _owner = ui;
+
+        _buttonsList.Populate(accessLevels, prototypeManager);
+        AccessLevelControlContainer.AddChild(_buttonsList);
+
+        foreach (var (id, button) in _buttonsList.ButtonsList)
+        {
+            button.OnPressed += _ => _owner.UpdateConfiguration(
+                _buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList());
+        }
+    }
+
+    public void UpdateState(DoorElectronicsConfigurationState state)
+    {
+        _buttonsList.UpdateState(state.AccessList);
+    }
+}
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index a1fc68bbd2f..7f921fc1a6b 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -111,7 +111,6 @@ public override void Init()
             _prototypeManager.RegisterIgnore("gameMapPool");
             _prototypeManager.RegisterIgnore("npcFaction");
             _prototypeManager.RegisterIgnore("lobbyBackground");
-            _prototypeManager.RegisterIgnore("advertisementsPack");
             _prototypeManager.RegisterIgnore("gamePreset");
             _prototypeManager.RegisterIgnore("noiseChannel");
             _prototypeManager.RegisterIgnore("spaceBiome");
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 1be472b06d6..45db4efa53c 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -212,14 +212,16 @@ public void OpenTooltip(EntityUid player, EntityUid target, bool centeredOnCurso
             var vBox = new BoxContainer
             {
                 Name = "ExaminePopupVbox",
-                Orientation = LayoutOrientation.Vertical
+                Orientation = LayoutOrientation.Vertical,
+                MaxWidth = _examineTooltipOpen.MaxWidth
             };
             panel.AddChild(vBox);
 
             var hBox = new BoxContainer
             {
                 Orientation = LayoutOrientation.Horizontal,
-                SeparationOverride = 5
+                SeparationOverride = 5,
+                Margin = new Thickness(6, 0, 6, 0)
             };
 
             vBox.AddChild(hBox);
@@ -229,8 +231,7 @@ public void OpenTooltip(EntityUid player, EntityUid target, bool centeredOnCurso
                 var spriteView = new SpriteView
                 {
                     OverrideDirection = Direction.South,
-                    SetSize = new Vector2(32, 32),
-                    Margin = new Thickness(2, 0, 2, 0),
+                    SetSize = new Vector2(32, 32)
                 };
                 spriteView.SetEntity(target);
                 hBox.AddChild(spriteView);
@@ -238,19 +239,17 @@ public void OpenTooltip(EntityUid player, EntityUid target, bool centeredOnCurso
 
             if (knowTarget)
             {
-                hBox.AddChild(new Label
-                {
-                    Text = Identity.Name(target, EntityManager, player),
-                    HorizontalExpand = true,
-                });
+                var itemName = FormattedMessage.RemoveMarkup(Identity.Name(target, EntityManager, player));
+                var labelMessage = FormattedMessage.FromMarkup($"[bold]{itemName}[/bold]");
+                var label = new RichTextLabel();
+                label.SetMessage(labelMessage);
+                hBox.AddChild(label);
             }
             else
             {
-                hBox.AddChild(new Label
-                {
-                    Text = "???",
-                    HorizontalExpand = true,
-                });
+                var label = new RichTextLabel();
+                label.SetMessage(FormattedMessage.FromMarkup("[bold]???[/bold]"));
+                hBox.AddChild(label);
             }
 
             panel.Measure(Vector2Helpers.Infinity);
diff --git a/Content.Client/Fluids/PuddleSystem.cs b/Content.Client/Fluids/PuddleSystem.cs
index 54b1d5b86b9..5dbffe0fd2f 100644
--- a/Content.Client/Fluids/PuddleSystem.cs
+++ b/Content.Client/Fluids/PuddleSystem.cs
@@ -1,7 +1,9 @@
 using Content.Client.IconSmoothing;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Fluids;
 using Content.Shared.Fluids.Components;
 using Robust.Client.GameObjects;
+using Robust.Shared.Map;
 
 namespace Content.Client.Fluids;
 
@@ -21,7 +23,7 @@ private void OnPuddleAppearance(EntityUid uid, PuddleComponent component, ref Ap
         if (args.Sprite == null)
             return;
 
-        float volume = 1f;
+        var volume = 1f;
 
         if (args.AppearanceData.TryGetValue(PuddleVisuals.CurrentVolume, out var volumeObj))
         {
@@ -64,4 +66,38 @@ private void OnPuddleAppearance(EntityUid uid, PuddleComponent component, ref Ap
             args.Sprite.Color *= baseColor;
         }
     }
+
+    #region Spill
+
+    // Maybe someday we'll have clientside prediction for entity spawning, but not today.
+    // Until then, these methods do nothing on the client.
+    /// <inheritdoc/>
+    public override bool TrySplashSpillAt(EntityUid uid, EntityCoordinates coordinates, Solution solution, out EntityUid puddleUid, bool sound = true, EntityUid? user = null)
+    {
+        puddleUid = EntityUid.Invalid;
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public override bool TrySpillAt(EntityCoordinates coordinates, Solution solution, out EntityUid puddleUid, bool sound = true)
+    {
+        puddleUid = EntityUid.Invalid;
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public override bool TrySpillAt(EntityUid uid, Solution solution, out EntityUid puddleUid, bool sound = true, TransformComponent? transformComponent = null)
+    {
+        puddleUid = EntityUid.Invalid;
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public override bool TrySpillAt(TileRef tileRef, Solution solution, out EntityUid puddleUid, bool sound = true, bool tileReact = true)
+    {
+        puddleUid = EntityUid.Invalid;
+        return false;
+    }
+
+    #endregion Spill
 }
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
index 1d8d415bab9..0cb3ad144d7 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Numerics;
+using Content.Shared.Atmos;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
@@ -79,7 +80,7 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
             );
 
             Temperature.Text = Loc.GetString("health-analyzer-window-entity-temperature-text",
-                ("temperature", float.IsNaN(msg.Temperature) ? "N/A" : $"{msg.Temperature - 273f:F1} °C ({msg.Temperature:F1} °K)")
+                ("temperature", float.IsNaN(msg.Temperature) ? "N/A" : $"{msg.Temperature - Atmospherics.T0C:F1} °C ({msg.Temperature:F1} K)")
             );
 
             BloodLevel.Text = Loc.GetString("health-analyzer-window-entity-blood-level-text",
diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs
index 0ab33c65202..4b025608465 100644
--- a/Content.Client/IconSmoothing/IconSmoothSystem.cs
+++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs
@@ -16,8 +16,6 @@ namespace Content.Client.IconSmoothing
     [UsedImplicitly]
     public sealed partial class IconSmoothSystem : EntitySystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
-
         private readonly Queue<EntityUid> _dirtyEntities = new();
         private readonly Queue<EntityUid> _anchorChangedEntities = new();
 
@@ -47,7 +45,7 @@ private void OnStartup(EntityUid uid, IconSmoothComponent component, ComponentSt
             var xform = Transform(uid);
             if (xform.Anchored)
             {
-                component.LastPosition = _mapManager.TryGetGrid(xform.GridUid, out var grid)
+                component.LastPosition = TryComp<MapGridComponent>(xform.GridUid, out var grid)
                     ? (xform.GridUid.Value, grid.TileIndicesFor(xform.Coordinates))
                     : (null, new Vector2i(0, 0));
 
@@ -134,7 +132,7 @@ public void DirtyNeighbours(EntityUid uid, IconSmoothComponent? comp = null, Tra
 
             Vector2i pos;
 
-            if (transform.Anchored && _mapManager.TryGetGrid(transform.GridUid, out var grid))
+            if (transform.Anchored && TryComp<MapGridComponent>(transform.GridUid, out var grid))
             {
                 pos = grid.CoordinatesToTile(transform.Coordinates);
             }
@@ -144,7 +142,7 @@ public void DirtyNeighbours(EntityUid uid, IconSmoothComponent? comp = null, Tra
                 if (comp.LastPosition is not (EntityUid gridId, Vector2i oldPos))
                     return;
 
-                if (!_mapManager.TryGetGrid(gridId, out grid))
+                if (!TryComp(gridId, out grid))
                     return;
 
                 pos = oldPos;
@@ -206,7 +204,7 @@ private void CalculateNewSprite(EntityUid uid,
                 {
                     var directions = DirectionFlag.None;
 
-                    if (_mapManager.TryGetGrid(xform.GridUid, out grid))
+                    if (TryComp(xform.GridUid, out grid))
                     {
                         var pos = grid.TileIndicesFor(xform.Coordinates);
 
@@ -240,7 +238,7 @@ private void CalculateNewSprite(EntityUid uid,
 
             if (xform.Anchored)
             {
-                if (!_mapManager.TryGetGrid(xform.GridUid, out grid))
+                if (!TryComp(xform.GridUid, out grid))
                 {
                     Log.Error($"Failed to calculate IconSmoothComponent sprite in {uid} because grid {xform.GridUid} was missing.");
                     return;
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index fa631938100..503a9ac953b 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -32,6 +32,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             common.AddFunction(ContentKeyFunctions.ToggleFullscreen);
             common.AddFunction(ContentKeyFunctions.MoveStoredItem);
             common.AddFunction(ContentKeyFunctions.RotateStoredItem);
+            common.AddFunction(ContentKeyFunctions.SaveItemLocation);
             common.AddFunction(ContentKeyFunctions.Point);
             common.AddFunction(ContentKeyFunctions.ZoomOut);
             common.AddFunction(ContentKeyFunctions.ZoomIn);
@@ -44,6 +45,9 @@ public static void SetupContexts(IInputContextContainer contexts)
             // Not in engine because the engine doesn't understand what a flipped object is
             common.AddFunction(ContentKeyFunctions.EditorFlipObject);
 
+            // Not in engine so that the RCD can rotate objects
+            common.AddFunction(EngineKeyFunctions.EditorRotateObject);
+
             var human = contexts.GetContext("human");
             human.AddFunction(EngineKeyFunctions.MoveUp);
             human.AddFunction(EngineKeyFunctions.MoveDown);
@@ -68,6 +72,8 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.SmartEquipBelt);
             human.AddFunction(ContentKeyFunctions.OpenBackpack);
             human.AddFunction(ContentKeyFunctions.OpenBelt);
+            human.AddFunction(ContentKeyFunctions.OfferItem);
+            human.AddFunction(ContentKeyFunctions.ToggleStanding);
             human.AddFunction(ContentKeyFunctions.MouseMiddle);
             human.AddFunction(ContentKeyFunctions.ArcadeUp);
             human.AddFunction(ContentKeyFunctions.ArcadeDown);
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index f8eb12df914..4bb49fecc14 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -19,6 +19,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.Player;
 using Robust.Shared.Input;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
@@ -31,6 +32,7 @@ namespace Content.Client.Inventory
     public sealed class StrippableBoundUserInterface : BoundUserInterface
     {
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
         private readonly ExamineSystem _examine;
         private readonly InventorySystem _inv;
         private readonly SharedCuffableSystem _cuffable;
@@ -198,7 +200,8 @@ private void AddInventoryButton(EntityUid invUid, string slotId, InventoryCompon
             var entity = container.ContainedEntity;
 
             // If this is a full pocket, obscure the real entity
-            if (entity != null && slotDef.StripHidden)
+            if (entity != null && slotDef.StripHidden
+                && !(EntMan.TryGetComponent<ThievingComponent>(_playerManager.LocalEntity, out var thiefcomponent) && thiefcomponent.IgnoreStripHidden))
                 entity = _virtualHiddenEntity;
 
             var button = new SlotButton(new SlotData(slotDef, container));
diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
index 92b10fe0494..01c8f382819 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -23,6 +23,7 @@
 using Content.Client.Guidebook;
 using Content.Client.Replay;
 using Content.Shared.Administration.Managers;
+using Content.Shared.Players.PlayTimeTracking;
 
 
 namespace Content.Client.IoC
@@ -31,6 +32,8 @@ internal static class ClientContentIoC
     {
         public static void Register()
         {
+            var collection = IoCManager.Instance!;
+
             IoCManager.Register<IParallaxManager, ParallaxManager>();
             IoCManager.Register<IChatManager, ChatManager>();
             IoCManager.Register<IClientPreferencesManager, ClientPreferencesManager>();
@@ -51,6 +54,7 @@ public static void Register()
             IoCManager.Register<JobRequirementsManager>();
             IoCManager.Register<DocumentParsingManager>();
             IoCManager.Register<ContentReplayPlaybackManager, ContentReplayPlaybackManager>();
+            collection.Register<ISharedPlaytimeManager, JobRequirementsManager>();
             IoCManager.Register<JoinQueueManager>();
             IoCManager.Register<DiscordAuthManager>();
         }
diff --git a/Content.Client/Items/Systems/ItemSystem.cs b/Content.Client/Items/Systems/ItemSystem.cs
index e406ba2b557..5e60d06d0ce 100644
--- a/Content.Client/Items/Systems/ItemSystem.cs
+++ b/Content.Client/Items/Systems/ItemSystem.cs
@@ -93,7 +93,7 @@ private bool TryGetDefaultVisuals(EntityUid uid, ItemComponent item, string defa
         else if (TryComp(uid, out SpriteComponent? sprite))
             rsi = sprite.BaseRSI;
 
-        if (rsi == null || rsi.Path == null)
+        if (rsi == null)
             return false;
 
         var state = (item.HeldPrefix == null)
diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml b/Content.Client/Kitchen/UI/GrinderMenu.xaml
index b83128d004a..dacddd0df68 100644
--- a/Content.Client/Kitchen/UI/GrinderMenu.xaml
+++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml
@@ -3,10 +3,12 @@
             xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
             Title="{Loc grinder-menu-title}" MinSize="768 256">
     <BoxContainer Orientation="Horizontal">
-        <BoxContainer Orientation="Vertical" VerticalAlignment="Top" Margin="8">
-            <Button Name="GrindButton" Text="{Loc grinder-menu-grind-button}" TextAlign="Center" MinSize="64 48"/>
-            <Control MinSize="0 16"/>
-            <Button Name="JuiceButton" Text="{Loc grinder-menu-juice-button}" TextAlign="Center" MinSize="64 48"/>
+        <BoxContainer Orientation="Vertical" VerticalAlignment="Top" Margin="8" MinWidth="100">
+            <Label Text="{Loc grinder-menu-auto-label}" HorizontalAlignment="Center"/>
+            <Button Name="AutoModeButton" Text="{Loc grinder-menu-auto-button}" TextAlign="Center" MinSize="64 48" Margin="0 0 0 16" />
+            <Label Text="{Loc grinder-menu-manual-label}" HorizontalAlignment="Center"/>
+            <Button Name="GrindButton" Text="{Loc grinder-menu-grind-button}" TextAlign="Center" MinSize="64 48" Margin="0 0 0 16" />
+            <Button Name="JuiceButton" Text="{Loc grinder-menu-juice-button}" TextAlign="Center" MinSize="64 48" />
         </BoxContainer>
 
         <ui:LabelledContentBox Name="ChamberContentBox" LabelText="{Loc grinder-menu-chamber-content-box-label}" ButtonText="{Loc grinder-menu-chamber-content-box-button}" VerticalExpand="True" HorizontalExpand="True" Margin="8" SizeFlagsStretchRatio="2"/>
diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
index 6e4b7a76180..f97d8a73302 100644
--- a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
+++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
@@ -24,6 +24,7 @@ public GrinderMenu(ReagentGrinderBoundUserInterface owner, IEntityManager entity
             _entityManager = entityManager;
             _prototypeManager = prototypeManager;
             _owner = owner;
+            AutoModeButton.OnPressed += owner.ToggleAutoMode;
             GrindButton.OnPressed += owner.StartGrinding;
             JuiceButton.OnPressed += owner.StartJuicing;
             ChamberContentBox.EjectButton.OnPressed += owner.EjectAll;
@@ -56,6 +57,19 @@ public void UpdateState(ReagentGrinderInterfaceState state)
             GrindButton.Disabled = !state.CanGrind || !state.Powered;
             JuiceButton.Disabled = !state.CanJuice || !state.Powered;
 
+            switch (state.AutoMode)
+            {
+                case GrinderAutoMode.Grind:
+                    AutoModeButton.Text = Loc.GetString("grinder-menu-grind-button");
+                    break;
+                case GrinderAutoMode.Juice:
+                    AutoModeButton.Text = Loc.GetString("grinder-menu-juice-button");
+                    break;
+                default:
+                    AutoModeButton.Text = Loc.GetString("grinder-menu-auto-button-off");
+                    break;
+            }
+
             // TODO move this to a component state and ensure the net ids.
             RefreshContentsDisplay(state.ReagentQuantities, _entityManager.GetEntityArray(state.ChamberContents), state.HasBeakerIn);
         }
diff --git a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
index 39b85c261b3..e6f108b3050 100644
--- a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
@@ -52,6 +52,11 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
             _menu?.HandleMessage(message);
         }
 
+        public void ToggleAutoMode(BaseButton.ButtonEventArgs args)
+        {
+            SendMessage(new ReagentGrinderToggleAutoModeMessage());
+        }
+
         public void StartGrinding(BaseButton.ButtonEventArgs? _ = null)
         {
             SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Grind));
diff --git a/Content.Client/Language/LanguageMenuWindow.xaml.cs b/Content.Client/Language/LanguageMenuWindow.xaml.cs
index 312814aca35..11d1c290d16 100644
--- a/Content.Client/Language/LanguageMenuWindow.xaml.cs
+++ b/Content.Client/Language/LanguageMenuWindow.xaml.cs
@@ -1,14 +1,8 @@
 using Content.Client.Language.Systems;
-using Content.Shared.Language;
-using Content.Shared.Language.Systems;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Console;
-using Robust.Shared.Utility;
-using Serilog;
-using static Content.Shared.Language.Systems.SharedLanguageSystem;
 
 namespace Content.Client.Language;
 
@@ -121,8 +115,11 @@ private void AddLanguageEntry(string language)
     private void OnLanguageChosen(string id)
     {
         var proto = _clientLanguageSystem.GetLanguagePrototype(id);
-        if (proto != null)
-            _clientLanguageSystem.RequestSetLanguage(proto);
+        if (proto == null)
+            return;
+
+        _clientLanguageSystem.RequestSetLanguage(proto);
+        UpdateState(id, _clientLanguageSystem.SpokenLanguages);
     }
 
 
diff --git a/Content.Client/Language/Systems/LanguageSystem.cs b/Content.Client/Language/Systems/LanguageSystem.cs
index 9714078b2c5..5dc2fc1f4e7 100644
--- a/Content.Client/Language/Systems/LanguageSystem.cs
+++ b/Content.Client/Language/Systems/LanguageSystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Language.Events;
 using Content.Shared.Language.Systems;
 using Robust.Client;
-using Robust.Shared.Console;
 
 namespace Content.Client.Language.Systems;
 
diff --git a/Content.Client/Language/Systems/TranslatorImplanterSystem.cs b/Content.Client/Language/Systems/TranslatorImplanterSystem.cs
deleted file mode 100644
index da19b3decf9..00000000000
--- a/Content.Client/Language/Systems/TranslatorImplanterSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.Language.Systems;
-
-namespace Content.Client.Language.Systems;
-
-public sealed class TranslatorImplanterSystem : SharedTranslatorImplanterSystem
-{
-
-}
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index b99d30015ef..ba9351d6746 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -33,7 +33,7 @@ public sealed class LateJoinGui : DefaultWindow
         private readonly SpriteSystem _sprites;
         private readonly CrewManifestSystem _crewManifest;
 
-        private readonly Dictionary<NetEntity, Dictionary<string, JobButton>> _jobButtons = new();
+        private readonly Dictionary<NetEntity, Dictionary<string, List<JobButton>>> _jobButtons = new();
         private readonly Dictionary<NetEntity, Dictionary<string, BoxContainer>> _jobCategories = new();
         private readonly List<ScrollContainer> _jobLists = new();
 
@@ -139,7 +139,7 @@ private void RebuildUI()
                 var jobListScroll = new ScrollContainer()
                 {
                     VerticalExpand = true,
-                    Children = {jobList},
+                    Children = { jobList },
                     Visible = false,
                 };
 
@@ -163,11 +163,12 @@ private void RebuildUI()
                 var departments = _prototypeManager.EnumeratePrototypes<DepartmentPrototype>().ToArray();
                 Array.Sort(departments, DepartmentUIComparer.Instance);
 
+                _jobButtons[id] = new Dictionary<string, List<JobButton>>();
+
                 foreach (var department in departments)
                 {
                     var departmentName = Loc.GetString($"department-{department.ID}");
                     _jobCategories[id] = new Dictionary<string, BoxContainer>();
-                    _jobButtons[id] = new Dictionary<string, JobButton>();
                     var stationAvailable = _gameTicker.JobsAvailable[id];
                     var jobsAvailable = new List<JobPrototype>();
 
@@ -223,7 +224,13 @@ private void RebuildUI()
                     foreach (var prototype in jobsAvailable)
                     {
                         var value = stationAvailable[prototype.ID];
-                        var jobButton = new JobButton(prototype.ID, value);
+
+                        var jobLabel = new Label
+                        {
+                            Margin = new Thickness(5f, 0, 0, 0)
+                        };
+
+                        var jobButton = new JobButton(jobLabel, prototype.ID, prototype.LocalizedName, value);
 
                         var jobSelector = new BoxContainer
                         {
@@ -241,14 +248,6 @@ private void RebuildUI()
                         icon.Texture = _sprites.Frame0(jobIcon.Icon);
                         jobSelector.AddChild(icon);
 
-                        var jobLabel = new Label
-                        {
-                            Margin = new Thickness(5f, 0, 0, 0),
-                            Text = value != null ?
-                                Loc.GetString("late-join-gui-job-slot-capped", ("jobName", prototype.LocalizedName), ("amount", value)) :
-                                Loc.GetString("late-join-gui-job-slot-uncapped", ("jobName", prototype.LocalizedName)),
-                        };
-
                         jobSelector.AddChild(jobLabel);
                         jobButton.AddChild(jobSelector);
                         category.AddChild(jobButton);
@@ -280,15 +279,43 @@ private void RebuildUI()
                             jobButton.Disabled = true;
                         }
 
-                        _jobButtons[id][prototype.ID] = jobButton;
+                        if (!_jobButtons[id].ContainsKey(prototype.ID))
+                        {
+                            _jobButtons[id][prototype.ID] = new List<JobButton>();
+                        }
+
+                        _jobButtons[id][prototype.ID].Add(jobButton);
                     }
                 }
             }
         }
 
-        private void JobsAvailableUpdated(IReadOnlyDictionary<NetEntity, Dictionary<string, uint?>> _)
+        private void JobsAvailableUpdated(IReadOnlyDictionary<NetEntity, Dictionary<string, uint?>> updatedJobs)
         {
-            RebuildUI();
+            foreach (var stationEntries in updatedJobs)
+            {
+                if (_jobButtons.ContainsKey(stationEntries.Key))
+                {
+                    var jobsAvailable = stationEntries.Value;
+
+                    var existingJobEntries = _jobButtons[stationEntries.Key];
+                    foreach (var existingJobEntry in existingJobEntries)
+                    {
+                        if (jobsAvailable.ContainsKey(existingJobEntry.Key))
+                        {
+                            var updatedJobValue = jobsAvailable[existingJobEntry.Key];
+                            foreach (var matchingJobButton in existingJobEntry.Value)
+                            {
+                                if (matchingJobButton.Amount != updatedJobValue)
+                                {
+                                    matchingJobButton.RefreshLabel(updatedJobValue);
+                                    matchingJobButton.Disabled |= matchingJobButton.Amount == 0;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         protected override void Dispose(bool disposing)
@@ -307,14 +334,33 @@ protected override void Dispose(bool disposing)
 
     sealed class JobButton : ContainerButton
     {
+        public Label JobLabel { get; }
         public string JobId { get; }
-        public uint? Amount { get; }
+        public string JobLocalisedName { get; }
+        public uint? Amount { get; private set; }
+        private bool _initialised = false;
 
-        public JobButton(string jobId, uint? amount)
+        public JobButton(Label jobLabel, string jobId, string jobLocalisedName, uint? amount)
         {
+            JobLabel = jobLabel;
             JobId = jobId;
-            Amount = amount;
+            JobLocalisedName = jobLocalisedName;
+            RefreshLabel(amount);
             AddStyleClass(StyleClassButton);
+            _initialised = true;
+        }
+
+        public void RefreshLabel(uint? amount)
+        {
+            if (Amount == amount && _initialised)
+            {
+                return;
+            }
+            Amount = amount;
+
+            JobLabel.Text = Amount != null ?
+                Loc.GetString("late-join-gui-job-slot-capped", ("jobName", JobLocalisedName), ("amount", Amount)) :
+                Loc.GetString("late-join-gui-job-slot-uncapped", ("jobName", JobLocalisedName));
         }
     }
 }
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml
index 2b97166f05a..6f484d8c7be 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml
@@ -124,9 +124,7 @@
             <BoxContainer
             VerticalExpand="True"
             HorizontalExpand="True"
-            Orientation="Vertical"
-            MinHeight="225"
-            >
+            Orientation="Vertical">
             <Label Text="{Loc 'lathe-menu-materials-title'}" Margin="5 5 5 5" HorizontalAlignment="Center"/>
             <BoxContainer
                 Orientation="Vertical"
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 93d80dbf9c5..ca8d2561270 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -104,41 +104,12 @@ public void PopulateRecipes()
         RecipeList.Children.Clear();
         foreach (var prototype in sortedRecipesToShow)
         {
-            StringBuilder sb = new();
-            var first = true;
-            foreach (var (id, amount) in prototype.RequiredMaterials)
-            {
-                if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto))
-                    continue;
-
-                if (first)
-                    first = false;
-                else
-                    sb.Append('\n');
-
-                var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, component.MaterialUseMultiplier);
-                var sheetVolume = _materialStorage.GetSheetVolume(proto);
-
-                var unit = Loc.GetString(proto.Unit);
-                // rounded in locale not here
-                var sheets = adjustedAmount / (float) sheetVolume;
-                var amountText = Loc.GetString("lathe-menu-material-amount", ("amount", sheets), ("unit", unit));
-                var name = Loc.GetString(proto.Name);
-                sb.Append(Loc.GetString("lathe-menu-tooltip-display", ("material", name), ("amount", amountText)));
-            }
-
-            if (!string.IsNullOrWhiteSpace(prototype.Description))
-            {
-                sb.Append('\n');
-                sb.Append(Loc.GetString("lathe-menu-description-display", ("description", prototype.Description)));
-            }
-
             var icon = prototype.Icon == null
                 ? _spriteSystem.GetPrototypeIcon(prototype.Result).Default
                 : _spriteSystem.Frame0(prototype.Icon);
             var canProduce = _lathe.CanProduce(_owner, prototype, quantity);
 
-            var control = new RecipeControl(prototype, sb.ToString(), canProduce, icon);
+            var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, icon);
             control.OnButtonPressed += s =>
             {
                 if (!int.TryParse(AmountLineEdit.Text, out var amount) || amount <= 0)
@@ -149,6 +120,51 @@ public void PopulateRecipes()
         }
     }
 
+    private string GenerateTooltipText(LatheRecipePrototype prototype)
+    {
+        StringBuilder sb = new();
+
+        foreach (var (id, amount) in prototype.RequiredMaterials)
+        {
+            if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto))
+                continue;
+
+            var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, _entityManager.GetComponent<LatheComponent>(_owner).MaterialUseMultiplier);
+            var sheetVolume = _materialStorage.GetSheetVolume(proto);
+
+            var unit = Loc.GetString(proto.Unit);
+            var sheets = adjustedAmount / (float) sheetVolume;
+
+            var availableAmount = _materialStorage.GetMaterialAmount(_owner, id);
+            var missingAmount = Math.Max(0, adjustedAmount - availableAmount);
+            var missingSheets = missingAmount / (float) sheetVolume;
+
+            var name = Loc.GetString(proto.Name);
+
+            string tooltipText;
+            if (missingSheets > 0)
+            {
+                tooltipText = Loc.GetString("lathe-menu-material-amount-missing", ("amount", sheets), ("missingAmount", missingSheets), ("unit", unit), ("material", name));
+            }
+            else
+            {
+                var amountText = Loc.GetString("lathe-menu-material-amount", ("amount", sheets), ("unit", unit));
+                tooltipText = Loc.GetString("lathe-menu-tooltip-display", ("material", name), ("amount", amountText));
+            }
+
+            sb.AppendLine(tooltipText);
+        }
+
+        if (!string.IsNullOrWhiteSpace(prototype.Description))
+            sb.AppendLine(Loc.GetString("lathe-menu-description-display", ("description", prototype.Description)));
+
+        // Remove last newline
+        if (sb.Length > 0)
+            sb.Remove(sb.Length - 1, 1);
+
+        return sb.ToString();
+    }
+
     public void UpdateCategories()
     {
         var currentCategories = new List<ProtoId<LatheCategoryPrototype>>();
diff --git a/Content.Client/Lathe/UI/RecipeControl.xaml.cs b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
index 451a988765f..bf85ff7d938 100644
--- a/Content.Client/Lathe/UI/RecipeControl.xaml.cs
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
@@ -11,17 +11,16 @@ namespace Content.Client.Lathe.UI;
 public sealed partial class RecipeControl : Control
 {
     public Action<string>? OnButtonPressed;
+    public Func<string> TooltipTextSupplier;
 
-    public string TooltipText;
-
-    public RecipeControl(LatheRecipePrototype recipe, string tooltip, bool canProduce, Texture? texture = null)
+    public RecipeControl(LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, Texture? texture = null)
     {
         RobustXamlLoader.Load(this);
 
         RecipeName.Text = recipe.Name;
         RecipeTexture.Texture = texture;
         Button.Disabled = !canProduce;
-        TooltipText = tooltip;
+        TooltipTextSupplier = tooltipTextSupplier;
         Button.TooltipSupplier = SupplyTooltip;
 
         Button.OnPressed += (_) =>
@@ -32,6 +31,6 @@ public RecipeControl(LatheRecipePrototype recipe, string tooltip, bool canProduc
 
     private Control? SupplyTooltip(Control sender)
     {
-        return new RecipeTooltip(TooltipText);
+        return new RecipeTooltip(TooltipTextSupplier());
     }
 }
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index fe31dce0629..bed52217a99 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -43,9 +43,7 @@ public sealed class LobbyState : Robust.Client.State.State
         protected override void Startup()
         {
             if (_userInterfaceManager.ActiveScreen == null)
-            {
                 return;
-            }
 
             _lobby = (LobbyGui) _userInterfaceManager.ActiveScreen;
 
@@ -70,7 +68,7 @@ protected override void Startup()
             _characterSetup.SaveButton.OnPressed += _ =>
             {
                 _characterSetup.Save();
-                _lobby.CharacterPreview.UpdateUI();
+                _userInterfaceManager.GetUIController<LobbyUIController>().UpdateCharacterUI();
             };
 
             LayoutContainer.SetAnchorPreset(_lobby, LayoutContainer.LayoutPreset.Wide);
@@ -84,10 +82,6 @@ protected override void Startup()
             _gameTicker.InfoBlobUpdated += UpdateLobbyUi;
             _gameTicker.LobbyStatusUpdated += LobbyStatusUpdated;
             _gameTicker.LobbyLateJoinStatusUpdated += LobbyLateJoinStatusUpdated;
-
-            _preferencesManager.OnServerDataLoaded += PreferencesDataLoaded;
-
-            _lobby.CharacterPreview.UpdateUI();
         }
 
         protected override void Shutdown()
@@ -109,13 +103,6 @@ protected override void Shutdown()
 
             _characterSetup?.Dispose();
             _characterSetup = null;
-
-            _preferencesManager.OnServerDataLoaded -= PreferencesDataLoaded;
-        }
-
-        private void PreferencesDataLoaded()
-        {
-            _lobby?.CharacterPreview.UpdateUI();
         }
 
         private void OnSetupPressed(BaseButton.ButtonEventArgs args)
@@ -127,9 +114,7 @@ private void OnSetupPressed(BaseButton.ButtonEventArgs args)
         private void OnReadyPressed(BaseButton.ButtonEventArgs args)
         {
             if (!_gameTicker.IsGameStarted)
-            {
                 return;
-            }
 
             new LateJoinGui().OpenCentered();
         }
@@ -153,9 +138,7 @@ public override void FrameUpdate(FrameEventArgs e)
             string text;
 
             if (_gameTicker.Paused)
-            {
                 text = Loc.GetString("lobby-state-paused");
-            }
             else if (_gameTicker.StartTime < _gameTiming.CurTime)
             {
                 _lobby!.StartTime.Text = Loc.GetString("lobby-state-soon");
@@ -166,13 +149,11 @@ public override void FrameUpdate(FrameEventArgs e)
                 var difference = _gameTicker.StartTime - _gameTiming.CurTime;
                 var seconds = difference.TotalSeconds;
                 if (seconds < 0)
-                {
-                    text = Loc.GetString(seconds < -5 ? "lobby-state-right-now-question" : "lobby-state-right-now-confirmation");
-                }
+                    text = Loc.GetString(seconds < -5
+                        ? "lobby-state-right-now-question"
+                        : "lobby-state-right-now-confirmation");
                 else
-                {
                     text = $"{difference.Minutes}:{difference.Seconds:D2}";
-                }
             }
 
             _lobby!.StartTime.Text = Loc.GetString("lobby-state-round-start-countdown-text", ("timeLeft", text));
@@ -209,21 +190,15 @@ private void UpdateLobbyUi()
             }
 
             if (_gameTicker.ServerInfoBlob != null)
-            {
                 _lobby!.ServerInfo.SetInfoBlob(_gameTicker.ServerInfoBlob);
-            }
         }
 
         private void UpdateLobbySoundtrackInfo(LobbySoundtrackChangedEvent ev)
         {
             if (ev.SoundtrackFilename == null)
-            {
                 _lobby!.LobbySong.SetMarkup(Loc.GetString("lobby-state-song-no-song-text"));
-            }
-            else if (
-                ev.SoundtrackFilename != null
-                && _resourceCache.TryGetResource<AudioResource>(ev.SoundtrackFilename, out var lobbySongResource)
-                )
+            else if (ev.SoundtrackFilename != null
+                && _resourceCache.TryGetResource<AudioResource>(ev.SoundtrackFilename, out var lobbySongResource))
             {
                 var lobbyStream = lobbySongResource.AudioStream;
 
@@ -246,22 +221,16 @@ private void UpdateLobbySoundtrackInfo(LobbySoundtrackChangedEvent ev)
         private void UpdateLobbyBackground()
         {
             if (_gameTicker.LobbyBackground != null)
-            {
-                _lobby!.Background.Texture = _resourceCache.GetResource<TextureResource>(_gameTicker.LobbyBackground );
-            }
+                _lobby!.Background.Texture = _resourceCache.GetResource<TextureResource>(_gameTicker.LobbyBackground);
             else
-            {
                 _lobby!.Background.Texture = null;
-            }
 
         }
 
         private void SetReady(bool newReady)
         {
             if (_gameTicker.IsGameStarted)
-            {
                 return;
-            }
 
             _consoleHost.ExecuteCommand($"toggleready {newReady}");
         }
diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
new file mode 100644
index 00000000000..4b08d011d7f
--- /dev/null
+++ b/Content.Client/Lobby/LobbyUIController.cs
@@ -0,0 +1,201 @@
+using System.Linq;
+using Content.Client.Humanoid;
+using Content.Client.Inventory;
+using Content.Client.Lobby.UI;
+using Content.Client.Preferences;
+using Content.Client.Preferences.UI;
+using Content.Shared.Clothing.Loadouts.Systems;
+using Content.Shared.GameTicking;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Robust.Client.State;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controllers;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Lobby;
+
+public sealed class LobbyUIController : UIController, IOnStateEntered<LobbyState>, IOnStateExited<LobbyState>
+{
+    [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
+    [Dependency] private readonly IStateManager _stateManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [UISystemDependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
+    [UISystemDependency] private readonly ClientInventorySystem _inventory = default!;
+    [UISystemDependency] private readonly LoadoutSystem _loadouts = default!;
+
+    private LobbyCharacterPanel? _previewPanel;
+    private HumanoidProfileEditor? _profileEditor;
+
+    /*
+     * Each character profile has its own dummy. There is also a dummy for the lobby screen + character editor
+     * that is shared too.
+     */
+
+    /// <summary>
+    ///     Preview dummy for role gear.
+    /// </summary>
+    private EntityUid? _previewDummy;
+
+    [Access(typeof(HumanoidProfileEditor))]
+    public bool UpdateClothes = true;
+    [Access(typeof(HumanoidProfileEditor))]
+    public bool ShowClothes = true;
+    [Access(typeof(HumanoidProfileEditor))]
+    public bool ShowLoadouts = true;
+
+    // TODO: Load the species directly and don't update entity ever.
+    public event Action<EntityUid>? PreviewDummyUpdated;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _preferencesManager.OnServerDataLoaded += PreferencesDataLoaded;
+    }
+
+    private void PreferencesDataLoaded()
+    {
+        if (_previewDummy != null)
+            EntityManager.DeleteEntity(_previewDummy);
+
+        UpdateCharacterUI();
+    }
+
+    public void OnStateEntered(LobbyState state)
+    {
+    }
+
+    public void OnStateExited(LobbyState state)
+    {
+        EntityManager.DeleteEntity(_previewDummy);
+        _previewDummy = null;
+    }
+
+    public void SetPreviewPanel(LobbyCharacterPanel? panel)
+    {
+        _previewPanel = panel;
+        UpdateCharacterUI();
+    }
+
+    public void SetProfileEditor(HumanoidProfileEditor? editor)
+    {
+        _profileEditor = editor;
+        UpdateCharacterUI();
+    }
+
+    public void UpdateCharacterUI()
+    {
+        // Test moment
+        if (_stateManager.CurrentState is not LobbyState)
+            return;
+
+        if (!_preferencesManager.ServerDataLoaded)
+        {
+            _previewPanel?.SetLoaded(false);
+            return;
+        }
+
+        if (_previewDummy == null)
+        {
+            _previewDummy =
+                EntityManager.SpawnEntity(
+                    _prototypeManager.Index<SpeciesPrototype>(HumanoidCharacterProfile.DefaultWithSpecies().Species)
+                        .DollPrototype, MapCoordinates.Nullspace);
+            _previewPanel?.SetSprite(_previewDummy.Value);
+        }
+
+        _previewPanel?.SetLoaded(true);
+
+        if (_preferencesManager.Preferences?.SelectedCharacter is not HumanoidCharacterProfile selectedCharacter)
+            _previewPanel?.SetSummaryText(string.Empty);
+        else if (_previewDummy != null)
+        {
+            var maybeProfile = _profileEditor?.Profile ?? selectedCharacter;
+            _previewPanel?.SetSummaryText(maybeProfile.Summary);
+            _humanoid.LoadProfile(_previewDummy.Value, maybeProfile);
+
+
+            if (UpdateClothes)
+            {
+                RemoveDummyClothes(_previewDummy.Value);
+                if (ShowClothes)
+                    GiveDummyJobClothes(_previewDummy.Value, GetPreferredJob(maybeProfile), maybeProfile);
+                if (ShowLoadouts)
+                    GiveDummyLoadouts(_previewDummy.Value, GetPreferredJob(maybeProfile), maybeProfile);
+                UpdateClothes = false;
+            }
+
+            PreviewDummyUpdated?.Invoke(_previewDummy.Value);
+        }
+    }
+
+
+    /// <summary>
+    ///     Gets the highest priority job for the profile.
+    /// </summary>
+    public JobPrototype GetPreferredJob(HumanoidCharacterProfile profile)
+    {
+        var highPriorityJob = profile.JobPriorities.FirstOrDefault(p => p.Value == JobPriority.High).Key;
+        // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract (what is ReSharper smoking?)
+        return _prototypeManager.Index<JobPrototype>(highPriorityJob ?? SharedGameTicker.FallbackOverflowJob);
+    }
+
+    public void RemoveDummyClothes(EntityUid dummy)
+    {
+        if (!_inventory.TryGetSlots(dummy, out var slots))
+            return;
+
+        foreach (var slot in slots)
+            if (_inventory.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false))
+                EntityManager.DeleteEntity(unequippedItem.Value);
+    }
+
+    /// <summary>
+    ///     Applies the highest priority job's clothes and loadouts to the dummy.
+    /// </summary>
+    public void GiveDummyJobClothesLoadout(EntityUid dummy, HumanoidCharacterProfile profile)
+    {
+        var job = GetPreferredJob(profile);
+        GiveDummyJobClothes(dummy, job, profile);
+        GiveDummyLoadouts(dummy, job, profile);
+    }
+
+    public void GiveDummyLoadouts(EntityUid dummy, JobPrototype job, HumanoidCharacterProfile profile)
+    {
+        _loadouts.ApplyCharacterLoadout(dummy, job, profile);
+    }
+
+    /// <summary>
+    ///     Applies the specified job's clothes to the dummy.
+    /// </summary>
+    public void GiveDummyJobClothes(EntityUid dummy, JobPrototype job, HumanoidCharacterProfile profile)
+    {
+        if (!_inventory.TryGetSlots(dummy, out var slots)
+            || job.StartingGear == null)
+            return;
+
+        var gear = _prototypeManager.Index<StartingGearPrototype>(job.StartingGear);
+
+        foreach (var slot in slots)
+        {
+            var itemType = gear.GetGear(slot.Name, profile);
+
+            if (_inventory.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false))
+                EntityManager.DeleteEntity(unequippedItem.Value);
+
+            if (itemType == string.Empty)
+                continue;
+
+            var item = EntityManager.SpawnEntity(itemType, MapCoordinates.Nullspace);
+            _inventory.TryEquip(dummy, item, slot.Name, true, true);
+        }
+    }
+
+    public EntityUid? GetPreviewDummy()
+    {
+        return _previewDummy;
+    }
+}
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml b/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml
new file mode 100644
index 00000000000..997507414cd
--- /dev/null
+++ b/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml
@@ -0,0 +1,22 @@
+<Control
+    xmlns="https://spacestation14.io"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <BoxContainer Name="VBox" Orientation="Vertical">
+        <controls:NanoHeading Name="Header" Text="{Loc 'lobby-character-preview-panel-header'}">
+
+        </controls:NanoHeading>
+        <BoxContainer Name="Loaded" Orientation="Vertical"
+                      Visible="False">
+            <Label Name="Summary" HorizontalAlignment="Center" Margin="3 3"/>
+            <BoxContainer Name="ViewBox" Orientation="Horizontal" HorizontalAlignment="Center">
+
+            </BoxContainer>
+            <controls:VSpacer/>
+            <Button Name="CharacterSetup" Text="{Loc 'lobby-character-preview-panel-character-setup-button'}"
+                    HorizontalAlignment="Center"
+                    Margin="0 5 0 0"/>
+        </BoxContainer>
+        <Label Name="Unloaded" Text="{Loc 'lobby-character-preview-panel-unloaded-preferences-label'}"/>
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml.cs b/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml.cs
new file mode 100644
index 00000000000..160f1d72012
--- /dev/null
+++ b/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml.cs
@@ -0,0 +1,45 @@
+using System.Numerics;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Lobby.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class LobbyCharacterPanel : Control
+{
+    public Button CharacterSetupButton => CharacterSetup;
+
+    public LobbyCharacterPanel()
+    {
+        RobustXamlLoader.Load(this);
+        UserInterfaceManager.GetUIController<LobbyUIController>().SetPreviewPanel(this);
+    }
+
+    public void SetLoaded(bool value)
+    {
+        Loaded.Visible = value;
+        Unloaded.Visible = !value;
+    }
+
+    public void SetSummaryText(string value)
+    {
+        Summary.Text = value;
+    }
+
+    public void SetSprite(EntityUid uid)
+    {
+        ViewBox.DisposeAllChildren();
+        var spriteView = new SpriteView
+        {
+            OverrideDirection = Direction.South,
+            Scale = new Vector2(4f, 4f),
+            MaxSize = new Vector2(112, 112),
+            Stretch = SpriteView.StretchMode.Fill,
+        };
+        spriteView.SetEntity(uid);
+        ViewBox.AddChild(spriteView);
+    }
+}
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
deleted file mode 100644
index 59a518f2696..00000000000
--- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-using System.Linq;
-using System.Numerics;
-using Content.Client.Humanoid;
-using Content.Client.Inventory;
-using Content.Client.Preferences;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Clothing.Loadouts.Systems;
-using Content.Shared.GameTicking;
-using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Preferences;
-using Content.Shared.Roles;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
-
-namespace Content.Client.Lobby.UI
-{
-    public sealed class LobbyCharacterPreviewPanel : Control
-    {
-        [Dependency] private readonly IEntityManager _entityManager = default!;
-        [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
-
-        private EntityUid? _previewDummy;
-        private readonly Label _summaryLabel;
-        private readonly BoxContainer _loaded;
-        private readonly BoxContainer _viewBox;
-        private readonly Label _unloaded;
-
-        public LobbyCharacterPreviewPanel()
-        {
-            IoCManager.InjectDependencies(this);
-            var header = new NanoHeading
-            {
-                Text = Loc.GetString("lobby-character-preview-panel-header")
-            };
-
-            CharacterSetupButton = new Button
-            {
-                Text = Loc.GetString("lobby-character-preview-panel-character-setup-button"),
-                HorizontalAlignment = HAlignment.Center,
-                Margin = new Thickness(0, 5, 0, 0),
-            };
-
-            _summaryLabel = new Label
-            {
-                HorizontalAlignment = HAlignment.Center,
-                Margin = new Thickness(3, 3),
-            };
-
-            var vBox = new BoxContainer
-            {
-                Orientation = LayoutOrientation.Vertical
-            };
-            _unloaded = new Label { Text = Loc.GetString("lobby-character-preview-panel-unloaded-preferences-label") };
-
-            _loaded = new BoxContainer
-            {
-                Orientation = LayoutOrientation.Vertical,
-                Visible = false
-            };
-            _viewBox = new BoxContainer
-            {
-                Orientation = LayoutOrientation.Horizontal,
-                HorizontalAlignment = HAlignment.Center,
-            };
-            var _vSpacer = new VSpacer();
-
-            _loaded.AddChild(_summaryLabel);
-            _loaded.AddChild(_viewBox);
-            _loaded.AddChild(_vSpacer);
-            _loaded.AddChild(CharacterSetupButton);
-
-            vBox.AddChild(header);
-            vBox.AddChild(_loaded);
-            vBox.AddChild(_unloaded);
-            AddChild(vBox);
-
-            UpdateUI();
-        }
-
-        public Button CharacterSetupButton { get; }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (!disposing) return;
-            if (_previewDummy != null) _entityManager.DeleteEntity(_previewDummy.Value);
-            _previewDummy = default;
-        }
-
-        public void UpdateUI()
-        {
-            if (!_preferencesManager.ServerDataLoaded)
-            {
-                _loaded.Visible = false;
-                _unloaded.Visible = true;
-            }
-            else
-            {
-                _loaded.Visible = true;
-                _unloaded.Visible = false;
-                if (_preferencesManager.Preferences?.SelectedCharacter is not HumanoidCharacterProfile selectedCharacter)
-                {
-                    _summaryLabel.Text = string.Empty;
-                }
-                else
-                {
-                    _previewDummy = _entityManager.SpawnEntity(_prototypeManager.Index<SpeciesPrototype>(selectedCharacter.Species).DollPrototype, MapCoordinates.Nullspace);
-                    _viewBox.DisposeAllChildren();
-                    var spriteView = new SpriteView
-                    {
-                        OverrideDirection = Direction.South,
-                        Scale = new Vector2(4f, 4f),
-                        MaxSize = new Vector2(112, 112),
-                        Stretch = SpriteView.StretchMode.Fill,
-                    };
-                    spriteView.SetEntity(_previewDummy.Value);
-                    _viewBox.AddChild(spriteView);
-                    _summaryLabel.Text = selectedCharacter.Summary;
-                    _entityManager.System<HumanoidAppearanceSystem>().LoadProfile(_previewDummy.Value, selectedCharacter);
-                    GiveDummyJobClothes(_previewDummy.Value, selectedCharacter);
-                    GiveDummyLoadoutItems(_previewDummy.Value, selectedCharacter);
-                }
-            }
-        }
-
-        public static void GiveDummyJobClothes(EntityUid dummy, HumanoidCharacterProfile profile)
-        {
-            var protoMan = IoCManager.Resolve<IPrototypeManager>();
-            var entMan = IoCManager.Resolve<IEntityManager>();
-            var invSystem = EntitySystem.Get<ClientInventorySystem>();
-
-            var highPriorityJob = profile.JobPriorities.FirstOrDefault(p => p.Value == JobPriority.High).Key;
-
-            // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract (what is resharper smoking?)
-            var job = protoMan.Index<JobPrototype>(highPriorityJob ?? SharedGameTicker.FallbackOverflowJob);
-
-            if (job.StartingGear != null && invSystem.TryGetSlots(dummy, out var slots))
-            {
-                var gear = protoMan.Index<StartingGearPrototype>(job.StartingGear);
-
-                foreach (var slot in slots)
-                {
-                    var itemType = gear.GetGear(slot.Name, profile);
-
-                    if (invSystem.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false))
-                    {
-                        entMan.DeleteEntity(unequippedItem.Value);
-                    }
-
-                    if (itemType != string.Empty)
-                    {
-                        var item = entMan.SpawnEntity(itemType, MapCoordinates.Nullspace);
-                        invSystem.TryEquip(dummy, item, slot.Name, true, true);
-                    }
-                }
-            }
-        }
-
-        public static void GiveDummyLoadoutItems(EntityUid dummy, HumanoidCharacterProfile profile)
-        {
-            var highPriorityJobId = profile.JobPriorities.FirstOrDefault(j => j.Value == JobPriority.High).Key;
-            var highPriorityJob = IoCManager.Resolve<IPrototypeManager>().Index<JobPrototype>(highPriorityJobId ?? SharedGameTicker.FallbackOverflowJob);
-
-            EntitySystem.Get<LoadoutSystem>().ApplyCharacterLoadout(dummy, highPriorityJob, profile);
-        }
-    }
-}
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index c3bd0da642a..ea9c63d6cd5 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -94,7 +94,7 @@
                     <Label Name="StationTime" Access="Public" FontColorOverride="{x:Static maths:Color.LightGray}"
                            Margin="3 3 3 3" HorizontalAlignment="Left" />
                     <controls:HSpacer Spacing="5" />
-                    <lobbyUi:LobbyCharacterPreviewPanel Name="CharacterPreview" Access="Public" />
+                    <lobbyUi:LobbyCharacterPanel Name="CharacterPreview" Access="Public" />
                     <controls:HSpacer Spacing="5" />
                     <BoxContainer MinHeight="10" />
                     <!-- Gold line -->
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index 69867ea90cb..5a0b580262e 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -1,23 +1,9 @@
-using Content.Client.Chat.UI;
-using Content.Client.Info;
 using Content.Client.Message;
-using Content.Client.Preferences;
-using Content.Client.Preferences.UI;
-using Content.Client.UserInterface.Screens;
-using Content.Client.UserInterface.Systems.Chat.Widgets;
 using Content.Client.UserInterface.Systems.EscapeMenu;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
-using Robust.Client.Graphics;
-using Robust.Client.State;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Lobby.UI
 {
diff --git a/Content.Client/Materials/UI/MaterialStorageControl.xaml b/Content.Client/Materials/UI/MaterialStorageControl.xaml
index e5044346493..2be0f40aa51 100644
--- a/Content.Client/Materials/UI/MaterialStorageControl.xaml
+++ b/Content.Client/Materials/UI/MaterialStorageControl.xaml
@@ -1,7 +1,8 @@
-<BoxContainer xmlns="https://spacestation14.io"
-              Orientation="Vertical"
+<ScrollContainer xmlns="https://spacestation14.io"
               SizeFlagsStretchRatio="8"
               HorizontalExpand="True"
               VerticalExpand="True">
-    <Label Name="NoMatsLabel" Text="{Loc 'lathe-menu-no-materials-message'}" Align="Center"/>
-</BoxContainer>
+    <BoxContainer Name="MaterialList" Orientation="Vertical">
+        <Label Name="NoMatsLabel" Text="{Loc 'lathe-menu-no-materials-message'}" Align="Center"/>
+    </BoxContainer>
+</ScrollContainer>
diff --git a/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs b/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs
index 3ef247d5297..31d99624a8a 100644
--- a/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs
+++ b/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs
@@ -11,7 +11,7 @@ namespace Content.Client.Materials.UI;
 /// This widget is one row in the lathe eject menu.
 /// </summary>
 [GenerateTypedNameReferences]
-public sealed partial class MaterialStorageControl : BoxContainer
+public sealed partial class MaterialStorageControl : ScrollContainer
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
 
@@ -63,7 +63,7 @@ protected override void FrameUpdate(FrameEventArgs args)
         }
 
         var children = new List<MaterialDisplay>();
-        children.AddRange(Children.OfType<MaterialDisplay>());
+        children.AddRange(MaterialList.Children.OfType<MaterialDisplay>());
 
         foreach (var display in children)
         {
@@ -71,7 +71,7 @@ protected override void FrameUpdate(FrameEventArgs args)
 
             if (extra.Contains(mat))
             {
-                RemoveChild(display);
+                MaterialList.RemoveChild(display);
                 continue;
             }
 
@@ -83,7 +83,7 @@ protected override void FrameUpdate(FrameEventArgs args)
         foreach (var mat in missing)
         {
             var volume = mats[mat];
-            AddChild(new MaterialDisplay(_owner.Value, mat, volume, canEject));
+            MaterialList.AddChild(new MaterialDisplay(_owner.Value, mat, volume, canEject));
         }
 
         _currentMaterials = mats;
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index 39326c8a99c..863412e5532 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -210,9 +210,9 @@ private void PopulateDepartmentList(IEnumerable<SuitSensorStatus> departmentSens
                 specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Alerts/human_crew_monitoring.rsi"), "dead");
             }
 
-            else if (sensor.TotalDamage != null)
+            else if (sensor.DamagePercentage != null)
             {
-                var index = MathF.Round(4f * (sensor.TotalDamage.Value / 100f));
+                var index = MathF.Round(4f * sensor.DamagePercentage.Value);
 
                 if (index >= 5)
                     specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Alerts/human_crew_monitoring.rsi"), "critical");
diff --git a/Content.Client/Movement/Systems/JetpackSystem.cs b/Content.Client/Movement/Systems/JetpackSystem.cs
index f0836ee9b6f..b7f5e48821f 100644
--- a/Content.Client/Movement/Systems/JetpackSystem.cs
+++ b/Content.Client/Movement/Systems/JetpackSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Movement.Systems;
 using Robust.Client.GameObjects;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
 
@@ -12,7 +13,6 @@ namespace Content.Client.Movement.Systems;
 public sealed class JetpackSystem : SharedJetpackSystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly ClothingSystem _clothing = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
@@ -75,7 +75,7 @@ private void CreateParticles(EntityUid uid)
         var coordinates = uidXform.Coordinates;
         var gridUid = coordinates.GetGridUid(EntityManager);
 
-        if (_mapManager.TryGetGrid(gridUid, out var grid))
+        if (TryComp<MapGridComponent>(gridUid, out var grid))
         {
             coordinates = new EntityCoordinates(gridUid.Value, grid.WorldToLocal(coordinates.ToMapPos(EntityManager, _transform)));
         }
diff --git a/Content.Client/Movement/Systems/WaddleAnimationSystem.cs b/Content.Client/Movement/Systems/WaddleAnimationSystem.cs
new file mode 100644
index 00000000000..9555c1f6b9e
--- /dev/null
+++ b/Content.Client/Movement/Systems/WaddleAnimationSystem.cs
@@ -0,0 +1,173 @@
+using System.Numerics;
+using Content.Client.Buckle;
+using Content.Client.Gravity;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Events;
+using Content.Shared.StatusEffect;
+using Content.Shared.Stunnable;
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Shared.Animations;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Movement.Systems;
+
+public sealed class WaddleAnimationSystem : EntitySystem
+{
+    [Dependency] private readonly AnimationPlayerSystem _animation = default!;
+    [Dependency] private readonly GravitySystem _gravity = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly BuckleSystem _buckle = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<WaddleAnimationComponent, MoveInputEvent>(OnMovementInput);
+        SubscribeLocalEvent<WaddleAnimationComponent, StartedWaddlingEvent>(OnStartedWalking);
+        SubscribeLocalEvent<WaddleAnimationComponent, StoppedWaddlingEvent>(OnStoppedWalking);
+        SubscribeLocalEvent<WaddleAnimationComponent, AnimationCompletedEvent>(OnAnimationCompleted);
+        SubscribeLocalEvent<WaddleAnimationComponent, StunnedEvent>(OnStunned);
+        SubscribeLocalEvent<WaddleAnimationComponent, KnockedDownEvent>(OnKnockedDown);
+        SubscribeLocalEvent<WaddleAnimationComponent, BuckleChangeEvent>(OnBuckleChange);
+    }
+
+    private void OnMovementInput(EntityUid entity, WaddleAnimationComponent component, MoveInputEvent args)
+    {
+        // Prediction mitigation. Prediction means that MoveInputEvents are spammed repeatedly, even though you'd assume
+        // they're once-only for the user actually doing something. As such do nothing if we're just repeating this FoR.
+        if (!_timing.IsFirstTimePredicted)
+        {
+            return;
+        }
+
+        if (!args.HasDirectionalMovement && component.IsCurrentlyWaddling)
+        {
+            var stopped = new StoppedWaddlingEvent(entity);
+
+            RaiseLocalEvent(entity, ref stopped);
+
+            return;
+        }
+
+        // Only start waddling if we're not currently AND we're actually moving.
+        if (component.IsCurrentlyWaddling || !args.HasDirectionalMovement)
+            return;
+
+        var started = new StartedWaddlingEvent(entity);
+
+        RaiseLocalEvent(entity, ref started);
+    }
+
+    private void OnStartedWalking(EntityUid uid, WaddleAnimationComponent component, StartedWaddlingEvent args)
+    {
+        if (_animation.HasRunningAnimation(uid, component.KeyName))
+            return;
+
+        if (!TryComp<InputMoverComponent>(uid, out var mover))
+            return;
+
+        if (_gravity.IsWeightless(uid))
+            return;
+
+
+        if (!_actionBlocker.CanMove(uid, mover))
+            return;
+
+        // Do nothing if buckled in
+        if (_buckle.IsBuckled(uid))
+            return;
+
+        // Do nothing if crit or dead (for obvious reasons)
+        if (_mobState.IsIncapacitated(uid))
+            return;
+
+        var tumbleIntensity = component.LastStep ? 360 - component.TumbleIntensity : component.TumbleIntensity;
+        var len = mover.Sprinting ? component.AnimationLength * component.RunAnimationLengthMultiplier : component.AnimationLength;
+
+        component.LastStep = !component.LastStep;
+        component.IsCurrentlyWaddling = true;
+
+        var anim = new Animation()
+        {
+            Length = TimeSpan.FromSeconds(len),
+            AnimationTracks =
+            {
+                new AnimationTrackComponentProperty()
+                {
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Rotation),
+                    InterpolationMode = AnimationInterpolationMode.Linear,
+                    KeyFrames =
+                    {
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(0), 0),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(tumbleIntensity), len/2),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(0), len/2),
+                    }
+                },
+                new AnimationTrackComponentProperty()
+                {
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Offset),
+                    InterpolationMode = AnimationInterpolationMode.Linear,
+                    KeyFrames =
+                    {
+                        new AnimationTrackProperty.KeyFrame(new Vector2(), 0),
+                        new AnimationTrackProperty.KeyFrame(component.HopIntensity, len/2),
+                        new AnimationTrackProperty.KeyFrame(new Vector2(), len/2),
+                    }
+                }
+            }
+        };
+
+        _animation.Play(uid, anim, component.KeyName);
+    }
+
+    private void OnStoppedWalking(EntityUid uid, WaddleAnimationComponent component, StoppedWaddlingEvent args)
+    {
+        StopWaddling(uid, component);
+    }
+
+    private void OnAnimationCompleted(EntityUid uid, WaddleAnimationComponent component, AnimationCompletedEvent args)
+    {
+        var started = new StartedWaddlingEvent(uid);
+
+        RaiseLocalEvent(uid, ref started);
+    }
+
+    private void OnStunned(EntityUid uid, WaddleAnimationComponent component, StunnedEvent args)
+    {
+        StopWaddling(uid, component);
+    }
+
+    private void OnKnockedDown(EntityUid uid, WaddleAnimationComponent component, KnockedDownEvent args)
+    {
+        StopWaddling(uid, component);
+    }
+
+    private void OnBuckleChange(EntityUid uid, WaddleAnimationComponent component, BuckleChangeEvent args)
+    {
+        StopWaddling(uid, component);
+    }
+
+    private void StopWaddling(EntityUid uid, WaddleAnimationComponent component)
+    {
+        if (!component.IsCurrentlyWaddling)
+            return;
+
+        _animation.Stop(uid, component.KeyName);
+
+        if (!TryComp<SpriteComponent>(uid, out var sprite))
+        {
+            return;
+        }
+
+        sprite.Offset = new Vector2();
+        sprite.Rotation = Angle.FromDegrees(0);
+
+        component.IsCurrentlyWaddling = false;
+    }
+}
diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs
index 7bf3df1f0b9..709601a57b6 100644
--- a/Content.Client/NPC/PathfindingSystem.cs
+++ b/Content.Client/NPC/PathfindingSystem.cs
@@ -289,7 +289,6 @@ private void DrawScreen(OverlayDrawArgs args, DrawingHandleScreen screenHandle)
 
                 var invGridMatrix = gridXform.InvWorldMatrix;
                 DebugPathPoly? nearest = null;
-                var nearestDistance = float.MaxValue;
 
                 foreach (var poly in tile)
                 {
diff --git a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
index f10eb9ed8b1..691bcb41dbd 100644
--- a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
+++ b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
@@ -80,7 +80,7 @@ private void DrawScreen(in OverlayDrawArgs args)
 
 
             var xform = _entityManager.GetComponent<TransformComponent>(_entityManager.GetEntity(node.Entity));
-            if (!_mapManager.TryGetGrid(xform.GridUid, out var grid))
+            if (!_entityManager.TryGetComponent<MapGridComponent>(xform.GridUid, out var grid))
                 return;
             var gridTile = grid.TileIndicesFor(xform.Coordinates);
 
@@ -145,7 +145,7 @@ private void DrawWorld(in OverlayDrawArgs overlayDrawArgs)
 
             foreach (var (gridId, gridDict) in _gridIndex)
             {
-                var grid = _mapManager.GetGrid(gridId);
+                var grid = _entityManager.GetComponent<MapGridComponent>(gridId);
                 var (_, _, worldMatrix, invMatrix) = _entityManager.GetComponent<TransformComponent>(gridId).GetWorldPositionRotationMatrixWithInv();
 
                 var lCursorBox = invMatrix.TransformBox(cursorBox);
diff --git a/Content.Client/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Client/Nutrition/EntitySystems/OpenableSystem.cs
deleted file mode 100644
index f8c3f7c447f..00000000000
--- a/Content.Client/Nutrition/EntitySystems/OpenableSystem.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Nutrition.EntitySystems;
-
-namespace Content.Client.Nutrition.EntitySystems;
-
-public sealed class OpenableSystem : SharedOpenableSystem
-{
-}
diff --git a/Content.Client/OfferItem/OfferItemIndicatorsOverlay.cs b/Content.Client/OfferItem/OfferItemIndicatorsOverlay.cs
new file mode 100644
index 00000000000..16a314a2cf4
--- /dev/null
+++ b/Content.Client/OfferItem/OfferItemIndicatorsOverlay.cs
@@ -0,0 +1,72 @@
+using System.Numerics;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.UserInterface;
+using Robust.Shared.Enums;
+using Robust.Shared.Utility;
+
+namespace Content.Client.OfferItem;
+
+public sealed class OfferItemIndicatorsOverlay : Overlay
+{
+    private readonly IInputManager _inputManager;
+    private readonly IEntityManager _entMan;
+    private readonly IEyeManager _eye;
+    private readonly OfferItemSystem _offer;
+
+    private readonly Texture _sight;
+
+    public override OverlaySpace Space => OverlaySpace.ScreenSpace;
+
+    private readonly Color _mainColor = Color.White.WithAlpha(0.3f);
+    private readonly Color _strokeColor = Color.Black.WithAlpha(0.5f);
+    private readonly float _scale = 0.6f;  // 1 is a little big
+
+    public OfferItemIndicatorsOverlay(IInputManager input, IEntityManager entMan,
+            IEyeManager eye, OfferItemSystem offerSys)
+    {
+        _inputManager = input;
+        _entMan = entMan;
+        _eye = eye;
+        _offer = offerSys;
+
+        var spriteSys = _entMan.EntitySysManager.GetEntitySystem<SpriteSystem>();
+        _sight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/give_item.rsi"),
+            "give_item"));
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (!_offer.IsInOfferMode())
+            return false;
+
+        return base.BeforeDraw(in args);
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        var mouseScreenPosition = _inputManager.MouseScreenPosition;
+        var mousePosMap = _eye.PixelToMap(mouseScreenPosition);
+        if (mousePosMap.MapId != args.MapId)
+            return;
+
+
+        var mousePos = mouseScreenPosition.Position;
+        var uiScale = (args.ViewportControl as Control)?.UIScale ?? 1f;
+        var limitedScale = uiScale > 1.25f ? 1.25f : uiScale;
+
+        DrawSight(_sight, args.ScreenHandle, mousePos, limitedScale * _scale);
+    }
+
+    private void DrawSight(Texture sight, DrawingHandleScreen screen, Vector2 centerPos, float scale)
+    {
+        var sightSize = sight.Size * scale;
+        var expandedSize = sightSize + new Vector2(7f, 7f);
+
+        screen.DrawTextureRect(sight,
+            UIBox2.FromDimensions(centerPos - sightSize * 0.5f, sightSize), _strokeColor);
+        screen.DrawTextureRect(sight,
+            UIBox2.FromDimensions(centerPos - expandedSize * 0.5f, expandedSize), _mainColor);
+    }
+}
diff --git a/Content.Client/OfferItem/OfferItemSystem.cs b/Content.Client/OfferItem/OfferItemSystem.cs
new file mode 100644
index 00000000000..51b8dcbc0bc
--- /dev/null
+++ b/Content.Client/OfferItem/OfferItemSystem.cs
@@ -0,0 +1,51 @@
+using Content.Shared.CCVar;
+using Content.Shared.OfferItem;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.Player;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.OfferItem;
+
+public sealed class OfferItemSystem : SharedOfferItemSystem
+{
+    [Dependency] private readonly IOverlayManager _overlayManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IInputManager _inputManager = default!;
+    [Dependency] private readonly IEyeManager _eye = default!;
+
+    public override void Initialize()
+    {
+        Subs.CVar(_cfg, CCVars.OfferModeIndicatorsPointShow, OnShowOfferIndicatorsChanged, true);
+    }
+    public override void Shutdown()
+    {
+        _overlayManager.RemoveOverlay<OfferItemIndicatorsOverlay>();
+
+        base.Shutdown();
+    }
+
+    public bool IsInOfferMode()
+    {
+        var entity = _playerManager.LocalEntity;
+
+        if (entity == null)
+            return false;
+
+        return IsInOfferMode(entity.Value);
+    }
+    private void OnShowOfferIndicatorsChanged(bool isShow)
+    {
+        if (isShow)
+        {
+            _overlayManager.AddOverlay(new OfferItemIndicatorsOverlay(
+                _inputManager,
+                EntityManager,
+                _eye,
+                this));
+        }
+        else
+            _overlayManager.RemoveOverlay<OfferItemIndicatorsOverlay>();
+    }
+}
diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml b/Content.Client/Options/UI/Tabs/AudioTab.xaml
index e54b0dc34ee..8dd723d446d 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml
@@ -100,6 +100,19 @@
                     <Label Name="AmbienceSoundsLabel" MinSize="48 0" Align="Right" />
                     <Control MinSize="4 0"/>
                 </BoxContainer>
+                <BoxContainer Orientation="Horizontal" Margin="5 0 0 0">
+                    <Label Text="{Loc 'ui-options-announcer-volume'}" HorizontalExpand="True" />
+                    <Control MinSize="8 0" />
+                    <Slider Name="AnnouncerVolumeSlider"
+                            MinValue="0"
+                            MaxValue="100"
+                            HorizontalExpand="True"
+                            MinSize="80 0"
+                            Rounded="True" />
+                    <Control MinSize="8 0" />
+                    <Label Name="AnnouncerVolumeLabel" MinSize="48 0" Align="Right" />
+                    <Control MinSize="4 0"/>
+                </BoxContainer>
                 <Control MinSize="0 8" />
                 <CheckBox Name="LobbyMusicCheckBox" Text="{Loc 'ui-options-lobby-music'}" />
                 <CheckBox Name="RestartSoundsCheckBox" Text="{Loc 'ui-options-restart-sounds'}" />
diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
index 470ca7d799d..0207ed5c471 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
@@ -37,6 +37,7 @@ public AudioTab()
             AmbienceSoundsSlider.OnValueChanged += OnAmbienceSoundsSliderChanged;
             LobbyVolumeSlider.OnValueChanged += OnLobbyVolumeSliderChanged;
             InterfaceVolumeSlider.OnValueChanged += OnInterfaceVolumeSliderChanged;
+            AnnouncerVolumeSlider.OnValueChanged += OnAnnouncerVolumeSliderChanged;
             LobbyMusicCheckBox.OnToggled += OnLobbyMusicCheckToggled;
             RestartSoundsCheckBox.OnToggled += OnRestartSoundsCheckToggled;
             EventMusicCheckBox.OnToggled += OnEventMusicCheckToggled;
@@ -58,6 +59,7 @@ protected override void Dispose(bool disposing)
             AmbienceVolumeSlider.OnValueChanged -= OnAmbienceVolumeSliderChanged;
             LobbyVolumeSlider.OnValueChanged -= OnLobbyVolumeSliderChanged;
             InterfaceVolumeSlider.OnValueChanged -= OnInterfaceVolumeSliderChanged;
+            AnnouncerVolumeSlider.OnValueChanged -= OnAnnouncerVolumeSliderChanged;
             base.Dispose(disposing);
         }
 
@@ -97,6 +99,11 @@ private void OnMidiVolumeSliderChanged(Range range)
             UpdateChanges();
         }
 
+        private void OnAnnouncerVolumeSliderChanged(Range range)
+        {
+            UpdateChanges();
+        }
+
         private void OnLobbyMusicCheckToggled(BaseButton.ButtonEventArgs args)
         {
             UpdateChanges();
@@ -125,6 +132,7 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CCVars.AmbientMusicVolume, AmbientMusicVolumeSlider.Value / 100f * ContentAudioSystem.AmbientMusicMultiplier);
             _cfg.SetCVar(CCVars.LobbyMusicVolume, LobbyVolumeSlider.Value / 100f * ContentAudioSystem.LobbyMultiplier);
             _cfg.SetCVar(CCVars.InterfaceVolume, InterfaceVolumeSlider.Value / 100f * ContentAudioSystem.InterfaceMultiplier);
+            _cfg.SetCVar(CCVars.AnnouncerVolume, AnnouncerVolumeSlider.Value / 100f * ContentAudioSystem.AnnouncerMultiplier);
 
             _cfg.SetCVar(CCVars.MaxAmbientSources, (int)AmbienceSoundsSlider.Value);
 
@@ -149,6 +157,7 @@ private void Reset()
             AmbientMusicVolumeSlider.Value = _cfg.GetCVar(CCVars.AmbientMusicVolume) * 100f / ContentAudioSystem.AmbientMusicMultiplier;
             LobbyVolumeSlider.Value = _cfg.GetCVar(CCVars.LobbyMusicVolume) * 100f / ContentAudioSystem.LobbyMultiplier;
             InterfaceVolumeSlider.Value = _cfg.GetCVar(CCVars.InterfaceVolume) * 100f / ContentAudioSystem.InterfaceMultiplier;
+            AnnouncerVolumeSlider.Value = _cfg.GetCVar(CCVars.AnnouncerVolume) * 100f / ContentAudioSystem.AnnouncerMultiplier;
 
             AmbienceSoundsSlider.Value = _cfg.GetCVar(CCVars.MaxAmbientSources);
 
@@ -174,14 +183,17 @@ private void UpdateChanges()
                 Math.Abs(LobbyVolumeSlider.Value - _cfg.GetCVar(CCVars.LobbyMusicVolume) * 100f / ContentAudioSystem.LobbyMultiplier) < 0.01f;
             var isInterfaceVolumeSame =
                 Math.Abs(InterfaceVolumeSlider.Value - _cfg.GetCVar(CCVars.InterfaceVolume) * 100f / ContentAudioSystem.InterfaceMultiplier) < 0.01f;
+            var isAnnouncerVolumeSame =
+                Math.Abs(AnnouncerVolumeSlider.Value - _cfg.GetCVar(CCVars.AnnouncerVolume) * 100f / ContentAudioSystem.AnnouncerMultiplier) < 0.01f;
 
             var isAmbientSoundsSame = (int)AmbienceSoundsSlider.Value == _cfg.GetCVar(CCVars.MaxAmbientSources);
             var isLobbySame = LobbyMusicCheckBox.Pressed == _cfg.GetCVar(CCVars.LobbyMusicEnabled);
             var isRestartSoundsSame = RestartSoundsCheckBox.Pressed == _cfg.GetCVar(CCVars.RestartSoundsEnabled);
             var isEventSame = EventMusicCheckBox.Pressed == _cfg.GetCVar(CCVars.EventMusicEnabled);
             var isAdminSoundsSame = AdminSoundsCheckBox.Pressed == _cfg.GetCVar(CCVars.AdminSoundsEnabled);
-            var isEverythingSame = isMasterVolumeSame && isMidiVolumeSame && isAmbientVolumeSame && isAmbientMusicVolumeSame && isAmbientSoundsSame && isLobbySame && isRestartSoundsSame && isEventSame
-                                   && isAdminSoundsSame && isLobbyVolumeSame && isInterfaceVolumeSame;
+            var isEverythingSame = isMasterVolumeSame && isMidiVolumeSame && isAmbientVolumeSame
+                && isAmbientMusicVolumeSame && isAmbientSoundsSame && isLobbySame && isRestartSoundsSame && isEventSame
+                && isAdminSoundsSame && isLobbyVolumeSame && isInterfaceVolumeSame && isAnnouncerVolumeSame;
             ApplyButton.Disabled = isEverythingSame;
             ResetButton.Disabled = isEverythingSame;
             MasterVolumeLabel.Text =
@@ -196,6 +208,8 @@ private void UpdateChanges()
                 Loc.GetString("ui-options-volume-percent", ("volume", LobbyVolumeSlider.Value / 100));
             InterfaceVolumeLabel.Text =
                 Loc.GetString("ui-options-volume-percent", ("volume", InterfaceVolumeSlider.Value / 100));
+            AnnouncerVolumeLabel.Text =
+                Loc.GetString("ui-options-volume-percent", ("volume", AnnouncerVolumeSlider.Value / 100));
             AmbienceSoundsLabel.Text = ((int)AmbienceSoundsSlider.Value).ToString();
         }
     }
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index 49e8099e0fb..13e456985a7 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -183,6 +183,9 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.SwapHands);
             AddButton(ContentKeyFunctions.MoveStoredItem);
             AddButton(ContentKeyFunctions.RotateStoredItem);
+            AddButton(ContentKeyFunctions.OfferItem);
+            AddButton(ContentKeyFunctions.SaveItemLocation);
+            AddButton(ContentKeyFunctions.ToggleStanding);
 
             AddHeader("ui-options-header-interaction-adv");
             AddButton(ContentKeyFunctions.SmartEquipBackpack);
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index 2ee59910f70..96df9f23570 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -25,6 +25,14 @@
                 <CheckBox Name="ReducedMotionCheckBox" Text="{Loc 'ui-options-reduced-motion'}" />
                 <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
                 <CheckBox Name="ColorblindFriendlyCheckBox" Text="{Loc 'ui-options-colorblind-friendly'}" />
+                <BoxContainer Orientation="Horizontal">
+                    <Label Text="{Loc 'ui-options-chat-window-opacity'}" Margin="8 0" />
+                    <Slider Name="ChatWindowOpacitySlider"
+                            MinValue="0"
+                            MaxValue="1"
+                            MinWidth="200" />
+                    <Label Name="ChatWindowOpacityLabel" Margin="8 0" />
+                </BoxContainer>
                 <BoxContainer Orientation="Horizontal">
                     <Label Text="{Loc 'ui-options-screen-shake-intensity'}" Margin="8 0" />
                     <Slider Name="ScreenShakeIntensitySlider"
@@ -41,6 +49,7 @@
                 <Label Text="{Loc 'ui-options-general-speech'}"
                        FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                        StyleClasses="LabelKeyText"/>
+                <CheckBox Name="ShowOocPatronColor" Text="{Loc 'ui-options-show-ooc-patron-color'}" />
                 <CheckBox Name="ShowLoocAboveHeadCheckBox" Text="{Loc 'ui-options-show-looc-on-head'}" />
                 <CheckBox Name="FancySpeechBubblesCheckBox" Text="{Loc 'ui-options-fancy-speech'}" />
                 <CheckBox Name="FancyNameBackgroundsCheckBox" Text="{Loc 'ui-options-fancy-name-background'}" />
@@ -49,6 +58,7 @@
                        StyleClasses="LabelKeyText"/>
                 <CheckBox Name="ShowHeldItemCheckBox" Text="{Loc 'ui-options-show-held-item'}" />
                 <CheckBox Name="ShowCombatModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-combat-mode-indicators'}" />
+                <CheckBox Name="ShowOfferModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-offer-mode-indicators'}" />
                 <Label Text="{Loc 'ui-options-general-storage'}"
                        FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                        StyleClasses="LabelKeyText"/>
@@ -65,6 +75,3 @@
         </controls:StripeBack>
     </BoxContainer>
 </tabs:MiscTab>
-
-
-
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index 3b9c41efdfb..70c4f489321 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -3,11 +3,14 @@
 using Content.Shared.CCVar;
 using Content.Shared.HUD;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared;
 using Robust.Shared.Configuration;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Range = Robust.Client.UserInterface.Controls.Range;
 
@@ -16,6 +19,7 @@ namespace Content.Client.Options.UI.Tabs
     [GenerateTypedNameReferences]
     public sealed partial class MiscTab : Control
     {
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
@@ -55,32 +59,42 @@ public MiscTab()
                 UpdateApplyButton();
             };
 
+            // Channel can be null in replays so.
+            // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
+            ShowOocPatronColor.Visible = _playerManager.LocalSession?.Channel?.UserData.PatronTier is { };
+
             HudThemeOption.OnItemSelected += OnHudThemeChanged;
             DiscordRich.OnToggled += OnCheckBoxToggled;
+            ShowOocPatronColor.OnToggled += OnCheckBoxToggled;
             ShowLoocAboveHeadCheckBox.OnToggled += OnCheckBoxToggled;
             ShowHeldItemCheckBox.OnToggled += OnCheckBoxToggled;
             ShowCombatModeIndicatorsCheckBox.OnToggled += OnCheckBoxToggled;
+            ShowOfferModeIndicatorsCheckBox.OnToggled += OnCheckBoxToggled;
             OpaqueStorageWindowCheckBox.OnToggled += OnCheckBoxToggled;
             FancySpeechBubblesCheckBox.OnToggled += OnCheckBoxToggled;
             FancyNameBackgroundsCheckBox.OnToggled += OnCheckBoxToggled;
             EnableColorNameCheckBox.OnToggled += OnCheckBoxToggled;
             ColorblindFriendlyCheckBox.OnToggled += OnCheckBoxToggled;
             ReducedMotionCheckBox.OnToggled += OnCheckBoxToggled;
+            ChatWindowOpacitySlider.OnValueChanged += OnChatWindowOpacitySliderChanged;
             ScreenShakeIntensitySlider.OnValueChanged += OnScreenShakeIntensitySliderChanged;
             // ToggleWalk.OnToggled += OnCheckBoxToggled;
             StaticStorageUI.OnToggled += OnCheckBoxToggled;
 
             HudThemeOption.SelectId(_hudThemeIdToIndex.GetValueOrDefault(_cfg.GetCVar(CVars.InterfaceTheme), 0));
             DiscordRich.Pressed = _cfg.GetCVar(CVars.DiscordEnabled);
+            ShowOocPatronColor.Pressed = _cfg.GetCVar(CCVars.ShowOocPatronColor);
             ShowLoocAboveHeadCheckBox.Pressed = _cfg.GetCVar(CCVars.LoocAboveHeadShow);
             ShowHeldItemCheckBox.Pressed = _cfg.GetCVar(CCVars.HudHeldItemShow);
             ShowCombatModeIndicatorsCheckBox.Pressed = _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow);
+            ShowOfferModeIndicatorsCheckBox.Pressed = _cfg.GetCVar(CCVars.OfferModeIndicatorsPointShow);
             OpaqueStorageWindowCheckBox.Pressed = _cfg.GetCVar(CCVars.OpaqueStorageWindow);
             FancySpeechBubblesCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
             FancyNameBackgroundsCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatFancyNameBackground);
             EnableColorNameCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableColorName);
             ColorblindFriendlyCheckBox.Pressed = _cfg.GetCVar(CCVars.AccessibilityColorblindFriendly);
             ReducedMotionCheckBox.Pressed = _cfg.GetCVar(CCVars.ReducedMotion);
+            ChatWindowOpacitySlider.Value = _cfg.GetCVar(CCVars.ChatWindowOpacity);
             ScreenShakeIntensitySlider.Value = _cfg.GetCVar(CCVars.ScreenShakeIntensity) * 100f;
             // ToggleWalk.Pressed = _cfg.GetCVar(CCVars.ToggleWalk);
             StaticStorageUI.Pressed = _cfg.GetCVar(CCVars.StaticStorageUI);
@@ -101,6 +115,13 @@ private void OnHudThemeChanged(OptionButton.ItemSelectedEventArgs args)
             UpdateApplyButton();
         }
 
+        private void OnChatWindowOpacitySliderChanged(Range range)
+        {
+            ChatWindowOpacityLabel.Text = Loc.GetString("ui-options-chat-window-opacity-percent",
+                ("opacity", range.Value));
+            UpdateApplyButton();
+        }
+
         private void OnScreenShakeIntensitySliderChanged(Range obj)
         {
             ScreenShakeIntensityLabel.Text = Loc.GetString("ui-options-screen-shake-percent", ("intensity", ScreenShakeIntensitySlider.Value / 100f));
@@ -120,13 +141,16 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CVars.DiscordEnabled, DiscordRich.Pressed);
             _cfg.SetCVar(CCVars.HudHeldItemShow, ShowHeldItemCheckBox.Pressed);
             _cfg.SetCVar(CCVars.CombatModeIndicatorsPointShow, ShowCombatModeIndicatorsCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.OfferModeIndicatorsPointShow, ShowOfferModeIndicatorsCheckBox.Pressed);
             _cfg.SetCVar(CCVars.OpaqueStorageWindow, OpaqueStorageWindowCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.ShowOocPatronColor, ShowOocPatronColor.Pressed);
             _cfg.SetCVar(CCVars.LoocAboveHeadShow, ShowLoocAboveHeadCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatEnableColorName, EnableColorNameCheckBox.Pressed);
             _cfg.SetCVar(CCVars.AccessibilityColorblindFriendly, ColorblindFriendlyCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ReducedMotion, ReducedMotionCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.ChatWindowOpacity, ChatWindowOpacitySlider.Value);
             _cfg.SetCVar(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider.Value / 100f);
             // _cfg.SetCVar(CCVars.ToggleWalk, ToggleWalk.Pressed);
             _cfg.SetCVar(CCVars.StaticStorageUI, StaticStorageUI.Pressed);
@@ -147,13 +171,16 @@ private void UpdateApplyButton()
             var isDiscordSame = DiscordRich.Pressed == _cfg.GetCVar(CVars.DiscordEnabled);
             var isShowHeldItemSame = ShowHeldItemCheckBox.Pressed == _cfg.GetCVar(CCVars.HudHeldItemShow);
             var isCombatModeIndicatorsSame = ShowCombatModeIndicatorsCheckBox.Pressed == _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow);
+            var isOfferModeIndicatorsSame = ShowOfferModeIndicatorsCheckBox.Pressed == _cfg.GetCVar(CCVars.OfferModeIndicatorsPointShow);
             var isOpaqueStorageWindow = OpaqueStorageWindowCheckBox.Pressed == _cfg.GetCVar(CCVars.OpaqueStorageWindow);
+            var isOocPatronColorShowSame = ShowOocPatronColor.Pressed == _cfg.GetCVar(CCVars.ShowOocPatronColor);
             var isLoocShowSame = ShowLoocAboveHeadCheckBox.Pressed == _cfg.GetCVar(CCVars.LoocAboveHeadShow);
             var isFancyChatSame = FancySpeechBubblesCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
             var isFancyBackgroundSame = FancyNameBackgroundsCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatFancyNameBackground);
             var isEnableColorNameSame = EnableColorNameCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableColorName);
             var isColorblindFriendly = ColorblindFriendlyCheckBox.Pressed == _cfg.GetCVar(CCVars.AccessibilityColorblindFriendly);
             var isReducedMotionSame = ReducedMotionCheckBox.Pressed == _cfg.GetCVar(CCVars.ReducedMotion);
+            var isChatWindowOpacitySame = Math.Abs(ChatWindowOpacitySlider.Value - _cfg.GetCVar(CCVars.ChatWindowOpacity)) < 0.01f;
             var isScreenShakeIntensitySame = Math.Abs(ScreenShakeIntensitySlider.Value / 100f - _cfg.GetCVar(CCVars.ScreenShakeIntensity)) < 0.01f;
             // var isToggleWalkSame = ToggleWalk.Pressed == _cfg.GetCVar(CCVars.ToggleWalk);
             var isStaticStorageUISame = StaticStorageUI.Pressed == _cfg.GetCVar(CCVars.StaticStorageUI);
@@ -163,13 +190,16 @@ private void UpdateApplyButton()
                                    isDiscordSame &&
                                    isShowHeldItemSame &&
                                    isCombatModeIndicatorsSame &&
+                                   isOfferModeIndicatorsSame &&
                                    isOpaqueStorageWindow &&
+                                   isOocPatronColorShowSame &&
                                    isLoocShowSame &&
                                    isFancyChatSame &&
                                    isFancyBackgroundSame &&
                                    isEnableColorNameSame &&
                                    isColorblindFriendly &&
                                    isReducedMotionSame &&
+                                   isChatWindowOpacitySame &&
                                    isScreenShakeIntensitySame &&
                                    // isToggleWalkSame &&
                                    isStaticStorageUISame;
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 9e562b5dd37..c1c0ae93ec1 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -19,7 +19,6 @@ namespace Content.Client.Overlays;
 /// </summary>
 public sealed class EntityHealthBarOverlay : Overlay
 {
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
     private readonly IEntityManager _entManager;
     private readonly SharedTransformSystem _transform;
     private readonly MobStateSystem _mobStateSystem;
@@ -27,17 +26,14 @@ public sealed class EntityHealthBarOverlay : Overlay
     private readonly ProgressColorSystem _progressColor;
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
     public HashSet<string> DamageContainers = new();
-    private readonly ShaderInstance _shader;
 
     public EntityHealthBarOverlay(IEntityManager entManager)
     {
-        IoCManager.InjectDependencies(this);
         _entManager = entManager;
         _transform = _entManager.System<SharedTransformSystem>();
         _mobStateSystem = _entManager.System<MobStateSystem>();
         _mobThresholdSystem = _entManager.System<MobThresholdSystem>();
         _progressColor = _entManager.System<ProgressColorSystem>();
-        _shader = _prototype.Index<ShaderPrototype>("unshaded").Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -50,8 +46,6 @@ protected override void Draw(in OverlayDrawArgs args)
         var scaleMatrix = Matrix3.CreateScale(new Vector2(scale, scale));
         var rotationMatrix = Matrix3.CreateRotation(-rotation);
 
-        handle.UseShader(_shader);
-
         var query = _entManager.AllEntityQueryEnumerator<MobThresholdsComponent, MobStateComponent, DamageableComponent, SpriteComponent>();
         while (query.MoveNext(out var uid,
             out var mobThresholdsComponent,
@@ -122,7 +116,6 @@ protected override void Draw(in OverlayDrawArgs args)
             handle.DrawRect(pixelDarken, Black.WithAlpha(128));
         }
 
-        handle.UseShader(null);
         handle.SetTransform(Matrix3.Identity);
     }
 
diff --git a/Content.Client/Paint/PaintVisualizerSystem.cs b/Content.Client/Paint/PaintVisualizerSystem.cs
deleted file mode 100644
index 6c99b2d35f0..00000000000
--- a/Content.Client/Paint/PaintVisualizerSystem.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System.Linq;
-using Robust.Client.GameObjects;
-using static Robust.Client.GameObjects.SpriteComponent;
-using Content.Shared.Clothing;
-using Content.Shared.Hands;
-using Content.Shared.Paint;
-using Robust.Client.Graphics;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client.Paint
-{
-    public sealed class PaintedVisualizerSystem : VisualizerSystem<PaintedComponent>
-    {
-        /// <summary>
-        /// Visualizer for Paint which applies a shader and colors the entity.
-        /// </summary>
-
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly IPrototypeManager _protoMan = default!;
-
-        public ShaderInstance? Shader; // in Robust.Client.Graphics so cannot move to shared component.
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<PaintedComponent, HeldVisualsUpdatedEvent>(OnHeldVisualsUpdated);
-            SubscribeLocalEvent<PaintedComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<PaintedComponent, EquipmentVisualsUpdatedEvent>(OnEquipmentVisualsUpdated);
-        }
-
-        protected override void OnAppearanceChange(EntityUid uid, PaintedComponent component, ref AppearanceChangeEvent args)
-        {
-            // ShaderPrototype sadly in Robust.Client, cannot move to shared component.
-            Shader = _protoMan.Index<ShaderPrototype>(component.ShaderName).Instance();
-
-            if (args.Sprite == null)
-                return;
-
-            if (!_appearance.TryGetData<bool>(uid, PaintVisuals.Painted, out bool isPainted))
-                return;
-
-            var sprite = args.Sprite;
-
-
-            foreach (var spriteLayer in sprite.AllLayers)
-            {
-                if (spriteLayer is not Layer layer)
-                    continue;
-
-                if (layer.Shader == null) // If shader isn't null we dont want to replace the original shader.
-                {
-                    layer.Shader = Shader;
-                    layer.Color = component.Color;
-                }
-            }
-        }
-
-        private void OnHeldVisualsUpdated(EntityUid uid, PaintedComponent component, HeldVisualsUpdatedEvent args)
-        {
-            if (args.RevealedLayers.Count == 0)
-                return;
-
-            if (!TryComp(args.User, out SpriteComponent? sprite))
-                return;
-
-            foreach (var revealed in args.RevealedLayers)
-            {
-                if (!sprite.LayerMapTryGet(revealed, out var layer) || sprite[layer] is not Layer notlayer)
-                    continue;
-
-                sprite.LayerSetShader(layer, component.ShaderName);
-                sprite.LayerSetColor(layer, component.Color);
-            }
-        }
-
-        private void OnEquipmentVisualsUpdated(EntityUid uid, PaintedComponent component, EquipmentVisualsUpdatedEvent args)
-        {
-            if (args.RevealedLayers.Count == 0)
-                return;
-
-            if (!TryComp(args.Equipee, out SpriteComponent? sprite))
-                return;
-
-            foreach (var revealed in args.RevealedLayers)
-            {
-                if (!sprite.LayerMapTryGet(revealed, out var layer) || sprite[layer] is not Layer notlayer)
-                    continue;
-
-                sprite.LayerSetShader(layer, component.ShaderName);
-                sprite.LayerSetColor(layer, component.Color);
-            }
-        }
-
-        private void OnShutdown(EntityUid uid, PaintedComponent component, ref ComponentShutdown args)
-        {
-            if (!TryComp(uid, out SpriteComponent? sprite))
-                return;
-
-            component.BeforeColor = sprite.Color;
-            Shader = _protoMan.Index<ShaderPrototype>(component.ShaderName).Instance();
-
-            if (!Terminating(uid))
-            {
-                foreach (var spriteLayer in sprite.AllLayers)
-                {
-                    if (spriteLayer is not Layer layer)
-                        continue;
-
-                    if (layer.Shader == Shader) // If shader isn't same as one in component we need to ignore it.
-                    {
-                        layer.Shader = null;
-                        if (layer.Color == component.Color) // If color isn't the same as one in component we don't want to change it.
-                            layer.Color = component.BeforeColor;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index 7a8a6e39cff..31042854d4a 100644
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Systems;
-using Content.Shared.Pulling.Components;
+using Robust.Client.GameObjects;
 using Robust.Client.Physics;
 using Robust.Client.Player;
 using Robust.Shared.Physics.Components;
@@ -24,7 +25,7 @@ public override void Initialize()
 
             SubscribeLocalEvent<InputMoverComponent, UpdateIsPredictedEvent>(OnUpdatePredicted);
             SubscribeLocalEvent<MovementRelayTargetComponent, UpdateIsPredictedEvent>(OnUpdateRelayTargetPredicted);
-            SubscribeLocalEvent<SharedPullableComponent, UpdateIsPredictedEvent>(OnUpdatePullablePredicted);
+            SubscribeLocalEvent<PullableComponent, UpdateIsPredictedEvent>(OnUpdatePullablePredicted);
         }
 
         private void OnUpdatePredicted(EntityUid uid, InputMoverComponent component, ref UpdateIsPredictedEvent args)
@@ -40,7 +41,7 @@ private void OnUpdateRelayTargetPredicted(EntityUid uid, MovementRelayTargetComp
                 args.IsPredicted = true;
         }
 
-        private void OnUpdatePullablePredicted(EntityUid uid, SharedPullableComponent component, ref UpdateIsPredictedEvent args)
+        private void OnUpdatePullablePredicted(EntityUid uid, PullableComponent component, 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.
diff --git a/Content.Client/Pinpointer/UI/NavMapControl.cs b/Content.Client/Pinpointer/UI/NavMapControl.cs
index a8ec7b37a0b..677092e1918 100644
--- a/Content.Client/Pinpointer/UI/NavMapControl.cs
+++ b/Content.Client/Pinpointer/UI/NavMapControl.cs
@@ -114,9 +114,16 @@ public NavMapControl() : base(MinDisplayedRange, MaxDisplayedRange, DefaultDispl
             VerticalExpand = false,
             Children =
             {
-                _zoom,
-                _beacons,
-                _recenter,
+                new BoxContainer()
+                {
+                    Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                    Children =
+                    {
+                        _zoom,
+                        _beacons,
+                        _recenter
+                    }
+                }
             }
         };
 
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index e932d67bb9e..df73f5ff3f4 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -1,22 +1,19 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Text; // Nuclear 14
 using Content.Shared.CCVar;
 using Content.Shared.Players;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Roles;
-using Content.Shared._NC.Roles; // Nuclear 14
 using Robust.Client;
 using Robust.Client.Player;
-using Content.Client.Preferences; // Nuclear 14
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Content.Shared.Preferences; // Nuclear 14
 using Robust.Shared.Utility;
 
 namespace Content.Client.Players.PlayTimeTracking;
 
-public sealed partial class JobRequirementsManager
+public sealed partial class JobRequirementsManager : ISharedPlaytimeManager
 {
     [Dependency] private readonly IBaseClient _client = default!;
     [Dependency] private readonly IClientNetManager _net = default!;
@@ -24,9 +21,8 @@ public sealed partial class JobRequirementsManager
     [Dependency] private readonly IEntityManager _entManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
-    [Dependency] private readonly IClientPreferencesManager _clientPreferences = default!; // Nuclear 14
 
-    public readonly Dictionary<string, TimeSpan> PlayTimes = new();
+    private readonly Dictionary<string, TimeSpan> _roles = new();
     private readonly List<string> _roleBans = new();
 
     private ISawmill _sawmill = default!;
@@ -50,7 +46,7 @@ private void ClientOnRunLevelChanged(object? sender, RunLevelChangedEventArgs e)
         if (e.NewLevel == ClientRunLevel.Initialize)
         {
             // Reset on disconnect, just in case.
-            PlayTimes.Clear();
+            _roles.Clear();
         }
     }
 
@@ -68,12 +64,12 @@ private void RxRoleBans(MsgRoleBans message)
 
     private void RxPlayTime(MsgPlayTime message)
     {
-        PlayTimes.Clear();
+        _roles.Clear();
 
         // NOTE: do not assign _roles = message.Trackers due to implicit data sharing in integration tests.
         foreach (var (tracker, time) in message.Trackers)
         {
-            PlayTimes[tracker] = time;
+            _roles[tracker] = time;
         }
 
         /*var sawmill = Logger.GetSawmill("play_time");
@@ -86,7 +82,6 @@ private void RxPlayTime(MsgPlayTime message)
 
     public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
     {
-        var reasonBuilder = new StringBuilder(); // Nuclear 14
         reason = null;
 
         if (_roleBans.Contains($"Job:{job.ID}"))
@@ -99,44 +94,8 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
         if (player == null)
             return true;
 
-        // Nuclear 14 start
-        if (job.JobBlockForSpecies != null)
-        {
-            if (_clientPreferences?.Preferences == null)
-                return true;
-
-            var nameSpecie = ((HumanoidCharacterProfile)_clientPreferences.Preferences.SelectedCharacter!).Species;
-            var first = true;
-
-            foreach (var jobBlockForSpecie in job.JobBlockForSpecies)
-            {
-                string? speciesReason;
-                if (JobBlockForSpecies.TryRequirementMet(jobBlockForSpecie, nameSpecie, out speciesReason))
-                    continue;
-
-                if (!first)
-                    reasonBuilder.Append('\n');
-                first = false;
-                reasonBuilder.AppendLine(speciesReason);
-            }
-        }
-
-        if (!CheckRoleTime(job.Requirements, out var timeReason))
-        {
-            if (reasonBuilder.Length > 0)
-                reasonBuilder.Append('\n');
-            reasonBuilder.Append(timeReason!.ToMarkup());
-        }
-
-        if (reasonBuilder.Length > 0)
-        {
-            reason = FormattedMessage.FromMarkup(reasonBuilder.ToString());
-            return false;
-        }
-
-        return true;
+        return CheckRoleTime(job.Requirements, out reason);
     }
-        // Nuclear 14 end
 
     public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason, string? localePrefix = "role-timer-")
     {
@@ -148,7 +107,7 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
         var reasons = new List<string>();
         foreach (var requirement in requirements)
         {
-            if (JobRequirements.TryRequirementMet(requirement, PlayTimes, out var jobReason, _entManager, _prototypes, _whitelisted, localePrefix))
+            if (JobRequirements.TryRequirementMet(requirement, _roles, out var jobReason, _entManager, _prototypes, _whitelisted, localePrefix))
                 continue;
 
             reasons.Add(jobReason.ToMarkup());
@@ -160,19 +119,30 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
 
     public TimeSpan FetchOverallPlaytime()
     {
-        return PlayTimes.TryGetValue("Overall", out var overallPlaytime) ? overallPlaytime : TimeSpan.Zero;
+        return _roles.TryGetValue("Overall", out var overallPlaytime) ? overallPlaytime : TimeSpan.Zero;
     }
 
-    public IEnumerable<KeyValuePair<string, TimeSpan>> FetchPlaytimeByRoles()
+    public Dictionary<string, TimeSpan> FetchPlaytimeByRoles()
     {
         var jobsToMap = _prototypes.EnumeratePrototypes<JobPrototype>();
+        var ret = new Dictionary<string, TimeSpan>();
 
         foreach (var job in jobsToMap)
-        {
-            if (PlayTimes.TryGetValue(job.PlayTimeTracker, out var locJobName))
-            {
-                yield return new KeyValuePair<string, TimeSpan>(job.Name, locJobName);
-            }
-        }
+            if (_roles.TryGetValue(job.PlayTimeTracker, out var locJobName))
+                ret.Add(job.Name, locJobName);
+
+        return ret;
+    }
+
+
+    public Dictionary<string, TimeSpan> GetPlayTimes()
+    {
+        var dict = new Dictionary<string, TimeSpan>();
+
+        dict.Add(PlayTimeTrackingShared.TrackerOverall, FetchOverallPlaytime());
+        foreach (var role in FetchPlaytimeByRoles())
+            dict.Add(role.Key, role.Value);
+
+        return dict;
     }
 }
diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index 479fb02906c..3faa392e58d 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -163,10 +163,13 @@ public override void PopupEntity(string? message, EntityUid uid, Filter filter,
             PopupEntity(message, uid, type);
         }
 
-        public override void PopupClient(string? message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small)
+        public override void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
         {
+            if (recipient == null)
+                return;
+
             if (_timing.IsFirstTimePredicted)
-                PopupEntity(message, uid, recipient, type);
+                PopupEntity(message, uid, recipient.Value, type);
         }
 
         public override void PopupEntity(string? message, EntityUid uid, PopupType type = PopupType.Small)
@@ -181,6 +184,12 @@ public override void PopupPredicted(string? message, EntityUid uid, EntityUid? r
                 PopupEntity(message, uid, recipient.Value, type);
         }
 
+        public override void PopupPredicted(string? recipientMessage, string? othersMessage, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
+        {
+            if (recipient != null && _timing.IsFirstTimePredicted)
+                PopupEntity(recipientMessage, uid, recipient.Value, type);
+        }
+
         #endregion
 
         #region Network Event Handlers
diff --git a/Content.Client/Preferences/ClientPreferencesManager.cs b/Content.Client/Preferences/ClientPreferencesManager.cs
index b518493c9d4..aca7159504d 100644
--- a/Content.Client/Preferences/ClientPreferencesManager.cs
+++ b/Content.Client/Preferences/ClientPreferencesManager.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using Content.Shared.Preferences;
 using Robust.Client;
+using Robust.Client.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
@@ -22,6 +23,7 @@ public sealed class ClientPreferencesManager : IClientPreferencesManager
         [Dependency] private readonly IBaseClient _baseClient = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IPrototypeManager _prototypes = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
 
         public event Action? OnServerDataLoaded;
 
@@ -64,7 +66,8 @@ public void SelectCharacter(int slot)
 
         public void UpdateCharacter(ICharacterProfile profile, int slot)
         {
-            profile.EnsureValid(_cfg, _prototypes);
+            var collection = IoCManager.Instance!;
+            profile.EnsureValid(_playerManager.LocalSession!, collection);
             var characters = new Dictionary<int, ICharacterProfile>(Preferences.Characters) {[slot] = profile};
             Preferences = new PlayerPreferences(characters, Preferences.SelectedCharacterIndex, Preferences.AdminOOCColor);
             var msg = new MsgUpdateCharacter
diff --git a/Content.Client/Preferences/UI/AntagPreferenceSelector.cs b/Content.Client/Preferences/UI/AntagPreferenceSelector.cs
new file mode 100644
index 00000000000..06694f51168
--- /dev/null
+++ b/Content.Client/Preferences/UI/AntagPreferenceSelector.cs
@@ -0,0 +1,36 @@
+using Content.Client.Players.PlayTimeTracking;
+using Content.Shared.Roles;
+
+namespace Content.Client.Preferences.UI;
+
+public sealed class AntagPreferenceSelector : RequirementsSelector<AntagPrototype>
+{
+    // 0 is yes and 1 is no
+    public bool Preference
+    {
+        get => Options.SelectedValue == 0;
+        set => Options.Select(value && !Disabled ? 0 : 1);
+    }
+
+    public event Action<bool>? PreferenceChanged;
+
+    public AntagPreferenceSelector(AntagPrototype proto) : base(proto)
+    {
+        Options.OnItemSelected += _ => PreferenceChanged?.Invoke(Preference);
+
+        var items = new[]
+        {
+            ("humanoid-profile-editor-antag-preference-yes-button", 0),
+            ("humanoid-profile-editor-antag-preference-no-button", 1),
+        };
+        var title = Loc.GetString(proto.Name);
+        var description = Loc.GetString(proto.Objective);
+        Setup(items, title, 250, description);
+
+        // Immediately lock requirements if they aren't met.
+        // Another function checks Disabled after creating the selector so this has to be done now
+        var requirements = IoCManager.Resolve<JobRequirementsManager>();
+        if (proto.Requirements != null && !requirements.CheckRoleTime(proto.Requirements, out var reason))
+            LockRequirements(reason);
+    }
+}
diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml b/Content.Client/Preferences/UI/CharacterSetupGui.xaml
index 9a76029ce0b..35067eebfd1 100644
--- a/Content.Client/Preferences/UI/CharacterSetupGui.xaml
+++ b/Content.Client/Preferences/UI/CharacterSetupGui.xaml
@@ -40,7 +40,7 @@
                         <gfx:StyleBoxFlat BackgroundColor="{x:Static style:StyleNano.NanoGold}" ContentMarginTopOverride="2" />
                     </PanelContainer.PanelOverride>
                 </PanelContainer>
-                <BoxContainer Name="CharEditor" />
+                <BoxContainer Name="CharEditor" HorizontalExpand="True" />
             </BoxContainer>
         </BoxContainer>
     </Control>
diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
index dba96d74b6c..5165db54799 100644
--- a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
+++ b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
@@ -3,27 +3,23 @@
 using Content.Client.Humanoid;
 using Content.Client.Info;
 using Content.Client.Info.PlaytimeStats;
+using Content.Client.Lobby;
 using Content.Client.Lobby.UI;
 using Content.Client.Resources;
 using Content.Client.Stylesheets;
+using Content.Shared.Clothing.Loadouts.Systems;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 using Direction = Robust.Shared.Maths.Direction;
@@ -36,7 +32,6 @@ public sealed partial class CharacterSetupGui : Control
         private readonly IClientPreferencesManager _preferencesManager;
         private readonly IEntityManager _entityManager;
         private readonly IPrototypeManager _prototypeManager;
-        private readonly IConfigurationManager _configurationManager;
         private readonly Button _createNewCharacterButton;
         private readonly HumanoidProfileEditor _humanoidProfileEditor;
 
@@ -51,7 +46,6 @@ public CharacterSetupGui(
             _entityManager = entityManager;
             _prototypeManager = prototypeManager;
             _preferencesManager = preferencesManager;
-            _configurationManager = configurationManager;
 
             var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
             var back = new StyleBoxTexture
@@ -74,7 +68,7 @@ public CharacterSetupGui(
                 args.Event.Handle();
             };
 
-            _humanoidProfileEditor = new HumanoidProfileEditor(preferencesManager, prototypeManager, entityManager, configurationManager);
+            _humanoidProfileEditor = new HumanoidProfileEditor(preferencesManager, prototypeManager, configurationManager);
             _humanoidProfileEditor.OnProfileChanged += ProfileChanged;
             CharEditor.AddChild(_humanoidProfileEditor);
 
@@ -105,14 +99,13 @@ private void ProfileChanged(ICharacterProfile profile, int profileSlot)
 
         private void UpdateUI()
         {
+            UserInterfaceManager.GetUIController<LobbyUIController>().UpdateCharacterUI();
             var numberOfFullSlots = 0;
             var characterButtonsGroup = new ButtonGroup();
             Characters.RemoveAllChildren();
 
             if (!_preferencesManager.ServerDataLoaded)
-            {
                 return;
-            }
 
             _createNewCharacterButton.ToolTip =
                 Loc.GetString("character-setup-gui-create-new-character-button-tooltip",
@@ -120,11 +113,6 @@ private void UpdateUI()
 
             foreach (var (slot, character) in _preferencesManager.Preferences!.Characters)
             {
-                if (character is null)
-                {
-                    continue;
-                }
-
                 numberOfFullSlots++;
                 var characterPickerButton = new CharacterPickerButton(_entityManager,
                     _preferencesManager,
@@ -148,8 +136,12 @@ private void UpdateUI()
             _createNewCharacterButton.Disabled =
                 numberOfFullSlots >= _preferencesManager.Settings.MaxCharacterSlots;
             Characters.AddChild(_createNewCharacterButton);
+            // TODO: Move this shit to the Lobby UI controller
         }
 
+        /// <summary>
+        ///     Shows individual characters on the side of the character GUI.
+        /// </summary>
         private sealed class CharacterPickerButton : ContainerButton
         {
             private EntityUid _previewDummy;
@@ -180,8 +172,8 @@ public CharacterPickerButton(
 
                 if (humanoid != null)
                 {
-                    LobbyCharacterPreviewPanel.GiveDummyJobClothes(_previewDummy, humanoid);
-                    LobbyCharacterPreviewPanel.GiveDummyLoadoutItems(_previewDummy, humanoid);
+                    var controller = UserInterfaceManager.GetUIController<LobbyUIController>();
+                    controller.GiveDummyJobClothesLoadout(_previewDummy, humanoid);
                 }
 
                 var isSelectedCharacter = profile == preferencesManager.Preferences?.SelectedCharacter;
diff --git a/Content.Client/Preferences/UI/HighlightedContainer.xaml b/Content.Client/Preferences/UI/HighlightedContainer.xaml
new file mode 100644
index 00000000000..8cf6e2da05b
--- /dev/null
+++ b/Content.Client/Preferences/UI/HighlightedContainer.xaml
@@ -0,0 +1,11 @@
+<PanelContainer
+    xmlns="https://spacestation14.io"
+    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+    <PanelContainer.PanelOverride>
+        <graphics:StyleBoxFlat BackgroundColor="#2F2F35"
+                               ContentMarginTopOverride="10"
+                               ContentMarginBottomOverride="10"
+                               ContentMarginLeftOverride="10"
+                               ContentMarginRightOverride="10"/>
+    </PanelContainer.PanelOverride>
+</PanelContainer>
diff --git a/Content.Client/Preferences/UI/HighlightedContainer.xaml.cs b/Content.Client/Preferences/UI/HighlightedContainer.xaml.cs
new file mode 100644
index 00000000000..68294d0f059
--- /dev/null
+++ b/Content.Client/Preferences/UI/HighlightedContainer.xaml.cs
@@ -0,0 +1,14 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Preferences.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class HighlightedContainer : PanelContainer
+{
+    public HighlightedContainer()
+    {
+        RobustXamlLoader.Load(this);
+    }
+}
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.Random.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.Random.cs
index c9e184dfc23..e12da12d0a3 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.Random.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.Random.cs
@@ -1,25 +1,22 @@
 using Content.Shared.Preferences;
-using Robust.Shared.Prototypes;
 
-namespace Content.Client.Preferences.UI
+namespace Content.Client.Preferences.UI;
+
+public sealed partial class HumanoidProfileEditor
 {
-    public sealed partial class HumanoidProfileEditor
+    private void RandomizeEverything()
     {
-        private readonly IPrototypeManager _prototypeManager;
-
-        private void RandomizeEverything()
-        {
-            Profile = HumanoidCharacterProfile.Random();
-            UpdateControls();
-            IsDirty = true;
-        }
+        Profile = HumanoidCharacterProfile.Random();
+        UpdateControls();
+        IsDirty = true;
+    }
 
-        private void RandomizeName()
-        {
-            if (Profile == null) return;
-            var name = HumanoidCharacterProfile.GetName(Profile.Species, Profile.Gender);
-            SetName(name);
-            UpdateNameEdit();
-        }
+    private void RandomizeName()
+    {
+        if (Profile == null)
+            return;
+        var name = HumanoidCharacterProfile.GetName(Profile.Species, Profile.Gender);
+        SetName(name);
+        UpdateNameEdit();
     }
 }
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index e34eb41ef9a..ebf794954e3 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -1,205 +1,203 @@
-<Control xmlns="https://spacestation14.io"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:prefUi="clr-namespace:Content.Client.Preferences.UI"
-         xmlns:humanoid="clr-namespace:Content.Client.Humanoid"
-         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
-    <BoxContainer Orientation="Horizontal">
-        <!-- Left side -->
-        <BoxContainer Orientation="Vertical" Margin="10 10 10 10">
-            <!-- Middle container -->
-            <BoxContainer Orientation="Horizontal" SeparationOverride="10">
-                <!-- Name box-->
-                <BoxContainer Orientation="Vertical">
-                    <prefUi:HighlightedContainer>
-                        <BoxContainer Orientation="Vertical">
-                            <prefUi:HighlightedContainer>
-                                <BoxContainer Orientation="Vertical">
-                                    <BoxContainer Orientation="Horizontal" VerticalExpand="True">
-                                        <Label Text="{Loc 'humanoid-profile-editor-name-label'}" />
-                                        <LineEdit Name="CNameEdit" MinSize="270 0" VerticalAlignment="Center" Margin="5 0 0 0" />
-                                        <Button Name="CNameRandomize" Text="{Loc 'humanoid-profile-editor-name-random-button'}" />
-                                    </BoxContainer>
-                                    <Button Name="CRandomizeEverything" HorizontalAlignment="Center"
-                                            HorizontalExpand="False" MaxWidth="256"
-                                            Text="{Loc 'humanoid-profile-editor-randomize-everything-button'}" />
-                                    <RichTextLabel Name="CWarningLabel" HorizontalExpand="False"
-                                                   VerticalExpand="True" MaxWidth="425"
-                                                   HorizontalAlignment="Left" />
+<BoxContainer xmlns="https://spacestation14.io"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:prefUi="clr-namespace:Content.Client.Preferences.UI"
+    xmlns:humanoid="clr-namespace:Content.Client.Humanoid"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    HorizontalExpand="True">
+    <!-- Left side -->
+    <BoxContainer Orientation="Vertical" Margin="10 10 10 10" HorizontalExpand="True">
+        <!-- Middle container -->
+        <BoxContainer Orientation="Horizontal" SeparationOverride="10">
+            <!-- Name box-->
+            <BoxContainer Orientation="Vertical">
+                <prefUi:HighlightedContainer>
+                    <BoxContainer Orientation="Vertical">
+                        <prefUi:HighlightedContainer>
+                            <BoxContainer Orientation="Vertical">
+                                <BoxContainer Orientation="Horizontal" VerticalExpand="True">
+                                    <Label Text="{Loc 'humanoid-profile-editor-name-label'}" />
+                                    <LineEdit Name="CNameEdit" MinSize="270 0" VerticalAlignment="Center" Margin="5 0 0 0" />
+                                    <Button Name="CNameRandomize" Text="{Loc 'humanoid-profile-editor-name-random-button'}" />
                                 </BoxContainer>
-                            </prefUi:HighlightedContainer>
-                        </BoxContainer>
-                    </prefUi:HighlightedContainer>
-                </BoxContainer>
-                <!-- Import/Export -->
-                <BoxContainer Orientation="Vertical">
-                    <prefUi:HighlightedContainer>
-                        <BoxContainer Orientation="Horizontal">
-                            <Button Text="{Loc 'humanoid-profile-editor-import-button'}" Disabled="True"
-                                    ToolTip="{Loc 'generic-not-yet-implemented'}" />
-                            <Button Text="{Loc 'humanoid-profile-editor-export-button'}" Disabled="True"
-                                    ToolTip="{Loc 'generic-not-yet-implemented'}" />
-                        </BoxContainer>
-                    </prefUi:HighlightedContainer>
-                    <!-- Save -->
-                    <prefUi:HighlightedContainer>
-                        <Button Name="CSaveButton" Text="{Loc 'humanoid-profile-editor-save-button'}" HorizontalAlignment="Center" />
-                    </prefUi:HighlightedContainer>
-                </BoxContainer>
+                                <Button Name="CRandomizeEverything" HorizontalAlignment="Center" HorizontalExpand="False"
+                                    MaxWidth="256" Text="{Loc 'humanoid-profile-editor-randomize-everything-button'}" />
+                                <RichTextLabel Name="CWarningLabel" HorizontalExpand="False" VerticalExpand="True"
+                                    MaxWidth="425" HorizontalAlignment="Left" />
+                            </BoxContainer>
+                        </prefUi:HighlightedContainer>
+                    </BoxContainer>
+                </prefUi:HighlightedContainer>
             </BoxContainer>
-            <Control MinHeight="10" />
-            <!-- tabContainer -->
-            <TabContainer Name="CTabContainer" VerticalExpand="True">
-                <BoxContainer Orientation="Vertical">
-                    <ScrollContainer VerticalExpand="True">
-                        <!-- appearanceList -->
-                        <BoxContainer Orientation="Vertical">
-                            <BoxContainer Margin="10" Orientation="Vertical" HorizontalExpand="True">
-                                <!-- Species -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Text="{Loc 'humanoid-profile-editor-species-label'}" />
-                                    <Control HorizontalExpand="True"/>
-                                    <TextureButton Name="SpeciesInfoButton" Scale="0.3 0.3" VerticalAlignment="Center"></TextureButton>
-                                    <OptionButton Name="CSpeciesButton" HorizontalAlignment="Right" />
-                                </BoxContainer>
-                                <!-- Age -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Text="{Loc 'humanoid-profile-editor-age-label'}" />
-                                    <Control HorizontalExpand="True"/>
-                                    <LineEdit Name="CAgeEdit" MinSize="40 0" HorizontalAlignment="Right" />
-                                </BoxContainer>
-                                <!-- Sex -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Text="{Loc 'humanoid-profile-editor-sex-label'}" />
-                                    <Control HorizontalExpand="True"/>
-                                    <OptionButton Name="CSexButton" HorizontalAlignment="Right" />
-                                </BoxContainer>
-                                <!-- Pronouns -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Text="{Loc 'humanoid-profile-editor-pronouns-label'}" />
-                                    <Control HorizontalExpand="True"/>
-                                    <OptionButton Name="CPronounsButton" HorizontalAlignment="Right" />
-                                </BoxContainer>
-                                <!-- Show clothing -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Text="{Loc 'humanoid-profile-editor-clothing'}" />
-                                    <Control HorizontalExpand="True"/>
-                                    <Button Name="ShowClothes" Pressed="True" ToggleMode="True" Text="{Loc 'humanoid-profile-editor-clothing-show'}" HorizontalAlignment="Right" />
-                                </BoxContainer>
-                                <!-- Show loadouts -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Text="{Loc 'humanoid-profile-editor-loadouts'}" />
-                                    <Control HorizontalExpand="True"/>
-                                    <Button Name="ShowLoadouts" Pressed="True" ToggleMode="True" Text="{Loc 'Show'}" HorizontalAlignment="Right" />
-                                </BoxContainer>
-                                <!-- Clothing -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Text="{Loc 'humanoid-profile-editor-clothing-label'}" />
-                                    <Control HorizontalExpand="True"/>
-                                    <OptionButton Name="CClothingButton" HorizontalAlignment="Right" />
-                                </BoxContainer>
-                                <!-- Backpack -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Text="{Loc 'humanoid-profile-editor-backpack-label'}" />
-                                    <Control HorizontalExpand="True"/>
-                                    <OptionButton Name="CBackpackButton" HorizontalAlignment="Right" />
-                                </BoxContainer>
-                                <!-- Spawn Priority -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Text="{Loc 'humanoid-profile-editor-spawn-priority-label'}" />
-                                    <Control HorizontalExpand="True"/>
-                                    <OptionButton Name="CSpawnPriorityButton" HorizontalAlignment="Right" />
-                                </BoxContainer>
-								<!-- Height -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Name="CHeightLabel" MinWidth="110" />
-                                    <Slider Name="CHeightSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
-                                    <Button Name="CHeightReset" Text="{Loc 'ui-options-bind-reset'}" />
-                                </BoxContainer>
-                                <!-- Width -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Name="CWidthLabel" MinWidth="110" />
-                                    <Slider Name="CWidthSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
-                                    <Button Name="CWidthReset" Text="{Loc 'ui-options-bind-reset'}" />
-                                </BoxContainer>
-                                <!--Weight -->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Name="CWeightLabel" />
-                                </BoxContainer>
+            <!-- Import/Export -->
+            <BoxContainer Orientation="Vertical">
+                <prefUi:HighlightedContainer>
+                    <BoxContainer Orientation="Horizontal">
+                        <Button Text="{Loc 'humanoid-profile-editor-import-button'}" Disabled="True"
+                                ToolTip="{Loc 'generic-not-yet-implemented'}" />
+                        <Button Text="{Loc 'humanoid-profile-editor-export-button'}" Disabled="True"
+                                ToolTip="{Loc 'generic-not-yet-implemented'}" />
+                    </BoxContainer>
+                </prefUi:HighlightedContainer>
+                <!-- Save -->
+                <prefUi:HighlightedContainer>
+                    <Button Name="CSaveButton" Text="{Loc 'humanoid-profile-editor-save-button'}" HorizontalAlignment="Center" />
+                </prefUi:HighlightedContainer>
+            </BoxContainer>
+        </BoxContainer>
+        <Control MinHeight="10" />
+        <!-- tabContainer -->
+        <TabContainer Name="CTabContainer" VerticalExpand="True">
+            <BoxContainer Orientation="Vertical">
+                <ScrollContainer VerticalExpand="True">
+                    <!-- appearanceList -->
+                    <BoxContainer Orientation="Vertical">
+                        <BoxContainer Margin="10" Orientation="Vertical" HorizontalExpand="True">
+                            <!-- Species -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Text="{Loc 'humanoid-profile-editor-species-label'}" />
+                                <Control HorizontalExpand="True"/>
+                                <TextureButton Name="SpeciesInfoButton" Scale="0.3 0.3" VerticalAlignment="Center"
+                                    ToolTip="{Loc 'humanoid-profile-editor-guidebook-button-tooltip'}"/>
+                                <OptionButton Name="CSpeciesButton" HorizontalAlignment="Right" />
+                            </BoxContainer>
+                            <!-- Age -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Text="{Loc 'humanoid-profile-editor-age-label'}" />
+                                <Control HorizontalExpand="True"/>
+                                <LineEdit Name="CAgeEdit" MinSize="40 0" HorizontalAlignment="Right" />
                             </BoxContainer>
-                            <!-- Skin -->
-                            <BoxContainer Margin="10" HorizontalExpand="True" Orientation="Vertical">
-                                <Label Text="{Loc 'humanoid-profile-editor-skin-color-label'}" />
-                                <Slider HorizontalExpand="True" Name="CSkin" MinValue="0" MaxValue="100" Value="20" />
-                                <BoxContainer Name="CRgbSkinColorContainer" Visible="False" Orientation="Vertical" HorizontalExpand="True"></BoxContainer>
+                            <!-- Sex -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Text="{Loc 'humanoid-profile-editor-sex-label'}" />
+                                <Control HorizontalExpand="True"/>
+                                <OptionButton Name="CSexButton" HorizontalAlignment="Right" />
                             </BoxContainer>
-                            <!-- Hair -->
-                            <BoxContainer Margin="10" Orientation="Horizontal">
-                                <humanoid:SingleMarkingPicker Name="CHairStylePicker" Category="Hair" />
-                                <humanoid:SingleMarkingPicker Name="CFacialHairPicker" Category="FacialHair" />
+                            <!-- Pronouns -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Text="{Loc 'humanoid-profile-editor-pronouns-label'}" />
+                                <Control HorizontalExpand="True"/>
+                                <OptionButton Name="CPronounsButton" HorizontalAlignment="Right" />
                             </BoxContainer>
-                            <!-- Eyes -->
-                            <BoxContainer Margin="10" Orientation="Vertical">
-                                <Label Text="{Loc 'humanoid-profile-editor-eyes-label'}" />
-                                <humanoid:EyeColorPicker Name="CEyeColorPicker" />
+                            <!-- Show clothing -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Text="{Loc 'humanoid-profile-editor-clothing'}" />
+                                <Control HorizontalExpand="True"/>
+                                <Button Name="ShowClothes" Pressed="True" ToggleMode="True" Text="{Loc 'humanoid-profile-editor-clothing-show'}" HorizontalAlignment="Right" />
                             </BoxContainer>
+                            <!-- Show loadouts -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Text="{Loc 'humanoid-profile-editor-loadouts'}" />
+                                <Control HorizontalExpand="True"/>
+                                <Button Name="ShowLoadouts" Pressed="True" ToggleMode="True" Text="{Loc 'Show'}" HorizontalAlignment="Right" />
+                            </BoxContainer>
+                            <!-- Clothing -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Text="{Loc 'humanoid-profile-editor-clothing-label'}" />
+                                <Control HorizontalExpand="True"/>
+                                <OptionButton Name="CClothingButton" HorizontalAlignment="Right" />
+                            </BoxContainer>
+                            <!-- Backpack -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Text="{Loc 'humanoid-profile-editor-backpack-label'}" />
+                                <Control HorizontalExpand="True"/>
+                                <OptionButton Name="CBackpackButton" HorizontalAlignment="Right" />
+                            </BoxContainer>
+                            <!-- Spawn Priority -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Text="{Loc 'humanoid-profile-editor-spawn-priority-label'}" />
+                                <Control HorizontalExpand="True"/>
+                                <OptionButton Name="CSpawnPriorityButton" HorizontalAlignment="Right" />
+                            </BoxContainer>
+							<!-- Height -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Name="CHeightLabel" MinWidth="110" />
+                                <Slider Name="CHeightSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
+                                <Button Name="CHeightReset" Text="{Loc 'ui-options-bind-reset'}" />
+                            </BoxContainer>
+                            <!-- Width -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Name="CWidthLabel" MinWidth="110" />
+                                <Slider Name="CWidthSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
+                                <Button Name="CWidthReset" Text="{Loc 'ui-options-bind-reset'}" />
+                            </BoxContainer>
+                            <!--Weight -->
+                            <BoxContainer HorizontalExpand="True">
+                                <Label Name="CWeightLabel" />
+                            </BoxContainer>
+                        </BoxContainer>
+                        <!-- Skin -->
+                        <BoxContainer Margin="10" HorizontalExpand="True" Orientation="Vertical">
+                            <Label Text="{Loc 'humanoid-profile-editor-skin-color-label'}" />
+                            <Slider HorizontalExpand="True" Name="CSkin" MinValue="0" MaxValue="100" Value="20" />
+                            <BoxContainer Name="CRgbSkinColorContainer" Visible="False" Orientation="Vertical" HorizontalExpand="True"></BoxContainer>
+                        </BoxContainer>
+                        <!-- Hair -->
+                        <BoxContainer Margin="10" Orientation="Horizontal">
+                            <humanoid:SingleMarkingPicker Name="CHairStylePicker" Category="Hair" />
+                            <humanoid:SingleMarkingPicker Name="CFacialHairPicker" Category="FacialHair" />
                         </BoxContainer>
-                    </ScrollContainer>
-                </BoxContainer>
-                <BoxContainer Orientation="Vertical">
-                    <!-- Jobs -->
-                    <OptionButton Name="CPreferenceUnavailableButton" />
-                    <ScrollContainer VerticalExpand="True">
-                        <BoxContainer Name="CJobList" Orientation="Vertical" />
-                    </ScrollContainer>
-                </BoxContainer>
-                <BoxContainer Orientation="Vertical" Margin="10">
-                    <!-- Antags -->
-                    <ScrollContainer VerticalExpand="True">
-                        <BoxContainer Name="CAntagList" Orientation="Vertical" />
-                    </ScrollContainer>
-                </BoxContainer>
-                <BoxContainer Name="CTraitsTab" Orientation="Vertical" Margin="10">
-                    <!-- Traits -->
-                    <Label Name="TraitPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
-                    <ProgressBar Name="TraitPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
+                        <!-- Eyes -->
+                        <BoxContainer Margin="10" Orientation="Vertical">
+                            <Label Text="{Loc 'humanoid-profile-editor-eyes-label'}" />
+                            <humanoid:EyeColorPicker Name="CEyeColorPicker" />
+                        </BoxContainer>
+                    </BoxContainer>
+                </ScrollContainer>
+            </BoxContainer>
+            <BoxContainer Orientation="Vertical">
+                <!-- Jobs -->
+                <OptionButton Name="CPreferenceUnavailableButton" />
+                <ScrollContainer VerticalExpand="True">
+                    <BoxContainer Name="CJobList" Orientation="Vertical" />
+                </ScrollContainer>
+            </BoxContainer>
+            <BoxContainer Orientation="Vertical" Margin="10">
+                <!-- Antags -->
+                <ScrollContainer VerticalExpand="True">
+                    <BoxContainer Name="CAntagList" Orientation="Vertical" />
+                </ScrollContainer>
+            </BoxContainer>
+            <BoxContainer Name="CTraitsTab" Orientation="Vertical" Margin="10">
+                <!-- Traits -->
+                <Label Name="TraitPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
+                <ProgressBar Name="TraitPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
 
-                    <Button Name="TraitsShowUnusableButton"
-                            Text="{Loc 'humanoid-profile-editor-traits-show-unusable-button'}"
-                            ToolTip="{Loc 'humanoid-profile-editor-traits-show-unusable-button-tooltip'}"
-                            ToggleMode="True"
-                            Margin="0 0 0 5" />
+                <Button Name="TraitsShowUnusableButton"
+                        Text="{Loc 'humanoid-profile-editor-traits-show-unusable-button'}"
+                        ToolTip="{Loc 'humanoid-profile-editor-traits-show-unusable-button-tooltip'}"
+                        ToggleMode="True"
+                        Margin="0 0 0 5" />
 
-                    <TabContainer Name="CTraitsTabs" VerticalExpand="True" />
-                </BoxContainer>
-                <BoxContainer Name="CLoadoutsTab" Orientation="Vertical" Margin="10">
-                    <!-- Loadouts -->
-                    <Label Name="LoadoutPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
-                    <ProgressBar Name="LoadoutPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
+                <TabContainer Name="CTraitsTabs" VerticalExpand="True" />
+            </BoxContainer>
+            <BoxContainer Name="CLoadoutsTab" Orientation="Vertical" Margin="10">
+                <!-- Loadouts -->
+                <Label Name="LoadoutPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
+                <ProgressBar Name="LoadoutPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
 
-                    <Button Name="LoadoutsShowUnusableButton"
-                            Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}"
-                            ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}"
-                            ToggleMode="True"
-                            Margin="0 0 0 5" />
+                <Button Name="LoadoutsShowUnusableButton"
+                        Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}"
+                        ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}"
+                        ToggleMode="True"
+                        Margin="0 0 0 5" />
 
-                    <TabContainer Name="CLoadoutsTabs" VerticalExpand="True" />
-                </BoxContainer>
-                <BoxContainer Name="CMarkingsTab" Orientation="Vertical" Margin="10">
-                    <!-- Markings -->
-                    <ScrollContainer VerticalExpand="True">
-                        <humanoid:MarkingPicker Name="CMarkings" IgnoreCategories="Hair,FacialHair" />
-                    </ScrollContainer>
-                </BoxContainer>
-            </TabContainer>
-        </BoxContainer>
-        <!-- Right side -->
-        <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" VerticalAlignment="Center">
-            <SpriteView Name="CSpriteView" Scale="8 8" SizeFlagsStretchRatio="1" />
-            <BoxContainer Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 5">
-                <Button Name="CSpriteRotateLeft" Text="◀" StyleClasses="OpenRight" />
-                <cc:VSeparator Margin="2 0 3 0" />
-                <Button Name="CSpriteRotateRight" Text="▶" StyleClasses="OpenLeft" />
+                <TabContainer Name="CLoadoutsTabs" VerticalExpand="True" />
             </BoxContainer>
+            <BoxContainer Name="CMarkingsTab" Orientation="Vertical" Margin="10">
+                <!-- Markings -->
+                <ScrollContainer VerticalExpand="True">
+                    <humanoid:MarkingPicker Name="CMarkings" IgnoreCategories="Hair,FacialHair" />
+                </ScrollContainer>
+            </BoxContainer>
+        </TabContainer>
+    </BoxContainer>
+    <!-- Right side -->
+    <BoxContainer Orientation="Vertical" VerticalExpand="True" VerticalAlignment="Center">
+        <SpriteView Name="CSpriteView" Scale="8 8" SizeFlagsStretchRatio="1" />
+        <BoxContainer Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 5">
+            <Button Name="CSpriteRotateLeft" Text="◀" StyleClasses="OpenRight" />
+            <cc:VSeparator Margin="2 0 3 0" />
+            <Button Name="CSpriteRotateRight" Text="▶" StyleClasses="OpenLeft" />
         </BoxContainer>
     </BoxContainer>
-</Control>
+</BoxContainer>
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 23b167a9f39..771d928ebf9 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -1,13 +1,11 @@
 using System.Linq;
 using System.Numerics;
-using System.Text;
 using Content.Client.Guidebook;
 using Content.Client.Humanoid;
-using Content.Client.Lobby.UI;
+using Content.Client.Lobby;
 using Content.Client.Message;
 using Content.Client.Players.PlayTimeTracking;
-using Content.Client.Stylesheets;
-using Content.Client.UserInterface.Controls;
+using Content.Client.Roles;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing.Loadouts.Prototypes;
@@ -19,57 +17,40 @@
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
-using Content.Shared.StatusIcon;
+using Content.Shared.Roles.Jobs;
 using Content.Shared.Traits;
-using Content.Shared._NC; // Nuclear 14
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.Utility;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
-using Robust.Shared.Map;
 using Robust.Shared.Physics;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
 using Direction = Robust.Shared.Maths.Direction;
 
 namespace Content.Client.Preferences.UI
 {
-    public sealed class HighlightedContainer : PanelContainer
-    {
-        public HighlightedContainer()
-        {
-            PanelOverride = new StyleBoxFlat()
-            {
-                BackgroundColor = new Color(47, 47, 53),
-                ContentMarginTopOverride = 10,
-                ContentMarginBottomOverride = 10,
-                ContentMarginLeftOverride = 10,
-                ContentMarginRightOverride = 10
-            };
-        }
-    }
-
     [GenerateTypedNameReferences]
-    public sealed partial class HumanoidProfileEditor : Control
+    public sealed partial class HumanoidProfileEditor : BoxContainer
     {
+        private readonly IEntityManager _entityManager;
+        private readonly IPrototypeManager _prototypeManager;
         private readonly IClientPreferencesManager _preferencesManager;
-        private readonly IEntityManager _entMan;
         private readonly IConfigurationManager _configurationManager;
         private readonly MarkingManager _markingManager;
         private readonly JobRequirementsManager _requirements;
         private readonly CharacterRequirementsSystem _characterRequirementsSystem;
-        private readonly LoadoutSystem _loadoutSystem;
+        private readonly LobbyUIController _controller;
 
         private LineEdit _ageEdit => CAgeEdit;
         private LineEdit _nameEdit => CNameEdit;
-        private TextEdit _flavorTextEdit = null!;
+        private TextEdit? _flavorTextEdit;
         private Button _nameRandomButton => CNameRandomize;
         private Button _randomizeEverythingButton => CRandomizeEverything;
         private RichTextLabel _warningLabel => CWarningLabel;
@@ -103,9 +84,8 @@ public sealed partial class HumanoidProfileEditor : Control
         private readonly List<JobPrioritySelector> _jobPriorities;
         private OptionButton _preferenceUnavailableButton => CPreferenceUnavailableButton;
         private readonly Dictionary<string, BoxContainer> _jobCategories;
-        // Mildly hacky, as I don't trust prototype order to stay consistent and don't want the UI to break should a new one get added mid-edit. --moony
         private readonly List<SpeciesPrototype> _speciesList;
-        private readonly List<AntagPreferenceSelector> _antagPreferences;
+        private readonly List<AntagPreferenceSelector> _antagPreferences = new();
         private readonly List<TraitPreferenceSelector> _traitPreferences;
         private readonly List<LoadoutPreferenceSelector> _loadoutPreferences;
 
@@ -113,39 +93,37 @@ public sealed partial class HumanoidProfileEditor : Control
         private Button _previewRotateLeftButton => CSpriteRotateLeft;
         private Button _previewRotateRightButton => CSpriteRotateRight;
         private Direction _previewRotation = Direction.North;
-        private EntityUid? _previewDummy;
 
         private BoxContainer _rgbSkinColorContainer => CRgbSkinColorContainer;
         private ColorSelectorSliders _rgbSkinColorSelector;
 
         private bool _isDirty;
-        private bool _needUpdatePreview;
         public int CharacterSlot;
         public HumanoidCharacterProfile? Profile;
-        private MarkingSet _markingSet = new(); // storing this here feels iffy but a few things need it this high up
 
         public event Action<HumanoidCharacterProfile, int>? OnProfileChanged;
 
+        [ValidatePrototypeId<GuideEntryPrototype>]
+        private const string DefaultSpeciesGuidebook = "Species";
+
         public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IPrototypeManager prototypeManager,
-            IEntityManager entityManager, IConfigurationManager configurationManager)
+            IConfigurationManager configurationManager)
         {
             RobustXamlLoader.Load(this);
+            _entityManager = IoCManager.Resolve<IEntityManager>();
             _prototypeManager = prototypeManager;
-            _entMan = entityManager;
             _preferencesManager = preferencesManager;
             _configurationManager = configurationManager;
             _markingManager = IoCManager.Resolve<MarkingManager>();
             _characterRequirementsSystem = EntitySystem.Get<CharacterRequirementsSystem>();
-            _loadoutSystem = EntitySystem.Get<LoadoutSystem>();
+            _controller = UserInterfaceManager.GetUIController<LobbyUIController>();
 
-            SpeciesInfoButton.ToolTip = Loc.GetString("humanoid-profile-editor-guidebook-button-tooltip");
+            _controller.SetProfileEditor(this);
+            _controller.PreviewDummyUpdated += OnDummyUpdate;
+            _previewSpriteView.SetEntity(_controller.GetPreviewDummy());
 
             #region Left
 
-            #region Randomize
-
-            #endregion Randomize
-
             #region Name
 
             _nameEdit.OnTextChanged += args => { SetName(args.Text); };
@@ -160,7 +138,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _tabContainer.SetTabTitle(0, Loc.GetString("humanoid-profile-editor-appearance-tab"));
 
             ShowClothes.OnPressed += ToggleClothes;
-            ShowLoadouts.OnPressed += ToggleClothes;
+            ShowLoadouts.OnPressed += ToggleLoadouts;
 
             #region Sex
 
@@ -318,6 +296,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 Profile = Profile.WithCharacterAppearance(
                     Profile.Appearance.WithHairStyleName(newStyle.id));
                 IsDirty = true;
+                UpdatePreview();
             };
 
             _hairPicker.OnColorChanged += newColor =>
@@ -328,6 +307,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                     Profile.Appearance.WithHairColor(newColor.marking.MarkingColors[0]));
                 UpdateCMarkingsHair();
                 IsDirty = true;
+                UpdatePreview();
             };
 
             _facialHairPicker.OnMarkingSelect += newStyle =>
@@ -337,6 +317,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 Profile = Profile.WithCharacterAppearance(
                     Profile.Appearance.WithFacialHairStyleName(newStyle.id));
                 IsDirty = true;
+                UpdatePreview();
             };
 
             _facialHairPicker.OnColorChanged += newColor =>
@@ -347,6 +328,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                     Profile.Appearance.WithFacialHairColor(newColor.marking.MarkingColors[0]));
                 UpdateCMarkingsFacialHair();
                 IsDirty = true;
+                UpdatePreview();
             };
 
             _hairPicker.OnSlotRemove += _ =>
@@ -359,6 +341,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 UpdateHairPickers();
                 UpdateCMarkingsHair();
                 IsDirty = true;
+                UpdatePreview();
             };
 
             _facialHairPicker.OnSlotRemove += _ =>
@@ -371,6 +354,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 UpdateHairPickers();
                 UpdateCMarkingsFacialHair();
                 IsDirty = true;
+                UpdatePreview();
             };
 
             _hairPicker.OnSlotAdd += delegate()
@@ -391,6 +375,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 UpdateHairPickers();
                 UpdateCMarkingsHair();
                 IsDirty = true;
+                UpdatePreview();
             };
 
             _facialHairPicker.OnSlotAdd += delegate()
@@ -411,6 +396,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                 UpdateHairPickers();
                 UpdateCMarkingsFacialHair();
                 IsDirty = true;
+                UpdatePreview();
             };
 
             #endregion Hair
@@ -467,6 +453,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
                     Profile.Appearance.WithEyeColor(newColor));
                 CMarkings.CurrentEyeColor = Profile.Appearance.EyeColor;
                 IsDirty = true;
+                UpdatePreview();
             };
 
             #endregion Eyes
@@ -496,7 +483,9 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _jobPriorities = new List<JobPrioritySelector>();
             _jobCategories = new Dictionary<string, BoxContainer>();
             _requirements = IoCManager.Resolve<JobRequirementsManager>();
+            _requirements.Updated += UpdateAntagRequirements;
             _requirements.Updated += UpdateRoleRequirements;
+            UpdateAntagRequirements();
             UpdateRoleRequirements();
 
             #endregion Jobs
@@ -505,29 +494,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             _tabContainer.SetTabTitle(2, Loc.GetString("humanoid-profile-editor-antags-tab"));
 
-            _antagPreferences = new List<AntagPreferenceSelector>();
-
-            foreach (var antag in prototypeManager.EnumeratePrototypes<AntagPrototype>().OrderBy(a => Loc.GetString(a.Name)))
-            {
-                if (!antag.SetPreference)
-                    continue;
-
-                var selector = new AntagPreferenceSelector(antag);
-                _antagList.AddChild(selector);
-                _antagPreferences.Add(selector);
-                if (selector.Disabled)
-                {
-                    Profile = Profile?.WithAntagPreference(antag.ID, false);
-                    IsDirty = true;
-                }
-
-                selector.PreferenceChanged += preference =>
-                {
-                    Profile = Profile?.WithAntagPreference(antag.ID, preference);
-                    IsDirty = true;
-                };
-            }
-
             #endregion Antags
 
             #region Traits
@@ -537,9 +503,9 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _traitPreferences = new List<TraitPreferenceSelector>();
 
             // Show/Hide the traits tab if they ever get enabled/disabled
-            var traitsEnabled = _configurationManager.GetCVar(CCVars.GameTraitsEnabled);
+            var traitsEnabled = configurationManager.GetCVar(CCVars.GameTraitsEnabled);
             _tabContainer.SetTabVisible(3, traitsEnabled);
-            _configurationManager.OnValueChanged(CCVars.GameTraitsEnabled,
+            configurationManager.OnValueChanged(CCVars.GameTraitsEnabled,
                 enabled => _tabContainer.SetTabVisible(3, enabled));
 
             _traitsShowUnusableButton.OnToggled += args => UpdateTraits(args.Pressed);
@@ -555,10 +521,10 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _loadoutPreferences = new List<LoadoutPreferenceSelector>();
 
             // Show/Hide the loadouts tab if they ever get enabled/disabled
-            var loadoutsEnabled = _configurationManager.GetCVar(CCVars.GameLoadoutsEnabled);
+            var loadoutsEnabled = configurationManager.GetCVar(CCVars.GameLoadoutsEnabled);
             _tabContainer.SetTabVisible(4, loadoutsEnabled);
             ShowLoadouts.Visible = loadoutsEnabled;
-            _configurationManager.OnValueChanged(CCVars.GameLoadoutsEnabled,
+            configurationManager.OnValueChanged(CCVars.GameLoadoutsEnabled,
                 enabled => LoadoutsChanged(enabled));
 
             _loadoutsShowUnusableButton.OnToggled += args => UpdateLoadouts(args.Pressed);
@@ -585,7 +551,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             #region FlavorText
 
-            if (_configurationManager.GetCVar(CCVars.FlavorText))
+            if (configurationManager.GetCVar(CCVars.FlavorText))
             {
                 var flavorText = new FlavorText.FlavorText();
                 _tabContainer.AddChild(flavorText);
@@ -602,31 +568,20 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _previewRotateLeftButton.OnPressed += _ =>
             {
                 _previewRotation = _previewRotation.TurnCw();
-                _needUpdatePreview = true;
+                SetPreviewRotation(_previewRotation);
             };
             _previewRotateRightButton.OnPressed += _ =>
             {
                 _previewRotation = _previewRotation.TurnCcw();
-                _needUpdatePreview = true;
+                SetPreviewRotation(_previewRotation);
             };
 
-            var species = Profile?.Species ?? SharedHumanoidAppearanceSystem.DefaultSpecies;
-            var dollProto = _prototypeManager.Index<SpeciesPrototype>(species).DollPrototype;
-
-            if (_previewDummy != null)
-                _entMan.DeleteEntity(_previewDummy!.Value);
-
-            _previewDummy = _entMan.SpawnEntity(dollProto, MapCoordinates.Nullspace);
-            _previewSpriteView.SetEntity(_previewDummy);
-
             #endregion Dummy
 
             #endregion Left
 
             if (preferencesManager.ServerDataLoaded)
-            {
                 LoadServerData();
-            }
 
             preferencesManager.OnServerDataLoaded += LoadServerData;
 
@@ -648,22 +603,61 @@ private void OnSpeciesInfoButtonPressed(BaseButton.ButtonEventArgs args)
         {
             var guidebookController = UserInterfaceManager.GetUIController<GuidebookUIController>();
             var species = Profile?.Species ?? SharedHumanoidAppearanceSystem.DefaultSpecies;
-            var page = "Species";
+            var page = DefaultSpeciesGuidebook;
             if (_prototypeManager.HasIndex<GuideEntryPrototype>(species))
                 page = species;
 
-            if (_prototypeManager.TryIndex<GuideEntryPrototype>("Species", out var guideRoot))
+            if (_prototypeManager.TryIndex<GuideEntryPrototype>(DefaultSpeciesGuidebook, out var guideRoot))
             {
-                var dict = new Dictionary<string, GuideEntry>();
-                dict.Add("Species", guideRoot);
+                var dict = new Dictionary<string, GuideEntry> { { DefaultSpeciesGuidebook, guideRoot } };
                 //TODO: Don't close the guidebook if its already open, just go to the correct page
                 guidebookController.ToggleGuidebook(dict, includeChildren:true, selected: page);
             }
         }
 
-        private void ToggleClothes(BaseButton.ButtonEventArgs obj)
+        private void ToggleClothes(BaseButton.ButtonEventArgs _)
+        {
+            _controller.ShowClothes = ShowClothes.Pressed;
+            _controller.UpdateCharacterUI();
+        }
+
+        private void ToggleLoadouts(BaseButton.ButtonEventArgs _)
         {
-            RebuildSpriteView();
+            _controller.ShowLoadouts = ShowLoadouts.Pressed;
+            _controller.UpdateCharacterUI();
+        }
+
+        private void OnDummyUpdate(EntityUid value)
+        {
+            _previewSpriteView.SetEntity(value);
+        }
+
+        private void UpdateAntagRequirements()
+        {
+            _antagList.DisposeAllChildren();
+            _antagPreferences.Clear();
+
+            foreach (var antag in _prototypeManager.EnumeratePrototypes<AntagPrototype>().OrderBy(a => Loc.GetString(a.Name)))
+            {
+                if (!antag.SetPreference)
+                    continue;
+
+                var selector = new AntagPreferenceSelector(antag)
+                    { Margin = new Thickness(3f, 3f, 3f, 0f) };
+                _antagList.AddChild(selector);
+                _antagPreferences.Add(selector);
+                if (selector.Disabled)
+                {
+                    Profile = Profile?.WithAntagPreference(antag.ID, false);
+                    IsDirty = true;
+                }
+
+                selector.PreferenceChanged += preference =>
+                {
+                    Profile = Profile?.WithAntagPreference(antag.ID, preference);
+                    IsDirty = true;
+                };
+            }
         }
 
         private void UpdateRoleRequirements()
@@ -769,7 +763,7 @@ private void UpdateRoleRequirements()
         }
 
         /// <summary>
-        /// DeltaV - Make sure that no invalid job priorities get through.
+        ///     DeltaV - Make sure that no invalid job priorities get through.
         /// </summary>
         private void EnsureJobRequirementsValid()
         {
@@ -783,10 +777,10 @@ private void EnsureJobRequirementsValid()
                 Profile = Profile?.WithJobPriority(selector.Proto.ID, JobPriority.Never);
                 changed = true;
             }
+
             if (!changed)
                 return;
 
-            _needUpdatePreview = true;
             Save();
         }
 
@@ -805,26 +799,16 @@ private void OnMarkingChange(MarkingSet markings)
                 return;
 
             Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithMarkings(markings.GetForwardEnumerator().ToList()));
-            _needUpdatePreview = true;
             IsDirty = true;
+            UpdatePreview();
         }
 
-        private void OnMarkingColorChange(List<Marking> markings)
+        private void OnSkinColorOnValueChanged()
         {
             if (Profile is null)
                 return;
 
-            Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithMarkings(markings));
-            IsDirty = true;
-        }
-
-
-        private void OnSkinColorOnValueChanged()
-        {
-            if (Profile is null) return;
-
             var skin = _prototypeManager.Index<SpeciesPrototype>(Profile.Species).SkinColoration;
-
             var skinColor = _prototypeManager.Index<SpeciesPrototype>(Profile.Species).DefaultSkinTone;
 
             switch (skin)
@@ -878,6 +862,7 @@ private void OnSkinColorOnValueChanged()
             }
 
             IsDirty = true;
+            UpdatePreview();
         }
 
         protected override void Dispose(bool disposing)
@@ -886,26 +871,12 @@ protected override void Dispose(bool disposing)
             if (!disposing)
                 return;
 
-            if (_previewDummy != null)
-                _entMan.DeleteEntity(_previewDummy.Value);
-
+            _controller.PreviewDummyUpdated -= OnDummyUpdate;
+            _requirements.Updated -= UpdateAntagRequirements;
             _requirements.Updated -= UpdateRoleRequirements;
             _preferencesManager.OnServerDataLoaded -= LoadServerData;
 
-            _configurationManager.UnsubValueChanged(CCVars.GameLoadoutsEnabled, enabled => LoadoutsChanged(enabled));
-        }
-
-        private void RebuildSpriteView()
-        {
-            var species = Profile?.Species ?? SharedHumanoidAppearanceSystem.DefaultSpecies;
-            var dollProto = _prototypeManager.Index<SpeciesPrototype>(species).DollPrototype;
-
-            if (_previewDummy != null)
-                _entMan.DeleteEntity(_previewDummy!.Value);
-
-            _previewDummy = _entMan.SpawnEntity(dollProto, MapCoordinates.Nullspace);
-            _previewSpriteView.SetEntity(_previewDummy);
-            _needUpdatePreview = true;
+            _configurationManager.UnsubValueChanged(CCVars.GameLoadoutsEnabled, LoadoutsChanged);
         }
 
         private void LoadServerData()
@@ -913,9 +884,10 @@ private void LoadServerData()
             Profile = (HumanoidCharacterProfile) _preferencesManager.Preferences!.SelectedCharacter;
             CharacterSlot = _preferencesManager.Preferences.SelectedCharacterIndex;
 
+            UpdateAntagRequirements();
+            UpdateRoleRequirements();
             UpdateControls();
             EnsureJobRequirementsValid(); // DeltaV
-            _needUpdatePreview = true;
         }
 
         private void SetAge(int newAge)
@@ -943,6 +915,7 @@ private void SetSex(Sex newSex)
             UpdateGenderControls();
             CMarkings.SetSex(newSex);
             IsDirty = true;
+            UpdatePreview();
         }
 
         private void SetGender(Gender newGender)
@@ -954,19 +927,16 @@ private void SetGender(Gender newGender)
         private void SetSpecies(string newSpecies)
         {
             Profile = Profile?.WithSpecies(newSpecies);
-			Save(); // Nuclear 14
             OnSkinColorOnValueChanged(); // Species may have special color prefs, make sure to update it.
             CMarkings.SetSpecies(newSpecies); // Repopulate the markings tab as well.
-            UpdateSexControls(); // update sex for new species
+            UpdateSexControls(); // Update sex for new species
             // Changing species provides inaccurate sliders without these
             UpdateHeightControls();
             UpdateWidthControls();
             UpdateWeight();
-            RebuildSpriteView(); // they might have different inv so we need a new dummy
-			UpdateJobPriorities(); // Nuclear 14
             UpdateSpeciesGuidebookIcon();
             IsDirty = true;
-            _needUpdatePreview = true;
+            UpdatePreview();
         }
 
         private void SetName(string newName)
@@ -979,12 +949,16 @@ private void SetClothing(ClothingPreference newClothing)
         {
             Profile = Profile?.WithClothingPreference(newClothing);
             IsDirty = true;
+            _controller.UpdateClothes = true;
+            UpdatePreview();
         }
 
         private void SetBackpack(BackpackPreference newBackpack)
         {
             Profile = Profile?.WithBackpackPreference(newBackpack);
             IsDirty = true;
+            _controller.UpdateClothes = true;
+            UpdatePreview();
         }
 
         private void SetSpawnPriority(SpawnPriorityPreference newSpawnPriority)
@@ -997,24 +971,25 @@ private void SetProfileHeight(float height)
         {
             Profile = Profile?.WithHeight(height);
             IsDirty = true;
+            UpdatePreview();
         }
 
         private void SetProfileWidth(float width)
         {
             Profile = Profile?.WithWidth(width);
             IsDirty = true;
+            UpdatePreview();
         }
 
         public void Save()
         {
             IsDirty = false;
 
-            if (Profile != null)
-            {
-                _preferencesManager.UpdateCharacter(Profile, CharacterSlot);
-                OnProfileChanged?.Invoke(Profile, CharacterSlot);
-                _needUpdatePreview = true;
-            }
+            if (Profile == null)
+                return;
+
+            _preferencesManager.UpdateCharacter(Profile, CharacterSlot);
+            OnProfileChanged?.Invoke(Profile, CharacterSlot);
         }
 
         private bool IsDirty
@@ -1023,7 +998,6 @@ private bool IsDirty
             set
             {
                 _isDirty = value;
-                _needUpdatePreview = true;
                 UpdateSaveButton();
             }
         }
@@ -1036,9 +1010,7 @@ private void UpdateNameEdit()
         private void UpdateFlavorTextEdit()
         {
             if(_flavorTextEdit != null)
-            {
                 _flavorTextEdit.TextRope = new Rope.Leaf(Profile?.FlavorText ?? "");
-            }
         }
 
         private void UpdateAgeEdit()
@@ -1055,23 +1027,16 @@ private void UpdateSexControls()
 
             var sexes = new List<Sex>();
 
-            // add species sex options, default to just none if we are in bizzaro world and have no species
+            // Add species sex options, default to just none if we are in bizzaro world and have no species
             if (_prototypeManager.TryIndex<SpeciesPrototype>(Profile.Species, out var speciesProto))
-            {
                 foreach (var sex in speciesProto.Sexes)
-                {
                     sexes.Add(sex);
-                }
-            } else
-            {
+            else
                 sexes.Add(Sex.Unsexed);
-            }
 
-            // add button for each sex
+            // Add button for each sex
             foreach (var sex in sexes)
-            {
                 _sexButton.AddItem(Loc.GetString($"humanoid-profile-editor-sex-{sex.ToString().ToLower()}-text"), (int) sex);
-            }
 
             if (sexes.Contains(Profile.Sex))
                 _sexButton.SelectId((int) Profile.Sex);
@@ -1097,7 +1062,6 @@ private void UpdateSkinColor()
                     }
 
                     _skinColor.Value = SkinColor.HumanSkinToneFromColor(Profile.Appearance.SkinColor);
-
                     break;
                 }
                 case HumanoidSkinColor.Hues:
@@ -1108,7 +1072,7 @@ private void UpdateSkinColor()
                         _rgbSkinColorContainer.Visible = true;
                     }
 
-                    // set the RGB values to the direct values otherwise
+                    // Set the RGB values to the direct values otherwise
                     _rgbSkinColorSelector.Color = Profile.Appearance.SkinColor;
                     break;
                 }
@@ -1120,12 +1084,11 @@ private void UpdateSkinColor()
                         _rgbSkinColorContainer.Visible = true;
                     }
 
-                    // set the RGB values to the direct values otherwise
+                    // Set the RGB values to the direct values otherwise
                     _rgbSkinColorSelector.Color = Profile.Appearance.SkinColor;
                     break;
                 }
             }
-
         }
 
         public void UpdateSpeciesGuidebookIcon()
@@ -1133,38 +1096,28 @@ public void UpdateSpeciesGuidebookIcon()
             SpeciesInfoButton.StyleClasses.Clear();
 
             var species = Profile?.Species;
-            if (species is null)
+            if (species is null
+                || !_prototypeManager.TryIndex<SpeciesPrototype>(species, out var speciesProto)
+                || !_prototypeManager.HasIndex<GuideEntryPrototype>(species))
                 return;
 
-            if (!_prototypeManager.TryIndex<SpeciesPrototype>(species, out var speciesProto))
-                return;
-
-            // Don't display the info button if no guide entry is found
-            if (!_prototypeManager.HasIndex<GuideEntryPrototype>(species))
-                return;
-
-            var style = speciesProto.GuideBookIcon;
+            const string style = "SpeciesInfoDefault";
             SpeciesInfoButton.StyleClasses.Add(style);
         }
 
         private void UpdateMarkings()
         {
             if (Profile == null)
-            {
                 return;
-            }
 
-            CMarkings.SetData(Profile.Appearance.Markings, Profile.Species,
-                Profile.Sex, Profile.Appearance.SkinColor, Profile.Appearance.EyeColor
-            );
+            CMarkings.SetData(Profile.Appearance.Markings, Profile.Species, Profile.Sex, Profile.Appearance.SkinColor,
+                Profile.Appearance.EyeColor);
         }
 
         private void UpdateSpecies()
         {
             if (Profile == null)
-            {
                 return;
-            }
 
             CSpeciesButton.Select(_speciesList.FindIndex(x => x.ID == Profile.Species));
         }
@@ -1172,9 +1125,7 @@ private void UpdateSpecies()
         private void UpdateGenderControls()
         {
             if (Profile == null)
-            {
                 return;
-            }
 
             _genderButton.SelectId((int) Profile.Gender);
         }
@@ -1182,9 +1133,7 @@ private void UpdateGenderControls()
         private void UpdateClothingControls()
         {
             if (Profile == null)
-            {
                 return;
-            }
 
             _clothingButton.SelectId((int) Profile.Clothing);
         }
@@ -1192,9 +1141,7 @@ private void UpdateClothingControls()
         private void UpdateBackpackControls()
         {
             if (Profile == null)
-            {
                 return;
-            }
 
             _backpackButton.SelectId((int) Profile.Backpack);
         }
@@ -1202,9 +1149,7 @@ private void UpdateBackpackControls()
         private void UpdateSpawnPriorityControls()
         {
             if (Profile == null)
-            {
                 return;
-            }
 
             _spawnPriorityButton.SelectId((int) Profile.SpawnPriority);
         }
@@ -1262,9 +1207,8 @@ private void UpdateWeight()
         private void UpdateHairPickers()
         {
             if (Profile == null)
-            {
                 return;
-            }
+
             var hairMarking = Profile.Appearance.HairStyleId switch
             {
                 HairStyles.DefaultHairStyle => new List<Marking>(),
@@ -1290,79 +1234,47 @@ private void UpdateHairPickers()
         private void UpdateCMarkingsHair()
         {
             if (Profile == null)
-            {
                 return;
-            }
 
             // hair color
             Color? hairColor = null;
             if ( Profile.Appearance.HairStyleId != HairStyles.DefaultHairStyle &&
-                _markingManager.Markings.TryGetValue(Profile.Appearance.HairStyleId, out var hairProto)
-            )
-            {
+                _markingManager.Markings.TryGetValue(Profile.Appearance.HairStyleId, out var hairProto))
                 if (_markingManager.CanBeApplied(Profile.Species, Profile.Sex, hairProto, _prototypeManager))
-                {
-                    if (_markingManager.MustMatchSkin(Profile.Species, HumanoidVisualLayers.Hair, out var _, _prototypeManager))
-                    {
-                        hairColor = Profile.Appearance.SkinColor;
-                    }
-                    else
-                    {
-                        hairColor = Profile.Appearance.HairColor;
-                    }
-                }
-            }
+                    hairColor = _markingManager.MustMatchSkin(Profile.Species, HumanoidVisualLayers.Hair, out _, _prototypeManager)
+                        ? Profile.Appearance.SkinColor
+                        : Profile.Appearance.HairColor;
+
             if (hairColor != null)
-            {
-                CMarkings.HairMarking = new (Profile.Appearance.HairStyleId, new List<Color>() { hairColor.Value });
-            }
+                CMarkings.HairMarking = new(Profile.Appearance.HairStyleId, new List<Color> { hairColor.Value });
             else
-            {
                 CMarkings.HairMarking = null;
-            }
         }
 
         private void UpdateCMarkingsFacialHair()
         {
             if (Profile == null)
-            {
                 return;
-            }
 
             // facial hair color
             Color? facialHairColor = null;
             if ( Profile.Appearance.FacialHairStyleId != HairStyles.DefaultFacialHairStyle &&
-                _markingManager.Markings.TryGetValue(Profile.Appearance.FacialHairStyleId, out var facialHairProto)
-            )
-            {
+                _markingManager.Markings.TryGetValue(Profile.Appearance.FacialHairStyleId, out var facialHairProto))
                 if (_markingManager.CanBeApplied(Profile.Species, Profile.Sex, facialHairProto, _prototypeManager))
-                {
-                    if (_markingManager.MustMatchSkin(Profile.Species, HumanoidVisualLayers.Hair, out var _, _prototypeManager))
-                    {
-                        facialHairColor = Profile.Appearance.SkinColor;
-                    }
-                    else
-                    {
-                        facialHairColor = Profile.Appearance.FacialHairColor;
-                    }
-                }
-            }
+                    facialHairColor = _markingManager.MustMatchSkin(Profile.Species, HumanoidVisualLayers.Hair, out _, _prototypeManager)
+                        ? Profile.Appearance.SkinColor
+                        : Profile.Appearance.FacialHairColor;
+
             if (facialHairColor != null)
-            {
-                CMarkings.FacialHairMarking = new (Profile.Appearance.FacialHairStyleId, new List<Color>() { facialHairColor.Value });
-            }
+                CMarkings.FacialHairMarking = new(Profile.Appearance.FacialHairStyleId, new List<Color> { facialHairColor.Value });
             else
-            {
                 CMarkings.FacialHairMarking = null;
-            }
         }
 
         private void UpdateEyePickers()
         {
             if (Profile == null)
-            {
                 return;
-            }
 
             CMarkings.CurrentEyeColor = Profile.Appearance.EyeColor;
             _eyesPicker.SetData(Profile.Appearance.EyeColor);
@@ -1378,20 +1290,20 @@ private void UpdatePreview()
             if (Profile is null)
                 return;
 
-            var humanoid = _entMan.System<HumanoidAppearanceSystem>();
-            humanoid.LoadProfile(_previewDummy!.Value, Profile);
-
-            if (ShowClothes.Pressed)
-                LobbyCharacterPreviewPanel.GiveDummyJobClothes(_previewDummy!.Value, Profile);
-            if (ShowLoadouts.Pressed)
-                LobbyCharacterPreviewPanel.GiveDummyLoadoutItems(_previewDummy!.Value, Profile);
+            SetPreviewRotation(_previewRotation);
+            _controller.UpdateCharacterUI();
+        }
 
-            _previewSpriteView.OverrideDirection = (Direction) ((int) _previewRotation % 4 * 2);
+        private void SetPreviewRotation(Direction direction)
+        {
+            _previewSpriteView.OverrideDirection = (Direction) ((int) direction % 4 * 2);
         }
 
         public void UpdateControls()
         {
-            if (Profile is null) return;
+            if (Profile is null)
+                return;
+
             UpdateNameEdit();
             UpdateFlavorTextEdit();
             UpdateSexControls();
@@ -1410,7 +1322,6 @@ public void UpdateControls()
             UpdateLoadouts(_loadoutsShowUnusableButton.Pressed);
             UpdateLoadoutPreferences();
             UpdateMarkings();
-            RebuildSpriteView();
             UpdateHairPickers();
             UpdateCMarkingsHair();
             UpdateCMarkingsFacialHair();
@@ -1421,181 +1332,18 @@ public void UpdateControls()
             _preferenceUnavailableButton.SelectId((int) Profile.PreferenceUnavailable);
         }
 
-        protected override void FrameUpdate(FrameEventArgs args)
-        {
-            base.FrameUpdate(args);
-
-            if (_needUpdatePreview)
-            {
-                UpdatePreview();
-                _needUpdatePreview = false;
-            }
-        }
-
         private void UpdateJobPriorities()
         {
             foreach (var prioritySelector in _jobPriorities)
             {
-                prioritySelector.UnlockRequirements(); // Nuclear 14
                 var jobId = prioritySelector.Proto.ID;
 
-                // Nuclear 14 start
-                if (!_requirements.IsAllowed(prioritySelector.Proto, out var reason))
-                {
-                    prioritySelector.LockRequirements(reason);
-                    if (Profile != null)
-                    {
-                        Profile = Profile.WithJobPriority(jobId, JobPriority.Never);
-                    }
-                }
-				// Nuclear 14 start
-
                 var priority = Profile?.JobPriorities.GetValueOrDefault(jobId, JobPriority.Never) ?? JobPriority.Never;
 
                 prioritySelector.Priority = priority;
             }
         }
 
-        private abstract class RequirementsSelector<T> : Control
-        {
-            public T Proto { get; }
-            public bool Disabled => _lockStripe.Visible;
-
-            protected readonly RadioOptions<int> Options;
-            private StripeBack _lockStripe;
-            private Label _requirementsLabel;
-
-            protected RequirementsSelector(T proto)
-            {
-                Proto = proto;
-
-                Options = new RadioOptions<int>(RadioOptionsLayout.Horizontal)
-                {
-                    FirstButtonStyle = StyleBase.ButtonOpenRight,
-                    ButtonStyle = StyleBase.ButtonOpenBoth,
-                    LastButtonStyle = StyleBase.ButtonOpenLeft
-                };
-                //Override default radio option button width
-                Options.GenerateItem = GenerateButton;
-
-                Options.OnItemSelected += args => Options.Select(args.Id);
-
-                _requirementsLabel = new Label()
-                {
-                    Text = Loc.GetString("role-timer-locked"),
-                    Visible = true,
-                    HorizontalAlignment = HAlignment.Center,
-                    StyleClasses = {StyleBase.StyleClassLabelSubText},
-                };
-
-                _lockStripe = new StripeBack()
-                {
-                    Visible = false,
-                    HorizontalExpand = true,
-                    MouseFilter = MouseFilterMode.Stop,
-                    Children =
-                    {
-                        _requirementsLabel
-                    }
-                };
-
-                // Setup must be called after
-            }
-
-            /// <summary>
-            /// Actually adds the controls, must be called in the inheriting class' constructor.
-            /// </summary>
-            protected void Setup((string, int)[] items, string title, int titleSize, string? description, TextureRect? icon = null)
-            {
-                foreach (var (text, value) in items)
-                {
-                    Options.AddItem(Loc.GetString(text), value);
-                }
-
-                var titleLabel = new Label()
-                {
-                    Margin = new Thickness(5f, 0, 5f, 0),
-                    Text = title,
-                    MinSize = new Vector2(titleSize, 0),
-                    MouseFilter = MouseFilterMode.Stop,
-                    ToolTip = description
-                };
-
-                var container = new BoxContainer
-                {
-                    Orientation = LayoutOrientation.Horizontal,
-                };
-
-                if (icon != null)
-                    container.AddChild(icon);
-                container.AddChild(titleLabel);
-                container.AddChild(Options);
-                container.AddChild(_lockStripe);
-
-                AddChild(container);
-            }
-
-            public void LockRequirements(FormattedMessage requirements)
-            {
-                var tooltip = new Tooltip();
-                tooltip.SetMessage(requirements);
-                _lockStripe.TooltipSupplier = _ => tooltip;
-                _lockStripe.Visible = true;
-                Options.Visible = false;
-            }
-
-            // TODO: Subscribe to roletimers event. I am too lazy to do this RN But I doubt most people will notice fn
-            public void UnlockRequirements()
-            {
-                _lockStripe.Visible = false;
-                Options.Visible = true;
-            }
-
-            private Button GenerateButton(string text, int value)
-            {
-                return new Button
-                {
-                    Text = text,
-                    MinWidth = 90
-                };
-            }
-        }
-
-        private sealed class JobPrioritySelector : RequirementsSelector<JobPrototype>
-        {
-            public JobPriority Priority
-            {
-                get => (JobPriority) Options.SelectedValue;
-                set => Options.SelectByValue((int) value);
-            }
-
-            public event Action<JobPriority>? PriorityChanged;
-
-            public JobPrioritySelector(JobPrototype proto, IPrototypeManager protoMan)
-                : base(proto)
-            {
-                Options.OnItemSelected += args => PriorityChanged?.Invoke(Priority);
-
-                var items = new[]
-                {
-                    ("humanoid-profile-editor-job-priority-high-button", (int) JobPriority.High),
-                    ("humanoid-profile-editor-job-priority-medium-button", (int) JobPriority.Medium),
-                    ("humanoid-profile-editor-job-priority-low-button", (int) JobPriority.Low),
-                    ("humanoid-profile-editor-job-priority-never-button", (int) JobPriority.Never),
-                };
-
-                var icon = new TextureRect
-                {
-                    TextureScale = new Vector2(2, 2),
-                    VerticalAlignment = VAlignment.Center
-                };
-                var jobIcon = protoMan.Index<StatusIconPrototype>(proto.Icon);
-                icon.Texture = jobIcon.Icon.Frame0();
-
-                Setup(items, proto.LocalizedName, 200, proto.LocalizedDescription, icon);
-            }
-        }
-
         private void UpdateAntagPreferences()
         {
             foreach (var preferenceSelector in _antagPreferences)
@@ -1629,6 +1377,9 @@ private void UpdateTraitPreferences()
             _traitPointsLabel.Text = Loc.GetString("humanoid-profile-editor-traits-header",
                 ("points", points), ("traits", _traitCount),
                 ("maxTraits", _configurationManager.GetCVar(CCVars.GameTraitsMax)));
+
+            IsDirty = true;
+            UpdatePreview();
         }
 
         // Yeah this is mostly just copied from UpdateLoadouts
@@ -1665,8 +1416,8 @@ private void UpdateTraits(bool showUnusable)
                     trait.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
-                    _entMan,
+                    _requirements.GetPlayTimes(),
+                    _entityManager,
                     _prototypeManager,
                     _configurationManager,
                     out _
@@ -1680,8 +1431,8 @@ out _
                     trait.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(),
-                    _entMan,
+                    _requirements.GetPlayTimes(),
+                    _entityManager,
                     _prototypeManager,
                     _configurationManager,
                     out _
@@ -1787,7 +1538,7 @@ out _
                 var selector = new TraitPreferenceSelector(trait, highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
                     traitsUnusable.Contains(trait) ? "" : "ButtonColorRed",
-                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+                    _entityManager, _prototypeManager, _configurationManager, _characterRequirementsSystem);
 
                 // Look for an existing trait category
                 BoxContainer? match = null;
@@ -1799,7 +1550,7 @@ out _
                     // This is fucked up
                     if (child.Name.Split("_")[0] == trait.Category
                         && child.Children.FirstOrDefault()?.Children.FirstOrDefault(g =>
-                            g.GetType() == typeof(BoxContainer)) is {} g != default)
+                            g.GetType() == typeof(BoxContainer)) is { } g)
                         match = (BoxContainer) g;
                 }
 
@@ -1819,7 +1570,7 @@ out _
             {
                 var selector = new TraitPreferenceSelector(trait, highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "",
-                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+                    _entityManager, _prototypeManager, _configurationManager, _characterRequirementsSystem);
 
 
                 AddSelector(selector, trait.Points, trait.ID);
@@ -1855,7 +1606,7 @@ void AddSelector(TraitPreferenceSelector selector, int points, string id)
 
                     // Update Preferences
                     Profile = Profile?.WithTraitPreference(id, preference);
-                    IsDirty = true;
+                    UpdatePreview();
                     UpdateTraitPreferences();
                     UpdateTraits(_traitsShowUnusableButton.Pressed);
                     UpdateLoadouts(_loadoutsShowUnusableButton.Pressed);
@@ -1889,6 +1640,10 @@ private void UpdateLoadoutPreferences()
                     _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label", ("points", points), ("max", _loadoutPointsBar.MaxValue));
                 }
             }
+
+            IsDirty = true;
+            _controller.UpdateClothes = true;
+            UpdatePreview();
         }
 
         private void UpdateLoadouts(bool showUnusable)
@@ -1920,8 +1675,8 @@ private void UpdateLoadouts(bool showUnusable)
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(), //TODO Make this use real playtimes
-                    _entMan,
+                    _requirements.GetPlayTimes(),
+                    _entityManager,
                     _prototypeManager,
                     _configurationManager,
                     out _
@@ -1935,8 +1690,8 @@ out _
                     loadout.Requirements,
                     highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
-                    new Dictionary<string, TimeSpan>(),
-                    _entMan,
+                    _requirements.GetPlayTimes(),
+                    _entityManager,
                     _prototypeManager,
                     _configurationManager,
                     out _
@@ -1998,7 +1753,7 @@ out _
                     // This is fucked up
                     if (child.Name.Split("_")[0] == category.ID
                         && child.Children.FirstOrDefault()?.Children.FirstOrDefault(g =>
-                            g.GetType() == typeof(BoxContainer)) is {} g != default)
+                            g.GetType() == typeof(BoxContainer)) is { } g)
                         match = (BoxContainer) g;
                 }
 
@@ -2045,7 +1800,7 @@ out _
                 var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
                     loadoutsUnusable.Contains(loadout) ? "" : "ButtonColorRed",
-                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+                    _entityManager, _prototypeManager, _configurationManager, _characterRequirementsSystem);
 
                 // Look for an existing loadout category
                 BoxContainer? match = null;
@@ -2074,7 +1829,7 @@ out _
             {
                 var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
                     Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "",
-                    _entMan, _prototypeManager, _configurationManager, _characterRequirementsSystem);
+                    _entityManager, _prototypeManager, _configurationManager, _characterRequirementsSystem);
 
 
                 AddSelector(selector, loadout.Cost, loadout.ID);
@@ -2118,238 +1873,5 @@ bool CheckPoints(int points, bool preference)
                 return preference ? !(temp < 0) : temp < 0;
             }
         }
-
-
-        private sealed class AntagPreferenceSelector : RequirementsSelector<AntagPrototype>
-        {
-            // 0 is yes and 1 is no
-            public bool Preference
-            {
-                get => Options.SelectedValue == 0;
-                set => Options.Select((value && !Disabled) ? 0 : 1);
-            }
-
-            public event Action<bool>? PreferenceChanged;
-
-            public AntagPreferenceSelector(AntagPrototype proto)
-                : base(proto)
-            {
-                Options.OnItemSelected += args => PreferenceChanged?.Invoke(Preference);
-
-                var items = new[]
-                {
-                    ("humanoid-profile-editor-antag-preference-yes-button", 0),
-                    ("humanoid-profile-editor-antag-preference-no-button", 1)
-                };
-                var title = Loc.GetString(proto.Name);
-                var description = Loc.GetString(proto.Objective);
-                Setup(items, title, 250, description);
-
-                // immediately lock requirements if they arent met.
-                // another function checks Disabled after creating the selector so this has to be done now
-                var requirements = IoCManager.Resolve<JobRequirementsManager>();
-                if (proto.Requirements != null && !requirements.CheckRoleTime(proto.Requirements, out var reason))
-                {
-                    LockRequirements(reason);
-                }
-            }
-        }
-
-        private sealed class TraitPreferenceSelector : Control
-        {
-            public TraitPrototype Trait { get; }
-            private readonly Button _button;
-
-            public bool Preference
-            {
-                get => _button.Pressed;
-                set => _button.Pressed = value;
-            }
-
-            public event Action<bool>? PreferenceChanged;
-
-            public TraitPreferenceSelector(TraitPrototype trait, JobPrototype highJob,
-                HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
-                IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
-            {
-                Trait = trait;
-
-                // Create a checkbox to get the loadout
-                _button = new Button
-                {
-                    VerticalAlignment = VAlignment.Center,
-                    ToggleMode = true,
-                    StyleClasses = { StyleBase.ButtonOpenLeft },
-                    Children =
-                    {
-                        new BoxContainer
-                        {
-                            Children =
-                            {
-                                new Label
-                                {
-                                    Text = trait.Points.ToString(),
-                                    StyleClasses = { StyleBase.StyleClassLabelHeading },
-                                    MinWidth = 32,
-                                    MaxWidth = 32,
-                                    ClipText = true,
-                                    Margin = new Thickness(0, 0, 8, 0),
-                                },
-                                new Label { Text = Loc.GetString($"trait-name-{trait.ID}") },
-                            },
-                        },
-                    },
-                };
-                _button.OnToggled += OnButtonToggled;
-                _button.AddStyleClass(style);
-
-                var tooltip = new StringBuilder();
-                // Add the loadout description to the tooltip if there is one
-                var desc = Loc.GetString($"trait-description-{trait.ID}");
-                if (!string.IsNullOrEmpty(desc) && desc != $"trait-description-{trait.ID}")
-                    tooltip.Append(desc);
-
-
-                // Get requirement reasons
-                characterRequirementsSystem.CheckRequirementsValid(trait, trait.Requirements, highJob, profile,
-                    new Dictionary<string, TimeSpan>(),
-                    entityManager, prototypeManager, configManager,
-                    out var reasons);
-
-                // Add requirement reasons to the tooltip
-                foreach (var reason in reasons)
-                    tooltip.Append($"\n{reason.ToMarkup()}");
-
-                // Combine the tooltip and format it in the checkbox supplier
-                if (tooltip.Length > 0)
-                {
-                    var formattedTooltip = new Tooltip();
-                    formattedTooltip.SetMessage(FormattedMessage.FromMarkupPermissive(tooltip.ToString()));
-                    _button.TooltipSupplier = _ => formattedTooltip;
-                }
-
-
-                // Add the loadout preview and the checkbox to the control
-                AddChild(new BoxContainer
-                {
-                    Orientation = LayoutOrientation.Horizontal,
-                    Children = { _button },
-                });
-            }
-
-            private void OnButtonToggled(BaseButton.ButtonToggledEventArgs args)
-            {
-                PreferenceChanged?.Invoke(Preference);
-            }
-        }
-
-        private sealed class LoadoutPreferenceSelector : Control
-        {
-            public LoadoutPrototype Loadout { get; }
-            private readonly Button _button;
-
-            public bool Preference
-            {
-                get => _button.Pressed;
-                set => _button.Pressed = value;
-            }
-
-            public event Action<bool>? PreferenceChanged;
-
-            public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
-                HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
-                IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
-            {
-                Loadout = loadout;
-
-                // Display the first item in the loadout as a preview
-                // TODO: Maybe allow custom icons to be specified in the prototype?
-                var dummyLoadoutItem = entityManager.SpawnEntity(loadout.Items.First(), MapCoordinates.Nullspace);
-
-                // Create a sprite preview of the loadout item
-                var previewLoadout = new SpriteView
-                {
-                    Scale = new Vector2(1, 1),
-                    OverrideDirection = Direction.South,
-                    VerticalAlignment = VAlignment.Center,
-                    SizeFlagsStretchRatio = 1,
-                };
-                previewLoadout.SetEntity(dummyLoadoutItem);
-
-
-                // Create a checkbox to get the loadout
-                _button = new Button
-                {
-                    ToggleMode = true,
-                    StyleClasses = { StyleBase.ButtonOpenLeft },
-                    Children =
-                    {
-                        new BoxContainer
-                        {
-                            Children =
-                            {
-                                new Label
-                                {
-                                    Text = loadout.Cost.ToString(),
-                                    StyleClasses = { StyleBase.StyleClassLabelHeading },
-                                    MinWidth = 32,
-                                    MaxWidth = 32,
-                                    ClipText = true,
-                                    Margin = new Thickness(0, 0, 8, 0),
-                                },
-                                new Label
-                                {
-                                    Text = Loc.GetString($"loadout-name-{loadout.ID}") == $"loadout-name-{loadout.ID}"
-                                        ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityName
-                                        : Loc.GetString($"loadout-name-{loadout.ID}"),
-                                },
-                            },
-                        },
-                    },
-                };
-                _button.OnToggled += OnButtonToggled;
-                _button.AddStyleClass(style);
-
-                var tooltip = new StringBuilder();
-                // Add the loadout description to the tooltip if there is one
-                var desc = !Loc.TryGetString($"loadout-description-{loadout.ID}", out var description)
-                    ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityDescription
-                    : description;
-                if (!string.IsNullOrEmpty(desc))
-                    tooltip.Append($"{Loc.GetString(desc)}");
-
-
-                // Get requirement reasons
-                characterRequirementsSystem.CheckRequirementsValid(loadout, loadout.Requirements, highJob, profile,
-                    new Dictionary<string, TimeSpan>(),
-                    entityManager, prototypeManager, configManager,
-                    out var reasons);
-
-                // Add requirement reasons to the tooltip
-                foreach (var reason in reasons)
-                    tooltip.Append($"\n{reason.ToMarkup()}");
-
-                // Combine the tooltip and format it in the checkbox supplier
-                if (tooltip.Length > 0)
-                {
-                    var formattedTooltip = new Tooltip();
-                    formattedTooltip.SetMessage(FormattedMessage.FromMarkupPermissive(tooltip.ToString()));
-                    _button.TooltipSupplier = _ => formattedTooltip;
-                }
-
-
-                // Add the loadout preview and the checkbox to the control
-                AddChild(new BoxContainer
-                {
-                    Orientation = LayoutOrientation.Horizontal,
-                    Children = { previewLoadout, _button },
-                });
-            }
-
-            private void OnButtonToggled(BaseButton.ButtonToggledEventArgs args)
-            {
-                PreferenceChanged?.Invoke(Preference);
-            }
-        }
     }
 }
diff --git a/Content.Client/Preferences/UI/JobPrioritySelector.cs b/Content.Client/Preferences/UI/JobPrioritySelector.cs
new file mode 100644
index 00000000000..2e2c699c3ad
--- /dev/null
+++ b/Content.Client/Preferences/UI/JobPrioritySelector.cs
@@ -0,0 +1,43 @@
+using System.Numerics;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Content.Shared.StatusIcon;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.Utility;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Preferences.UI;
+
+public sealed class JobPrioritySelector : RequirementsSelector<JobPrototype>
+{
+    public JobPriority Priority
+    {
+        get => (JobPriority) Options.SelectedValue;
+        set => Options.SelectByValue((int) value);
+    }
+
+    public event Action<JobPriority>? PriorityChanged;
+
+    public JobPrioritySelector(JobPrototype proto, IPrototypeManager protoMan) : base(proto)
+    {
+        Options.OnItemSelected += _ => PriorityChanged?.Invoke(Priority);
+
+        var items = new[]
+        {
+            ("humanoid-profile-editor-job-priority-high-button", (int) JobPriority.High),
+            ("humanoid-profile-editor-job-priority-medium-button", (int) JobPriority.Medium),
+            ("humanoid-profile-editor-job-priority-low-button", (int) JobPriority.Low),
+            ("humanoid-profile-editor-job-priority-never-button", (int) JobPriority.Never),
+        };
+
+        var icon = new TextureRect
+        {
+            TextureScale = new Vector2(2, 2),
+            VerticalAlignment = VAlignment.Center,
+        };
+        var jobIcon = protoMan.Index<StatusIconPrototype>(proto.Icon);
+        icon.Texture = jobIcon.Icon.Frame0();
+
+        Setup(items, proto.LocalizedName, 200, proto.LocalizedDescription, icon);
+    }
+}
diff --git a/Content.Client/Preferences/UI/LoadoutPreferenceSelector.cs b/Content.Client/Preferences/UI/LoadoutPreferenceSelector.cs
new file mode 100644
index 00000000000..a6839dee65f
--- /dev/null
+++ b/Content.Client/Preferences/UI/LoadoutPreferenceSelector.cs
@@ -0,0 +1,127 @@
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using Content.Client.Stylesheets;
+using Content.Shared.Clothing.Loadouts.Prototypes;
+using Content.Shared.Customization.Systems;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Configuration;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Preferences.UI;
+
+
+public sealed class LoadoutPreferenceSelector : Control
+{
+    public LoadoutPrototype Loadout { get; }
+    private readonly Button _button;
+
+    public bool Preference
+    {
+        get => _button.Pressed;
+        set => _button.Pressed = value;
+    }
+
+    public event Action<bool>? PreferenceChanged;
+
+    public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
+        HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
+    {
+        Loadout = loadout;
+
+        // Display the first item in the loadout as a preview
+        // TODO: Maybe allow custom icons to be specified in the prototype?
+        var dummyLoadoutItem = entityManager.SpawnEntity(loadout.Items.First(), MapCoordinates.Nullspace);
+
+        // Create a sprite preview of the loadout item
+        var previewLoadout = new SpriteView
+        {
+            Scale = new Vector2(1, 1),
+            OverrideDirection = Direction.South,
+            VerticalAlignment = VAlignment.Center,
+            SizeFlagsStretchRatio = 1,
+        };
+        previewLoadout.SetEntity(dummyLoadoutItem);
+
+
+        // Create a checkbox to get the loadout
+        _button = new Button
+        {
+            ToggleMode = true,
+            StyleClasses = { StyleBase.ButtonOpenLeft },
+            Children =
+            {
+                new BoxContainer
+                {
+                    Children =
+                    {
+                        new Label
+                        {
+                            Text = loadout.Cost.ToString(),
+                            StyleClasses = { StyleBase.StyleClassLabelHeading },
+                            MinWidth = 32,
+                            MaxWidth = 32,
+                            ClipText = true,
+                            Margin = new Thickness(0, 0, 8, 0),
+                        },
+                        new Label
+                        {
+                            Text = Loc.GetString($"loadout-name-{loadout.ID}") == $"loadout-name-{loadout.ID}"
+                                ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityName
+                                : Loc.GetString($"loadout-name-{loadout.ID}"),
+                        },
+                    },
+                },
+            },
+        };
+        _button.OnToggled += OnButtonToggled;
+        _button.AddStyleClass(style);
+
+        var tooltip = new StringBuilder();
+        // Add the loadout description to the tooltip if there is one
+        var desc = !Loc.TryGetString($"loadout-description-{loadout.ID}", out var description)
+            ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityDescription
+            : description;
+        if (!string.IsNullOrEmpty(desc))
+            tooltip.Append($"{Loc.GetString(desc)}");
+
+
+        // Get requirement reasons
+        characterRequirementsSystem.CheckRequirementsValid(loadout, loadout.Requirements, highJob, profile,
+            new Dictionary<string, TimeSpan>(),
+            entityManager, prototypeManager, configManager,
+            out var reasons);
+
+        // Add requirement reasons to the tooltip
+        foreach (var reason in reasons)
+            tooltip.Append($"\n{reason.ToMarkup()}");
+
+        // Combine the tooltip and format it in the checkbox supplier
+        if (tooltip.Length > 0)
+        {
+            var formattedTooltip = new Tooltip();
+            formattedTooltip.SetMessage(FormattedMessage.FromMarkupPermissive(tooltip.ToString()));
+            _button.TooltipSupplier = _ => formattedTooltip;
+        }
+
+
+        // Add the loadout preview and the checkbox to the control
+        AddChild(new BoxContainer
+        {
+            Orientation = BoxContainer.LayoutOrientation.Horizontal,
+            Children = { previewLoadout, _button },
+        });
+    }
+
+    private void OnButtonToggled(BaseButton.ButtonToggledEventArgs args)
+    {
+        PreferenceChanged?.Invoke(Preference);
+    }
+}
diff --git a/Content.Client/Preferences/UI/RequirementsSelector.cs b/Content.Client/Preferences/UI/RequirementsSelector.cs
new file mode 100644
index 00000000000..a4a25536d09
--- /dev/null
+++ b/Content.Client/Preferences/UI/RequirementsSelector.cs
@@ -0,0 +1,102 @@
+using System.Numerics;
+using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Preferences.UI;
+
+public abstract class RequirementsSelector<T> : BoxContainer where T : IPrototype
+{
+    public T Proto { get; }
+    public bool Disabled => _lockStripe.Visible;
+
+    protected readonly RadioOptions<int> Options;
+    private readonly StripeBack _lockStripe;
+
+    protected RequirementsSelector(T proto)
+    {
+        Proto = proto;
+
+        Options = new RadioOptions<int>(RadioOptionsLayout.Horizontal)
+        {
+            FirstButtonStyle = StyleBase.ButtonOpenRight,
+            ButtonStyle = StyleBase.ButtonOpenBoth,
+            LastButtonStyle = StyleBase.ButtonOpenLeft,
+        };
+        //Override default radio option button width
+        Options.GenerateItem = GenerateButton;
+        Options.OnItemSelected += args => Options.Select(args.Id);
+
+        var requirementsLabel = new Label
+        {
+            Text = Loc.GetString("role-timer-locked"),
+            Visible = true,
+            HorizontalAlignment = HAlignment.Center,
+            StyleClasses = {StyleBase.StyleClassLabelSubText},
+        };
+
+        _lockStripe = new StripeBack
+        {
+            Visible = false,
+            HorizontalExpand = true,
+            MouseFilter = MouseFilterMode.Stop,
+            Children = { requirementsLabel },
+        };
+    }
+
+    /// <summary>
+    /// Actually adds the controls, must be called in the inheriting class' constructor.
+    /// </summary>
+    protected void Setup((string, int)[] items, string title, int titleSize, string? description, TextureRect? icon = null)
+    {
+        foreach (var (text, value) in items)
+            Options.AddItem(Loc.GetString(text), value);
+
+        var titleLabel = new Label
+        {
+            Margin = new Thickness(5f, 0, 5f, 0),
+            Text = title,
+            MinSize = new Vector2(titleSize, 0),
+            MouseFilter = MouseFilterMode.Stop,
+            ToolTip = description
+        };
+
+        var container = new BoxContainer { Orientation = LayoutOrientation.Horizontal, };
+
+        if (icon != null)
+            container.AddChild(icon);
+        container.AddChild(titleLabel);
+        container.AddChild(Options);
+        container.AddChild(_lockStripe);
+
+        AddChild(container);
+    }
+
+    public void LockRequirements(FormattedMessage requirements)
+    {
+        var tooltip = new Tooltip();
+        tooltip.SetMessage(requirements);
+        _lockStripe.TooltipSupplier = _ => tooltip;
+        _lockStripe.Visible = true;
+        Options.Visible = false;
+    }
+
+    // TODO: Subscribe to roletimers event. I am too lazy to do this RN But I doubt most people will notice fn
+    public void UnlockRequirements()
+    {
+        _lockStripe.Visible = false;
+        Options.Visible = true;
+    }
+
+    private Button GenerateButton(string text, int value)
+    {
+        return new Button
+        {
+            Text = text,
+            MinWidth = 90
+        };
+    }
+}
diff --git a/Content.Client/Preferences/UI/TraitPreferenceSelector.cs b/Content.Client/Preferences/UI/TraitPreferenceSelector.cs
new file mode 100644
index 00000000000..0f843ca3a58
--- /dev/null
+++ b/Content.Client/Preferences/UI/TraitPreferenceSelector.cs
@@ -0,0 +1,104 @@
+using System.Text;
+using Content.Client.Stylesheets;
+using Content.Shared.Customization.Systems;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Content.Shared.Traits;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Preferences.UI;
+
+
+public sealed class TraitPreferenceSelector : Control
+{
+    public TraitPrototype Trait { get; }
+    private readonly Button _button;
+
+    public bool Preference
+    {
+        get => _button.Pressed;
+        set => _button.Pressed = value;
+    }
+
+    public event Action<bool>? PreferenceChanged;
+
+    public TraitPreferenceSelector(TraitPrototype trait, JobPrototype highJob,
+        HumanoidCharacterProfile profile, string style, IEntityManager entityManager,
+        IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, CharacterRequirementsSystem characterRequirementsSystem)
+    {
+        Trait = trait;
+
+        // Create a checkbox to get the loadout
+        _button = new Button
+        {
+            VerticalAlignment = Control.VAlignment.Center,
+            ToggleMode = true,
+            StyleClasses = { StyleBase.ButtonOpenLeft },
+            Children =
+            {
+                new BoxContainer
+                {
+                    Children =
+                    {
+                        new Label
+                        {
+                            Text = trait.Points.ToString(),
+                            StyleClasses = { StyleBase.StyleClassLabelHeading },
+                            MinWidth = 32,
+                            MaxWidth = 32,
+                            ClipText = true,
+                            Margin = new Thickness(0, 0, 8, 0),
+                        },
+                        new Label { Text = Loc.GetString($"trait-name-{trait.ID}") },
+                    },
+                },
+            },
+        };
+        _button.OnToggled += OnButtonToggled;
+        _button.AddStyleClass(style);
+
+        var tooltip = new StringBuilder();
+        // Add the loadout description to the tooltip if there is one
+        var desc = Loc.GetString($"trait-description-{trait.ID}");
+        if (!string.IsNullOrEmpty(desc) && desc != $"trait-description-{trait.ID}")
+            tooltip.Append(desc);
+
+
+        // Get requirement reasons
+        characterRequirementsSystem.CheckRequirementsValid(trait, trait.Requirements, highJob, profile,
+            new Dictionary<string, TimeSpan>(),
+            entityManager, prototypeManager, configManager,
+            out var reasons);
+
+        // Add requirement reasons to the tooltip
+        foreach (var reason in reasons)
+            tooltip.Append($"\n{reason.ToMarkup()}");
+
+        // Combine the tooltip and format it in the checkbox supplier
+        if (tooltip.Length > 0)
+        {
+            var formattedTooltip = new Tooltip();
+            formattedTooltip.SetMessage(FormattedMessage.FromMarkupPermissive(tooltip.ToString()));
+            _button.TooltipSupplier = _ => formattedTooltip;
+        }
+
+
+        // Add the loadout preview and the checkbox to the control
+        AddChild(new BoxContainer
+        {
+            Orientation = BoxContainer.LayoutOrientation.Horizontal,
+            Children = { _button },
+        });
+    }
+
+    private void OnButtonToggled(BaseButton.ButtonToggledEventArgs args)
+    {
+        PreferenceChanged?.Invoke(Preference);
+    }
+}
diff --git a/Content.Client/Pulling/PullingSystem.cs b/Content.Client/Pulling/PullingSystem.cs
deleted file mode 100644
index 556dadd00da..00000000000
--- a/Content.Client/Pulling/PullingSystem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Pulling;
-using Content.Shared.Pulling.Components;
-using JetBrains.Annotations;
-using Robust.Client.Physics;
-
-namespace Content.Client.Pulling
-{
-    [UsedImplicitly]
-    public sealed class PullingSystem : SharedPullingSystem
-    {
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            UpdatesAfter.Add(typeof(PhysicsSystem));
-
-            SubscribeLocalEvent<SharedPullableComponent, PullableMoveMessage>(OnPullableMove);
-            SubscribeLocalEvent<SharedPullableComponent, PullableStopMovingMessage>(OnPullableStopMove);
-        }
-    }
-}
diff --git a/Content.Client/RCD/AlignRCDConstruction.cs b/Content.Client/RCD/AlignRCDConstruction.cs
new file mode 100644
index 00000000000..da7b22c91a8
--- /dev/null
+++ b/Content.Client/RCD/AlignRCDConstruction.cs
@@ -0,0 +1,122 @@
+using System.Numerics;
+using Content.Client.Gameplay;
+using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
+using Content.Shared.RCD.Components;
+using Content.Shared.RCD.Systems;
+using Robust.Client.Placement;
+using Robust.Client.Player;
+using Robust.Client.State;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+
+namespace Content.Client.RCD;
+
+public sealed class AlignRCDConstruction : PlacementMode
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+    [Dependency] private readonly RCDSystem _rcdSystem = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IStateManager _stateManager = default!;
+
+    private const float SearchBoxSize = 2f;
+    private const float PlaceColorBaseAlpha = 0.5f;
+
+    private EntityCoordinates _unalignedMouseCoords = default;
+
+    /// <summary>
+    /// This placement mode is not on the engine because it is content specific (i.e., for the RCD)
+    /// </summary>
+    public AlignRCDConstruction(PlacementManager pMan) : base(pMan)
+    {
+        var dependencies = IoCManager.Instance!;
+        _entityManager = dependencies.Resolve<IEntityManager>();
+        _mapManager = dependencies.Resolve<IMapManager>();
+        _playerManager = dependencies.Resolve<IPlayerManager>();
+        _stateManager = dependencies.Resolve<IStateManager>();
+
+        _mapSystem = _entityManager.System<SharedMapSystem>();
+        _rcdSystem = _entityManager.System<RCDSystem>();
+        _transformSystem = _entityManager.System<SharedTransformSystem>();
+
+        ValidPlaceColor = ValidPlaceColor.WithAlpha(PlaceColorBaseAlpha);
+    }
+
+    public override void AlignPlacementMode(ScreenCoordinates mouseScreen)
+    {
+        _unalignedMouseCoords = ScreenToCursorGrid(mouseScreen);
+        MouseCoords = _unalignedMouseCoords.AlignWithClosestGridTile(SearchBoxSize, _entityManager, _mapManager);
+
+        var gridId = MouseCoords.GetGridUid(_entityManager);
+
+        if (!_entityManager.TryGetComponent<MapGridComponent>(gridId, out var mapGrid))
+            return;
+
+        CurrentTile = _mapSystem.GetTileRef(gridId.Value, mapGrid, MouseCoords);
+
+        float tileSize = mapGrid.TileSize;
+        GridDistancing = tileSize;
+
+        if (pManager.CurrentPermission!.IsTile)
+        {
+            MouseCoords = new EntityCoordinates(MouseCoords.EntityId, new Vector2(CurrentTile.X + tileSize / 2,
+                CurrentTile.Y + tileSize / 2));
+        }
+        else
+        {
+            MouseCoords = new EntityCoordinates(MouseCoords.EntityId, new Vector2(CurrentTile.X + tileSize / 2 + pManager.PlacementOffset.X,
+                CurrentTile.Y + tileSize / 2 + pManager.PlacementOffset.Y));
+        }
+    }
+
+    public override bool IsValidPosition(EntityCoordinates position)
+    {
+        var player = _playerManager.LocalSession?.AttachedEntity;
+
+        // If the destination is out of interaction range, set the placer alpha to zero
+        if (!_entityManager.TryGetComponent<TransformComponent>(player, out var xform))
+            return false;
+
+        if (!xform.Coordinates.InRange(_entityManager, _transformSystem, position, SharedInteractionSystem.InteractionRange))
+        {
+            InvalidPlaceColor = InvalidPlaceColor.WithAlpha(0);
+            return false;
+        }
+
+        // Otherwise restore the alpha value
+        else
+        {
+            InvalidPlaceColor = InvalidPlaceColor.WithAlpha(PlaceColorBaseAlpha);
+        }
+
+        // Determine if player is carrying an RCD in their active hand
+        if (!_entityManager.TryGetComponent<HandsComponent>(player, out var hands))
+            return false;
+
+        var heldEntity = hands.ActiveHand?.HeldEntity;
+
+        if (!_entityManager.TryGetComponent<RCDComponent>(heldEntity, out var rcd))
+            return false;
+
+        // Retrieve the map grid data for the position
+        if (!_rcdSystem.TryGetMapGridData(position, out var mapGridData))
+            return false;
+
+        // Determine if the user is hovering over a target
+        var currentState = _stateManager.CurrentState;
+
+        if (currentState is not GameplayStateBase screen)
+            return false;
+
+        var target = screen.GetClickedEntity(_unalignedMouseCoords.ToMap(_entityManager, _transformSystem));
+
+        // Determine if the RCD operation is valid or not
+        if (!_rcdSystem.IsRCDOperationStillValid(heldEntity.Value, rcd, mapGridData.Value, target, player.Value, false))
+            return false;
+
+        return true;
+    }
+}
diff --git a/Content.Client/RCD/RCDConstructionGhostSystem.cs b/Content.Client/RCD/RCDConstructionGhostSystem.cs
new file mode 100644
index 00000000000..792916b8922
--- /dev/null
+++ b/Content.Client/RCD/RCDConstructionGhostSystem.cs
@@ -0,0 +1,78 @@
+using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
+using Content.Shared.RCD;
+using Content.Shared.RCD.Components;
+using Content.Shared.RCD.Systems;
+using Robust.Client.Placement;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+
+namespace Content.Client.RCD;
+
+public sealed class RCDConstructionGhostSystem : EntitySystem
+{
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly RCDSystem _rcdSystem = default!;
+    [Dependency] private readonly IPlacementManager _placementManager = default!;
+
+    private string _placementMode = typeof(AlignRCDConstruction).Name;
+    private Direction _placementDirection = default;
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        // Get current placer data
+        var placerEntity = _placementManager.CurrentPermission?.MobUid;
+        var placerProto = _placementManager.CurrentPermission?.EntityType;
+        var placerIsRCD = HasComp<RCDComponent>(placerEntity);
+
+        // Exit if erasing or the current placer is not an RCD (build mode is active)
+        if (_placementManager.Eraser || (placerEntity != null && !placerIsRCD))
+            return;
+
+        // Determine if player is carrying an RCD in their active hand
+        var player = _playerManager.LocalSession?.AttachedEntity;
+
+        if (!TryComp<HandsComponent>(player, out var hands))
+            return;
+
+        var heldEntity = hands.ActiveHand?.HeldEntity;
+
+        if (!TryComp<RCDComponent>(heldEntity, out var rcd))
+        {
+            // If the player was holding an RCD, but is no longer, cancel placement
+            if (placerIsRCD)
+                _placementManager.Clear();
+
+            return;
+        }
+
+        // Update the direction the RCD prototype based on the placer direction
+        if (_placementDirection != _placementManager.Direction)
+        {
+            _placementDirection = _placementManager.Direction;
+            RaiseNetworkEvent(new RCDConstructionGhostRotationEvent(GetNetEntity(heldEntity.Value), _placementDirection));
+        }
+
+        // If the placer has not changed, exit
+        _rcdSystem.UpdateCachedPrototype(heldEntity.Value, rcd);
+
+        if (heldEntity == placerEntity && rcd.CachedPrototype.Prototype == placerProto)
+            return;
+
+        // Create a new placer
+        var newObjInfo = new PlacementInformation
+        {
+            MobUid = heldEntity.Value,
+            PlacementOption = _placementMode,
+            EntityType = rcd.CachedPrototype.Prototype,
+            Range = (int) Math.Ceiling(SharedInteractionSystem.InteractionRange),
+            IsTile = (rcd.CachedPrototype.Mode == RcdMode.ConstructTile),
+            UseEditorContext = false,
+        };
+
+        _placementManager.Clear();
+        _placementManager.BeginPlacing(newObjInfo);
+    }
+}
diff --git a/Content.Client/RCD/RCDMenu.xaml b/Content.Client/RCD/RCDMenu.xaml
new file mode 100644
index 00000000000..b3d5367a5fd
--- /dev/null
+++ b/Content.Client/RCD/RCDMenu.xaml
@@ -0,0 +1,47 @@
+<ui:RadialMenu xmlns="https://spacestation14.io"
+                xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+                xmlns:rcd="clr-namespace:Content.Client.RCD"
+                BackButtonStyleClass="RadialMenuBackButton"
+                CloseButtonStyleClass="RadialMenuCloseButton"
+                VerticalExpand="True"
+                HorizontalExpand="True"
+                MinSize="450 450">
+    
+    <!-- Note: The min size of the window just determine how close to the edge of the screen the center of the radial menu can be placed -->
+    <!-- The radial menu will try to open so that its center is located where the player's cursor is currently -->
+
+    <!-- Entry layer (shows main categories) -->
+    <ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" Radius="64" ReserveSpaceForHiddenChildren="False">
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-walls-and-flooring'}" TargetLayer="WallsAndFlooring" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/walls_and_flooring.png"/>
+        </ui:RadialMenuTextureButton>
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-windows-and-grilles'}" TargetLayer="WindowsAndGrilles" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/windows_and_grilles.png"/>
+        </ui:RadialMenuTextureButton>
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-airlocks'}" TargetLayer="Airlocks" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/airlocks.png"/>
+        </ui:RadialMenuTextureButton>
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-electrical'}" TargetLayer="Electrical" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/multicoil.png"/>
+        </ui:RadialMenuTextureButton>
+        <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'rcd-component-lighting'}" TargetLayer="Lighting" Visible="False">
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Radial/RCD/lighting.png"/>
+        </ui:RadialMenuTextureButton>
+    </ui:RadialContainer>
+
+    <!-- Walls and flooring -->
+    <ui:RadialContainer Name="WallsAndFlooring"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+
+    <!-- Windows and grilles -->
+    <ui:RadialContainer Name="WindowsAndGrilles"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+
+    <!-- Airlocks -->
+    <ui:RadialContainer Name="Airlocks"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+
+    <!-- Computer and machine frames -->
+    <ui:RadialContainer Name="Electrical"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+       
+    <!-- Lighting -->
+    <ui:RadialContainer Name="Lighting"  VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
+
+</ui:RadialMenu>
diff --git a/Content.Client/RCD/RCDMenu.xaml.cs b/Content.Client/RCD/RCDMenu.xaml.cs
new file mode 100644
index 00000000000..51ec66ea444
--- /dev/null
+++ b/Content.Client/RCD/RCDMenu.xaml.cs
@@ -0,0 +1,174 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Popups;
+using Content.Shared.RCD;
+using Content.Shared.RCD.Components;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using System.Numerics;
+
+namespace Content.Client.RCD;
+
+[GenerateTypedNameReferences]
+public sealed partial class RCDMenu : RadialMenu
+{
+    [Dependency] private readonly EntityManager _entManager = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    private readonly SpriteSystem _spriteSystem;
+    private readonly SharedPopupSystem _popup;
+
+    public event Action<ProtoId<RCDPrototype>>? SendRCDSystemMessageAction;
+
+    private EntityUid _owner;
+
+    public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
+    {
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+
+        _spriteSystem = _entManager.System<SpriteSystem>();
+        _popup = _entManager.System<SharedPopupSystem>();
+
+        _owner = owner;
+
+        // 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))
+            return;
+
+        foreach (var protoId in rcd.AvailablePrototypes)
+        {
+            if (!_protoManager.TryIndex(protoId, out var proto))
+                continue;
+
+            if (proto.Mode == RcdMode.Invalid)
+                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))
+            {
+                tooltip = Loc.GetString(entProto.Name);
+            }
+
+            tooltip = char.ToUpper(tooltip[0]) + tooltip.Remove(0, 1);
+
+            var button = new RCDMenuButton()
+            {
+                StyleClasses = { "RadialMenuButton" },
+                SetSize = new Vector2(64f, 64f),
+                ToolTip = tooltip,
+                ProtoId = protoId,
+            };
+
+            if (proto.Sprite != null)
+            {
+                var tex = new TextureRect()
+                {
+                    VerticalAlignment = VAlignment.Center,
+                    HorizontalAlignment = HAlignment.Center,
+                    Texture = _spriteSystem.Frame0(proto.Sprite),
+                    TextureScale = new Vector2(2f, 2f),
+                };
+
+                button.AddChild(tex);
+            }
+
+            parent.AddChild(button);
+
+            // Ensure that the button that transitions the menu to the associated category layer
+            // is visible in the main radial container (as these all start with Visible = false)
+            foreach (var child in main.Children)
+            {
+                var castChild = child as RadialMenuTextureButton;
+
+                if (castChild is not RadialMenuTextureButton)
+                    continue;
+
+                if (castChild.TargetLayer == proto.Category)
+                {
+                    castChild.Visible = true;
+                    break;
+                }
+            }
+        }
+
+        // Set up menu actions
+        foreach (var child in Children)
+            AddRCDMenuButtonOnClickActions(child);
+
+        OnChildAdded += AddRCDMenuButtonOnClickActions;
+
+        SendRCDSystemMessageAction += bui.SendRCDSystemMessage;
+    }
+
+    private void AddRCDMenuButtonOnClickActions(Control control)
+    {
+        var radialContainer = control as RadialContainer;
+
+        if (radialContainer == null)
+            return;
+
+        foreach (var child in radialContainer.Children)
+        {
+            var castChild = child as RCDMenuButton;
+
+            if (castChild == null)
+                continue;
+
+            castChild.OnButtonUp += _ =>
+            {
+                SendRCDSystemMessageAction?.Invoke(castChild.ProtoId);
+
+                if (_playerManager.LocalSession?.AttachedEntity != null &&
+                    _protoManager.TryIndex(castChild.ProtoId, out var proto))
+                {
+                    var msg = Loc.GetString("rcd-component-change-mode", ("mode", Loc.GetString(proto.SetName)));
+
+                    if (proto.Mode == RcdMode.ConstructTile || proto.Mode == RcdMode.ConstructObject)
+                    {
+                        var name = Loc.GetString(proto.SetName);
+
+                        if (proto.Prototype != null &&
+                            _protoManager.TryIndex(proto.Prototype, out var entProto))
+                            name = entProto.Name;
+
+                        msg = Loc.GetString("rcd-component-change-build-mode", ("name", name));
+                    }
+
+                    // Popup message
+                    _popup.PopupClient(msg, _owner, _playerManager.LocalSession.AttachedEntity);
+                }
+
+                Close();
+            };
+        }
+    }
+}
+
+public sealed class RCDMenuButton : RadialMenuTextureButton
+{
+    public ProtoId<RCDPrototype> ProtoId { get; set; }
+
+    public RCDMenuButton()
+    {
+
+    }
+}
diff --git a/Content.Client/RCD/RCDMenuBoundUserInterface.cs b/Content.Client/RCD/RCDMenuBoundUserInterface.cs
new file mode 100644
index 00000000000..a37dbcecf8c
--- /dev/null
+++ b/Content.Client/RCD/RCDMenuBoundUserInterface.cs
@@ -0,0 +1,49 @@
+using Content.Shared.RCD;
+using Content.Shared.RCD.Components;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.RCD;
+
+[UsedImplicitly]
+public sealed class RCDMenuBoundUserInterface : BoundUserInterface
+{
+    [Dependency] private readonly IClyde _displayManager = default!;
+    [Dependency] private readonly IInputManager _inputManager = default!;
+
+    private RCDMenu? _menu;
+
+    public RCDMenuBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        IoCManager.InjectDependencies(this);
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = new(Owner, this);
+        _menu.OnClose += Close;
+
+        // Open the menu, centered on the mouse
+        var vpSize = _displayManager.ScreenSize;
+        _menu.OpenCenteredAt(_inputManager.MouseScreenPosition.Position / vpSize);
+    }
+
+    public void SendRCDSystemMessage(ProtoId<RCDPrototype> protoId)
+    {
+        // 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/RadiationDebugOverlay.cs b/Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs
index 8c721fa7771..ef6283b6ff4 100644
--- a/Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs
+++ b/Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs
@@ -4,13 +4,12 @@
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
-using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 
 namespace Content.Client.Radiation.Overlays;
 
 public sealed class RadiationDebugOverlay : Overlay
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     private readonly RadiationSystem _radiation;
 
@@ -63,7 +62,7 @@ private void DrawScreenRays(OverlayDrawArgs args)
             {
                 var gridUid = _entityManager.GetEntity(netGrid);
 
-                if (!_mapManager.TryGetGrid(gridUid, out var grid))
+                if (!_entityManager.TryGetComponent<MapGridComponent>(gridUid, out var grid))
                     continue;
 
                 foreach (var (tile, rads) in blockers)
@@ -88,7 +87,7 @@ private void DrawScreenResistance(OverlayDrawArgs args)
         {
             var gridUid = _entityManager.GetEntity(netGrid);
 
-            if (!_mapManager.TryGetGrid(gridUid, out var grid))
+            if (!_entityManager.TryGetComponent<MapGridComponent>(gridUid, out var grid))
                 continue;
             if (query.TryGetComponent(gridUid, out var trs) && trs.MapID != args.MapId)
                 continue;
@@ -127,7 +126,7 @@ private void DrawWorld(in OverlayDrawArgs args)
             {
                 var gridUid = _entityManager.GetEntity(netGrid);
 
-                if (!_mapManager.TryGetGrid(gridUid, out var grid))
+                if (!_entityManager.TryGetComponent<MapGridComponent>(gridUid, out var grid))
                     continue;
                 var (destTile, _) = blockers.Last();
                 var destWorld = grid.GridTileToWorldPos(destTile);
diff --git a/Content.Client/Remotes/EntitySystems/DoorRemoteSystem.cs b/Content.Client/Remotes/EntitySystems/DoorRemoteSystem.cs
new file mode 100644
index 00000000000..d6a9057f08e
--- /dev/null
+++ b/Content.Client/Remotes/EntitySystems/DoorRemoteSystem.cs
@@ -0,0 +1,16 @@
+using Content.Client.Remote.UI;
+using Content.Client.Items;
+using Content.Shared.Remotes.EntitySystems;
+using Content.Shared.Remotes.Components;
+
+namespace Content.Client.Remotes.EntitySystems;
+
+public sealed class DoorRemoteSystem : SharedDoorRemoteSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        Subs.ItemStatus<DoorRemoteComponent>(ent => new DoorRemoteStatusControl(ent));
+    }
+}
diff --git a/Content.Client/Remotes/UI/DoorRemoteStatusControl.cs b/Content.Client/Remotes/UI/DoorRemoteStatusControl.cs
new file mode 100644
index 00000000000..94589ecdaab
--- /dev/null
+++ b/Content.Client/Remotes/UI/DoorRemoteStatusControl.cs
@@ -0,0 +1,46 @@
+using Content.Client.Message;
+using Content.Client.Stylesheets;
+using Content.Shared.Remotes.Components;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Remote.UI;
+
+public sealed class DoorRemoteStatusControl : Control
+{
+    private readonly Entity<DoorRemoteComponent> _entity;
+    private readonly RichTextLabel _label;
+
+    // set to toggle bolts initially just so that it updates on first pickup of remote
+    private OperatingMode PrevOperatingMode = OperatingMode.placeholderForUiUpdates;
+
+    public DoorRemoteStatusControl(Entity<DoorRemoteComponent> entity)
+    {
+        _entity = entity;
+        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+        AddChild(_label);
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        // only updates the UI if any of the details are different than they previously were
+        if (PrevOperatingMode == _entity.Comp.Mode)
+            return;
+
+        PrevOperatingMode = _entity.Comp.Mode;
+
+        // Update current volume and injector state
+        var modeStringLocalized = Loc.GetString(_entity.Comp.Mode switch
+        {
+            OperatingMode.OpenClose => "door-remote-open-close-text",
+            OperatingMode.ToggleBolts => "door-remote-toggle-bolt-text",
+            OperatingMode.ToggleEmergencyAccess => "door-remote-emergency-access-text",
+            _ => "door-remote-invalid-text"
+        });
+
+        _label.SetMarkup(Loc.GetString("door-remote-mode-label", ("modeString", modeStringLocalized)));
+    }
+}
diff --git a/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Blockers.cs b/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Blockers.cs
index 86d113defb1..2fa862f3df7 100644
--- a/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Blockers.cs
+++ b/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Blockers.cs
@@ -3,7 +3,7 @@
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item;
 using Content.Shared.Movement.Events;
-using Content.Shared.Physics.Pull;
+using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Throwing;
 
 namespace Content.Client.Replay.Spectator;
diff --git a/Content.Client/Revenant/RevenantSystem.cs b/Content.Client/Revenant/RevenantSystem.cs
index 6e7d0d2a1bd..49d29d8a5f4 100644
--- a/Content.Client/Revenant/RevenantSystem.cs
+++ b/Content.Client/Revenant/RevenantSystem.cs
@@ -1,3 +1,5 @@
+using Content.Client.Alerts;
+using Content.Shared.Alert;
 using Content.Shared.Revenant;
 using Content.Shared.Revenant.Components;
 using Robust.Client.GameObjects;
@@ -13,6 +15,7 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<RevenantComponent, AppearanceChangeEvent>(OnAppearanceChange);
+        SubscribeLocalEvent<RevenantComponent, UpdateAlertSpriteEvent>(OnUpdateAlert);
     }
 
     private void OnAppearanceChange(EntityUid uid, RevenantComponent component, ref AppearanceChangeEvent args)
@@ -36,4 +39,16 @@ private void OnAppearanceChange(EntityUid uid, RevenantComponent component, ref
                 args.Sprite.LayerSetState(0, component.State);
         }
     }
+
+    private void OnUpdateAlert(Entity<RevenantComponent> ent, ref UpdateAlertSpriteEvent args)
+    {
+        if (args.Alert.AlertType != AlertType.Essence)
+            return;
+
+        var sprite = args.SpriteViewEnt.Comp;
+        var essence = Math.Clamp(ent.Comp.Essence.Int(), 0, 999);
+        sprite.LayerSetState(RevenantVisualLayers.Digit1, $"{(essence / 100) % 10}");
+        sprite.LayerSetState(RevenantVisualLayers.Digit2, $"{(essence / 10) % 10}");
+        sprite.LayerSetState(RevenantVisualLayers.Digit3, $"{essence % 10}");
+    }
 }
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
index fed2a9f1716..284c6681905 100644
--- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -88,7 +88,6 @@ protected void DrawCircles(DrawingHandleScreen handle)
         var cornerDistance = MathF.Sqrt(WorldRange * WorldRange + WorldRange * WorldRange);
 
         var origin = ScalePosition(-new Vector2(Offset.X, -Offset.Y));
-        var distOffset = -24f;
 
         for (var radius = minDistance; radius <= maxDistance; radius *= EquatorialMultiplier)
         {
diff --git a/Content.Client/Shuttles/UI/MapScreen.xaml.cs b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
index 8430699bae1..10800b8c5f7 100644
--- a/Content.Client/Shuttles/UI/MapScreen.xaml.cs
+++ b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
 using Content.Shared.Shuttles.UI.MapObjects;
+using Content.Shared.Timing;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
@@ -38,16 +39,11 @@ public sealed partial class MapScreen : BoxContainer
     private EntityUid? _shuttleEntity;
 
     private FTLState _state;
-    private float _ftlDuration;
+    private StartEndTime _ftlTime;
 
     private List<ShuttleBeaconObject> _beacons = new();
     private List<ShuttleExclusionObject> _exclusions = new();
 
-    /// <summary>
-    /// When the next FTL state change happens.
-    /// </summary>
-    private TimeSpan _nextFtlTime;
-
     private TimeSpan _nextPing;
     private TimeSpan _pingCooldown = TimeSpan.FromSeconds(3);
     private TimeSpan _nextMapDequeue;
@@ -114,8 +110,7 @@ public void UpdateState(ShuttleMapInterfaceState state)
         _beacons = state.Destinations;
         _exclusions = state.Exclusions;
         _state = state.FTLState;
-        _ftlDuration = state.FTLDuration;
-        _nextFtlTime = _timing.CurTime + TimeSpan.FromSeconds(_ftlDuration);
+        _ftlTime = state.FTLTime;
         MapRadar.InFtl = true;
         MapFTLState.Text = Loc.GetString($"shuttle-console-ftl-state-{_state.ToString()}");
 
@@ -268,9 +263,10 @@ private void RebuildMapObjects()
 
         while (mapComps.MoveNext(out var mapComp, out var mapXform, out var mapMetadata))
         {
-            if (!_shuttles.CanFTLTo(_shuttleEntity.Value, mapComp.MapId))
-               continue;
-
+            if (_console != null && !_shuttles.CanFTLTo(_shuttleEntity.Value, mapComp.MapId, _console.Value))
+            {
+                continue;
+            }
             var mapName = mapMetadata.EntityName;
 
             if (string.IsNullOrEmpty(mapName))
@@ -315,7 +311,6 @@ private void RebuildMapObjects()
             };
 
             _mapHeadings.Add(mapComp.MapId, gridContents);
-
             foreach (var grid in _mapManager.GetAllMapGrids(mapComp.MapId))
             {
                 _entManager.TryGetComponent(grid.Owner, out IFFComponent? iffComp);
@@ -332,8 +327,8 @@ private void RebuildMapObjects()
                 {
                     AddMapObject(mapComp.MapId, gridObj);
                 }
-                else if (iffComp == null ||
-                         (iffComp.Flags & IFFFlags.Hide) == 0x0)
+                else if (!_shuttles.IsBeaconMap(_mapManager.GetMapEntityId(mapComp.MapId)) && (iffComp == null ||
+                         (iffComp.Flags & IFFFlags.Hide) == 0x0))
                 {
                     _pendingMapObjects.Add((mapComp.MapId, gridObj));
                 }
@@ -511,20 +506,8 @@ protected override void FrameUpdate(FrameEventArgs args)
             MapRebuildButton.Disabled = false;
         }
 
-        var ftlDiff = (float) (_nextFtlTime - _timing.CurTime).TotalSeconds;
-
-        float ftlRatio;
-
-        if (_ftlDuration.Equals(0f))
-        {
-            ftlRatio = 1f;
-        }
-        else
-        {
-            ftlRatio = Math.Clamp(1f - (ftlDiff / _ftlDuration), 0f, 1f);
-        }
-
-        FTLBar.Value = ftlRatio;
+        var progress = _ftlTime.ProgressAt(curTime);
+        FTLBar.Value = float.IsFinite(progress) ? progress : 1;
     }
 
     protected override void Draw(DrawingHandleScreen handle)
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index 1cfb4c2a558..f8381afdbe4 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -3,9 +3,9 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
-using System.Numerics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using System.Numerics;
 
 namespace Content.Client.StatusIcon;
 
@@ -18,7 +18,7 @@ public sealed class StatusIconOverlay : Overlay
     private readonly SpriteSystem _sprite;
     private readonly TransformSystem _transform;
     private readonly StatusIconSystem _statusIcon;
-    private readonly ShaderInstance _shader;
+    private readonly ShaderInstance _unshadedShader;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
 
@@ -29,7 +29,7 @@ internal StatusIconOverlay()
         _sprite = _entity.System<SpriteSystem>();
         _transform = _entity.System<TransformSystem>();
         _statusIcon = _entity.System<StatusIconSystem>();
-        _shader = _prototype.Index<ShaderPrototype>("unshaded").Instance();
+        _unshadedShader = _prototype.Index<ShaderPrototype>("unshaded").Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -42,8 +42,6 @@ protected override void Draw(in OverlayDrawArgs args)
         var scaleMatrix = Matrix3.CreateScale(new Vector2(1, 1));
         var rotationMatrix = Matrix3.CreateRotation(-eyeRot);
 
-        handle.UseShader(_shader);
-
         var query = _entity.AllEntityQueryEnumerator<StatusIconComponent, SpriteComponent, TransformComponent, MetaDataComponent>();
         while (query.MoveNext(out var uid, out var comp, out var sprite, out var xform, out var meta))
         {
@@ -111,11 +109,16 @@ protected override void Draw(in OverlayDrawArgs args)
 
                 }
 
+                if (proto.IsShaded)
+                    handle.UseShader(null);
+                else
+                    handle.UseShader(_unshadedShader);
+
                 var position = new Vector2(xOffset, yOffset);
                 handle.DrawTexture(texture, position);
             }
-        }
 
-        handle.UseShader(null);
+            handle.UseShader(null);
+        }
     }
 }
diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
index b549918d7c4..88ad0e3de8b 100644
--- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs
+++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
@@ -1,22 +1,27 @@
 using Content.Shared.Store;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using System.Linq;
-using System.Threading;
-using Serilog;
-using Timer = Robust.Shared.Timing.Timer;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Store.Ui;
 
 [UsedImplicitly]
 public sealed class StoreBoundUserInterface : BoundUserInterface
 {
+    private IPrototypeManager _prototypeManager = default!;
+
     [ViewVariables]
     private StoreMenu? _menu;
 
     [ViewVariables]
     private string _windowName = Loc.GetString("store-ui-default-title");
 
+    [ViewVariables]
+    private string _search = string.Empty;
+
+    [ViewVariables]
+    private HashSet<ListingData> _listings = new();
+
     public StoreBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
     }
@@ -36,7 +41,7 @@ protected override void Open()
         _menu.OnCategoryButtonPressed += (_, category) =>
         {
             _menu.CurrentCategory = category;
-            SendMessage(new StoreRequestUpdateInterfaceMessage());
+            _menu?.UpdateListing();
         };
 
         _menu.OnWithdrawAttempt += (_, type, amount) =>
@@ -44,9 +49,10 @@ protected override void Open()
             SendMessage(new StoreRequestWithdrawMessage(type, amount));
         };
 
-        _menu.OnRefreshButtonPressed += (_) =>
+        _menu.SearchTextUpdated += (_, search) =>
         {
-            SendMessage(new StoreRequestUpdateInterfaceMessage());
+            _search = search.Trim().ToLowerInvariant();
+            UpdateListingsWithSearchFilter();
         };
 
         _menu.OnRefundAttempt += (_) =>
@@ -64,10 +70,10 @@ protected override void UpdateState(BoundUserInterfaceState state)
         switch (state)
         {
             case StoreUpdateState msg:
-                _menu.UpdateBalance(msg.Balance);
-                _menu.PopulateStoreCategoryButtons(msg.Listings);
+                _listings = msg.Listings;
 
-                _menu.UpdateListing(msg.Listings.ToList());
+                _menu.UpdateBalance(msg.Balance);
+                UpdateListingsWithSearchFilter();
                 _menu.SetFooterVisibility(msg.ShowFooter);
                 _menu.UpdateRefund(msg.AllowRefund);
                 break;
@@ -89,4 +95,19 @@ protected override void Dispose(bool disposing)
         _menu?.Close();
         _menu?.Dispose();
     }
+
+    private void UpdateListingsWithSearchFilter()
+    {
+        if (_menu == null)
+            return;
+
+        var filteredListings = new HashSet<ListingData>(_listings);
+        if (!string.IsNullOrEmpty(_search))
+        {
+            filteredListings.RemoveWhere(listingData => !ListingLocalisationHelpers.GetLocalisedNameOrEntityName(listingData, _prototypeManager).Trim().ToLowerInvariant().Contains(_search) &&
+                                                        !ListingLocalisationHelpers.GetLocalisedDescriptionOrEntityDescription(listingData, _prototypeManager).Trim().ToLowerInvariant().Contains(_search));
+        }
+        _menu.PopulateStoreCategoryButtons(filteredListings);
+        _menu.UpdateListing(filteredListings.ToList());
+    }
 }
diff --git a/Content.Client/Store/Ui/StoreListingControl.xaml b/Content.Client/Store/Ui/StoreListingControl.xaml
index aefeec17cc8..12b4d7b5b30 100644
--- a/Content.Client/Store/Ui/StoreListingControl.xaml
+++ b/Content.Client/Store/Ui/StoreListingControl.xaml
@@ -15,6 +15,7 @@
                 Margin="0,0,4,0"
                 MinSize="48 48"
                 Stretch="KeepAspectCentered" />
+            <Control MinWidth="5"/>
             <RichTextLabel Name="StoreItemDescription" />
         </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/Store/Ui/StoreListingControl.xaml.cs b/Content.Client/Store/Ui/StoreListingControl.xaml.cs
index bb600588e04..030f07dc7ca 100644
--- a/Content.Client/Store/Ui/StoreListingControl.xaml.cs
+++ b/Content.Client/Store/Ui/StoreListingControl.xaml.cs
@@ -1,25 +1,91 @@
+using Content.Client.GameTicking.Managers;
+using Content.Shared.Store;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Graphics;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Store.Ui;
 
 [GenerateTypedNameReferences]
 public sealed partial class StoreListingControl : Control
 {
-    public StoreListingControl(string itemName, string itemDescription,
-        string price, bool canBuy, Texture? texture = null)
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IEntityManager _entity = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    private readonly ClientGameTicker _ticker;
+
+    private readonly ListingData _data;
+
+    private readonly bool _hasBalance;
+    private readonly string _price;
+    public StoreListingControl(ListingData data, string price, bool hasBalance, Texture? texture = null)
     {
+        IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
 
-        StoreItemName.Text = itemName;
-        StoreItemDescription.SetMessage(itemDescription);
+        _ticker = _entity.System<ClientGameTicker>();
+
+        _data = data;
+        _hasBalance = hasBalance;
+        _price = price;
 
-        StoreItemBuyButton.Text = price;
-        StoreItemBuyButton.Disabled = !canBuy;
+        StoreItemName.Text = ListingLocalisationHelpers.GetLocalisedNameOrEntityName(_data, _prototype);
+        StoreItemDescription.SetMessage(ListingLocalisationHelpers.GetLocalisedDescriptionOrEntityDescription(_data, _prototype));
+
+        UpdateBuyButtonText();
+        StoreItemBuyButton.Disabled = !CanBuy();
 
         StoreItemTexture.Texture = texture;
     }
+
+    private bool CanBuy()
+    {
+        if (!_hasBalance)
+            return false;
+
+        var stationTime = _timing.CurTime.Subtract(_ticker.RoundStartTimeSpan);
+        if (_data.RestockTime > stationTime)
+            return false;
+
+        return true;
+    }
+
+    private void UpdateBuyButtonText()
+    {
+        var stationTime = _timing.CurTime.Subtract(_ticker.RoundStartTimeSpan);
+        if (_data.RestockTime > stationTime)
+        {
+            var timeLeftToBuy = stationTime - _data.RestockTime;
+            StoreItemBuyButton.Text =  timeLeftToBuy.Duration().ToString(@"mm\:ss");
+        }
+        else
+        {
+            StoreItemBuyButton.Text = _price;
+        }
+    }
+
+    private void UpdateName()
+    {
+        var name = ListingLocalisationHelpers.GetLocalisedNameOrEntityName(_data, _prototype);
+
+        var stationTime = _timing.CurTime.Subtract(_ticker.RoundStartTimeSpan);
+        if (_data.RestockTime > stationTime)
+        {
+            name += Loc.GetString("store-ui-button-out-of-stock");
+        }
+
+        StoreItemName.Text = name;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        UpdateBuyButtonText();
+        UpdateName();
+        StoreItemBuyButton.Disabled = !CanBuy();
+    }
 }
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml b/Content.Client/Store/Ui/StoreMenu.xaml
index 4b38352a44a..843c9dc0296 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml
+++ b/Content.Client/Store/Ui/StoreMenu.xaml
@@ -12,11 +12,6 @@
                     HorizontalAlignment="Left"
                     Access="Public"
                     HorizontalExpand="True" />
-                <Button
-                    Name="RefreshButton"
-                    MinWidth="64"
-                    HorizontalAlignment="Right"
-                    Text="Refresh" />
                 <Button
                     Name="WithdrawButton"
                     MinWidth="64"
@@ -28,7 +23,8 @@
                     HorizontalAlignment="Right"
                     Text="Refund" />
             </BoxContainer>
-            <PanelContainer VerticalExpand="True">
+            <LineEdit Name="SearchBar" Margin="4" PlaceHolder="Search" HorizontalExpand="True"/>
+                <PanelContainer VerticalExpand="True">
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#000000FF" />
                 </PanelContainer.PanelOverride>
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml.cs b/Content.Client/Store/Ui/StoreMenu.xaml.cs
index 5dc1ab246bd..b7a2c285fe5 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml.cs
+++ b/Content.Client/Store/Ui/StoreMenu.xaml.cs
@@ -1,7 +1,5 @@
 using System.Linq;
-using System.Threading;
 using Content.Client.Actions;
-using Content.Client.GameTicking.Managers;
 using Content.Client.Message;
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
@@ -12,7 +10,6 @@
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 
 namespace Content.Client.Store.Ui;
 
@@ -21,45 +18,42 @@ public sealed partial class StoreMenu : DefaultWindow
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
-    private readonly ClientGameTicker _gameTicker;
 
     private StoreWithdrawWindow? _withdrawWindow;
 
+    public event EventHandler<string>? SearchTextUpdated;
     public event Action<BaseButton.ButtonEventArgs, ListingData>? OnListingButtonPressed;
     public event Action<BaseButton.ButtonEventArgs, string>? OnCategoryButtonPressed;
     public event Action<BaseButton.ButtonEventArgs, string, int>? OnWithdrawAttempt;
-    public event Action<BaseButton.ButtonEventArgs>? OnRefreshButtonPressed;
     public event Action<BaseButton.ButtonEventArgs>? OnRefundAttempt;
 
-    public Dictionary<string, FixedPoint2> Balance = new();
+    public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> Balance = new();
     public string CurrentCategory = string.Empty;
 
+    private List<ListingData> _cachedListings = new();
+
     public StoreMenu(string name)
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        _gameTicker = _entitySystem.GetEntitySystem<ClientGameTicker>();
-
         WithdrawButton.OnButtonDown += OnWithdrawButtonDown;
-        RefreshButton.OnButtonDown += OnRefreshButtonDown;
         RefundButton.OnButtonDown += OnRefundButtonDown;
+        SearchBar.OnTextChanged += _ => SearchTextUpdated?.Invoke(this, SearchBar.Text);
 
         if (Window != null)
             Window.Title = name;
     }
 
-    public void UpdateBalance(Dictionary<string, FixedPoint2> balance)
+    public void UpdateBalance(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> balance)
     {
         Balance = balance;
 
         var currency = balance.ToDictionary(type =>
-            (type.Key, type.Value), type => _prototypeManager.Index<CurrencyPrototype>(type.Key));
+            (type.Key, type.Value), type => _prototypeManager.Index(type.Key));
 
         var balanceStr = string.Empty;
-        foreach (var ((type, amount),proto) in currency)
+        foreach (var ((_, amount), proto) in currency)
         {
             balanceStr += Loc.GetString("store-ui-balance-display", ("amount", amount),
                 ("currency", Loc.GetString(proto.DisplayName, ("amount", 1))));
@@ -79,8 +73,13 @@ public void UpdateBalance(Dictionary<string, FixedPoint2> balance)
 
     public void UpdateListing(List<ListingData> listings)
     {
-        var sorted = listings.OrderBy(l => l.Priority).ThenBy(l => l.Cost.Values.Sum());
+        _cachedListings = listings;
+        UpdateListing();
+    }
 
+    public void UpdateListing()
+    {
+        var sorted = _cachedListings.OrderBy(l => l.Priority).ThenBy(l => l.Cost.Values.Sum());
 
         // should probably chunk these out instead. to-do if this clogs the internet tubes.
         // maybe read clients prototypes instead?
@@ -96,12 +95,6 @@ public void SetFooterVisibility(bool visible)
         TraitorFooter.Visible = visible;
     }
 
-
-    private void OnRefreshButtonDown(BaseButton.ButtonEventArgs args)
-    {
-        OnRefreshButtonPressed?.Invoke(args);
-    }
-
     private void OnWithdrawButtonDown(BaseButton.ButtonEventArgs args)
     {
         // check if window is already open
@@ -129,10 +122,8 @@ private void AddListingGui(ListingData listing)
         if (!listing.Categories.Contains(CurrentCategory))
             return;
 
-        var listingName = Loc.GetString(listing.Name);
-        var listingDesc = Loc.GetString(listing.Description);
         var listingPrice = listing.Cost;
-        var canBuy = CanBuyListing(Balance, listingPrice);
+        var hasBalance = HasListingPrice(Balance, listingPrice);
 
         var spriteSys = _entityManager.EntitySysManager.GetEntitySystem<SpriteSystem>();
 
@@ -144,12 +135,6 @@ private void AddListingGui(ListingData listing)
         {
             if (texture == null)
                 texture = spriteSys.GetPrototypeIcon(listing.ProductEntity).Default;
-
-            var proto = _prototypeManager.Index<EntityPrototype>(listing.ProductEntity);
-            if (listingName == string.Empty)
-                listingName = proto.Name;
-            if (listingDesc == string.Empty)
-                listingDesc = proto.Description;
         }
         else if (listing.ProductAction != null)
         {
@@ -160,39 +145,15 @@ private void AddListingGui(ListingData listing)
                 texture = spriteSys.Frame0(action.Icon);
             }
         }
-        var listingInStock = ListingInStock(listing);
-        if (listingInStock != GetListingPriceString(listing))
-        {
-            listingName += " (Out of stock)";
-            canBuy = false;
-        }
 
-        var newListing = new StoreListingControl(listingName, listingDesc, listingInStock, canBuy, texture);
+        var newListing = new StoreListingControl(listing, GetListingPriceString(listing), hasBalance, texture);
         newListing.StoreItemBuyButton.OnButtonDown += args
             => OnListingButtonPressed?.Invoke(args, listing);
 
         StoreListingsContainer.AddChild(newListing);
     }
 
-    /// <summary>
-    /// Return time until available or the cost.
-    /// </summary>
-    /// <param name="listing"></param>
-    /// <returns></returns>
-    public string ListingInStock(ListingData listing)
-    {
-        var stationTime = _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan);
-
-        TimeSpan restockTimeSpan = TimeSpan.FromMinutes(listing.RestockTime);
-        if (restockTimeSpan > stationTime)
-        {
-            var timeLeftToBuy = stationTime - restockTimeSpan;
-            return timeLeftToBuy.Duration().ToString(@"mm\:ss");
-        }
-
-        return GetListingPriceString(listing);
-    }
-    public bool CanBuyListing(Dictionary<string, FixedPoint2> currency, Dictionary<string, FixedPoint2> price)
+    public bool HasListingPrice(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> currency, Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> price)
     {
         foreach (var type in price)
         {
@@ -214,7 +175,7 @@ public string GetListingPriceString(ListingData listing)
         {
             foreach (var (type, amount) in listing.Cost)
             {
-                var currency = _prototypeManager.Index<CurrencyPrototype>(type);
+                var currency = _prototypeManager.Index(type);
                 text += Loc.GetString("store-ui-price-display", ("amount", amount),
                     ("currency", Loc.GetString(currency.DisplayName, ("amount", amount))));
             }
@@ -235,7 +196,7 @@ public void PopulateStoreCategoryButtons(HashSet<ListingData> listings)
         {
             foreach (var cat in listing.Categories)
             {
-                var proto = _prototypeManager.Index<StoreCategoryPrototype>(cat);
+                var proto = _prototypeManager.Index(cat);
                 if (!allCategories.Contains(proto))
                     allCategories.Add(proto);
             }
@@ -243,20 +204,28 @@ public void PopulateStoreCategoryButtons(HashSet<ListingData> listings)
 
         allCategories = allCategories.OrderBy(c => c.Priority).ToList();
 
+        // This will reset the Current Category selection if nothing matches the search.
+        if (allCategories.All(category => category.ID != CurrentCategory))
+            CurrentCategory = string.Empty;
+
         if (CurrentCategory == string.Empty && allCategories.Count > 0)
             CurrentCategory = allCategories.First().ID;
 
-        if (allCategories.Count <= 1)
-            return;
-
         CategoryListContainer.Children.Clear();
+        if (allCategories.Count < 1)
+            return;
 
+        var group = new ButtonGroup();
         foreach (var proto in allCategories)
         {
             var catButton = new StoreCategoryButton
             {
                 Text = Loc.GetString(proto.Name),
-                Id = proto.ID
+                Id = proto.ID,
+                Pressed = proto.ID == CurrentCategory,
+                Group = group,
+                ToggleMode = true,
+                StyleClasses = { "OpenBoth" }
             };
 
             catButton.OnPressed += args => OnCategoryButtonPressed?.Invoke(args, catButton.Id);
@@ -272,7 +241,7 @@ public override void Close()
 
     public void UpdateRefund(bool allowRefund)
     {
-        RefundButton.Disabled = !allowRefund;
+        RefundButton.Visible = allowRefund;
     }
 
     private sealed class StoreCategoryButton : Button
diff --git a/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs b/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs
index db0e7e68070..79368557562 100644
--- a/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs
+++ b/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs
@@ -28,12 +28,12 @@ public StoreWithdrawWindow()
         IoCManager.InjectDependencies(this);
     }
 
-    public void CreateCurrencyButtons(Dictionary<string, FixedPoint2> balance)
+    public void CreateCurrencyButtons(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> balance)
     {
         _validCurrencies.Clear();
         foreach (var currency in balance)
         {
-            if (!_prototypeManager.TryIndex<CurrencyPrototype>(currency.Key, out var proto))
+            if (!_prototypeManager.TryIndex(currency.Key, out var proto))
                 continue;
 
             _validCurrencies.Add(currency.Value, proto);
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 13ba259dbcd..a10e3eb5926 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -45,6 +45,7 @@ public sealed class StyleNano : StyleBase
         public const string StyleClassBorderedWindowPanel = "BorderedWindowPanel";
         public const string StyleClassInventorySlotBackground = "InventorySlotBackground";
         public const string StyleClassHandSlotHighlight = "HandSlotHighlight";
+        public const string StyleClassChatPanel = "ChatPanel";
         public const string StyleClassChatSubPanel = "ChatSubPanel";
         public const string StyleClassTransparentBorderedWindowPanel = "TransparentBorderedWindowPanel";
         public const string StyleClassHotbarPanel = "HotbarPanel";
@@ -144,6 +145,8 @@ public sealed class StyleNano : StyleBase
         public const string StyleClassButtonColorRed = "ButtonColorRed";
         public const string StyleClassButtonColorGreen = "ButtonColorGreen";
 
+        public static readonly Color ChatBackgroundColor = Color.FromHex("#25252ADD");
+
         public override Stylesheet Stylesheet { get; }
 
         public StyleNano(IResourceCache resCache) : base(resCache)
@@ -290,7 +293,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
             var buttonTex = resCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
             var topButtonBase = new StyleBoxTexture
             {
-             Texture = buttonTex,
+                Texture = buttonTex,
             };
             topButtonBase.SetPatchMargin(StyleBox.Margin.All, 10);
             topButtonBase.SetPadding(StyleBox.Margin.All, 0);
@@ -298,19 +301,19 @@ public StyleNano(IResourceCache resCache) : base(resCache)
 
             var topButtonOpenRight = new StyleBoxTexture(topButtonBase)
             {
-             Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(0, 0), new Vector2(14, 24))),
+                Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(0, 0), new Vector2(14, 24))),
             };
             topButtonOpenRight.SetPatchMargin(StyleBox.Margin.Right, 0);
 
             var topButtonOpenLeft = new StyleBoxTexture(topButtonBase)
             {
-             Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(14, 24))),
+                Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(14, 24))),
             };
             topButtonOpenLeft.SetPatchMargin(StyleBox.Margin.Left, 0);
 
             var topButtonSquare = new StyleBoxTexture(topButtonBase)
             {
-             Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(3, 24))),
+                Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(3, 24))),
             };
             topButtonSquare.SetPatchMargin(StyleBox.Margin.Horizontal, 0);
 
@@ -346,12 +349,16 @@ public StyleNano(IResourceCache resCache) : base(resCache)
             lineEdit.SetPatchMargin(StyleBox.Margin.All, 3);
             lineEdit.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
 
-            var chatSubBGTex = resCache.GetTexture("/Textures/Interface/Nano/chat_sub_background.png");
-            var chatSubBG = new StyleBoxTexture
+            var chatBg = new StyleBoxFlat
+            {
+                BackgroundColor = ChatBackgroundColor
+            };
+
+            var chatSubBg = new StyleBoxFlat
             {
-                Texture = chatSubBGTex,
+                BackgroundColor = ChatBackgroundColor,
             };
-            chatSubBG.SetPatchMargin(StyleBox.Margin.All, 2);
+            chatSubBg.SetContentMarginOverride(StyleBox.Margin.All, 2);
 
             var actionSearchBoxTex = resCache.GetTexture("/Textures/Interface/Nano/black_panel_dark_thin_border.png");
             var actionSearchBox = new StyleBoxTexture
@@ -368,9 +375,9 @@ public StyleNano(IResourceCache resCache) : base(resCache)
             };
             tabContainerPanel.SetPatchMargin(StyleBox.Margin.All, 2);
 
-            var tabContainerBoxActive = new StyleBoxFlat {BackgroundColor = new Color(64, 64, 64)};
+            var tabContainerBoxActive = new StyleBoxFlat { BackgroundColor = new Color(64, 64, 64) };
             tabContainerBoxActive.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
-            var tabContainerBoxInactive = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 32)};
+            var tabContainerBoxInactive = new StyleBoxFlat { BackgroundColor = new Color(32, 32, 32) };
             tabContainerBoxInactive.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
 
             var progressBarBackground = new StyleBoxFlat
@@ -409,21 +416,21 @@ public StyleNano(IResourceCache resCache) : base(resCache)
 
             // Placeholder
             var placeholderTexture = resCache.GetTexture("/Textures/Interface/Nano/placeholder.png");
-            var placeholder = new StyleBoxTexture {Texture = placeholderTexture};
+            var placeholder = new StyleBoxTexture { Texture = placeholderTexture };
             placeholder.SetPatchMargin(StyleBox.Margin.All, 19);
             placeholder.SetExpandMargin(StyleBox.Margin.All, -5);
             placeholder.Mode = StyleBoxTexture.StretchMode.Tile;
 
-            var itemListBackgroundSelected = new StyleBoxFlat {BackgroundColor = new Color(75, 75, 75)};
+            var itemListBackgroundSelected = new StyleBoxFlat { BackgroundColor = new Color(75, 75, 75) };
             itemListBackgroundSelected.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
             itemListBackgroundSelected.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
-            var itemListItemBackgroundDisabled = new StyleBoxFlat {BackgroundColor = new Color(10, 10, 10)};
+            var itemListItemBackgroundDisabled = new StyleBoxFlat { BackgroundColor = new Color(10, 10, 10) };
             itemListItemBackgroundDisabled.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
             itemListItemBackgroundDisabled.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
-            var itemListItemBackground = new StyleBoxFlat {BackgroundColor = new Color(55, 55, 55)};
+            var itemListItemBackground = new StyleBoxFlat { BackgroundColor = new Color(55, 55, 55) };
             itemListItemBackground.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
             itemListItemBackground.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
-            var itemListItemBackgroundTransparent = new StyleBoxFlat {BackgroundColor = Color.Transparent};
+            var itemListItemBackgroundTransparent = new StyleBoxFlat { BackgroundColor = Color.Transparent };
             itemListItemBackgroundTransparent.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
             itemListItemBackgroundTransparent.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
 
@@ -489,9 +496,9 @@ public StyleNano(IResourceCache resCache) : base(resCache)
             sliderForeBox.SetPatchMargin(StyleBox.Margin.All, 12);
             sliderGrabBox.SetPatchMargin(StyleBox.Margin.All, 12);
 
-            var sliderFillGreen = new StyleBoxTexture(sliderFillBox) {Modulate = Color.LimeGreen};
-            var sliderFillRed = new StyleBoxTexture(sliderFillBox) {Modulate = Color.Red};
-            var sliderFillBlue = new StyleBoxTexture(sliderFillBox) {Modulate = Color.Blue};
+            var sliderFillGreen = new StyleBoxTexture(sliderFillBox) { Modulate = Color.LimeGreen };
+            var sliderFillRed = new StyleBoxTexture(sliderFillBox) { Modulate = Color.Red };
+            var sliderFillBlue = new StyleBoxTexture(sliderFillBox) { Modulate = Color.Blue };
             var sliderFillWhite = new StyleBoxTexture(sliderFillBox) { Modulate = Color.White };
 
             var boxFont13 = resCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
@@ -850,19 +857,19 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                 Element<TextEdit>().Pseudo(TextEdit.StylePseudoClassPlaceholder)
                     .Prop("font-color", Color.Gray),
 
-                // Chat lineedit - we don't actually draw a stylebox around the lineedit itself, we put it around the
-                // input + other buttons, so we must clear the default stylebox
-                new StyleRule(new SelectorElement(typeof(LineEdit), new[] {StyleClassChatLineEdit}, null, null),
+                // chat subpanels (chat lineedit backing, popup backings)
+                new StyleRule(new SelectorElement(typeof(PanelContainer), new[] {StyleClassChatPanel}, null, null),
                     new[]
                     {
-                        new StyleProperty(LineEdit.StylePropertyStyleBox, new StyleBoxEmpty()),
+                        new StyleProperty(PanelContainer.StylePropertyPanel, chatBg),
                     }),
 
-                // chat subpanels (chat lineedit backing, popup backings)
-                new StyleRule(new SelectorElement(typeof(PanelContainer), new[] {StyleClassChatSubPanel}, null, null),
+                // Chat lineedit - we don't actually draw a stylebox around the lineedit itself, we put it around the
+                // input + other buttons, so we must clear the default stylebox
+                new StyleRule(new SelectorElement(typeof(LineEdit), new[] {StyleClassChatLineEdit}, null, null),
                     new[]
                     {
-                        new StyleProperty(PanelContainer.StylePropertyPanel, chatSubBG),
+                        new StyleProperty(LineEdit.StylePropertyStyleBox, new StyleBoxEmpty()),
                     }),
 
                 // Action searchbox lineedit
@@ -1468,6 +1475,25 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                 Element<Label>().Class("Disabled")
                     .Prop("font-color", DisabledFore),
 
+                // Radial menu buttons
+                Element<TextureButton>().Class("RadialMenuButton")
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/button_normal.png")),
+                Element<TextureButton>().Class("RadialMenuButton")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/button_hover.png")),
+
+                Element<TextureButton>().Class("RadialMenuCloseButton")
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/close_normal.png")),
+                Element<TextureButton>().Class("RadialMenuCloseButton")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/close_hover.png")),
+
+                Element<TextureButton>().Class("RadialMenuBackButton")
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/back_normal.png")),
+                Element<TextureButton>().Class("RadialMenuBackButton")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Radial/back_hover.png")),
+
                 //PDA - Backgrounds
                 Element<PanelContainer>().Class("PdaContentBackground")
                     .Prop(PanelContainer.StylePropertyPanel, BaseButtonOpenBoth)
diff --git a/Content.Client/TextScreen/TextScreenSystem.cs b/Content.Client/TextScreen/TextScreenSystem.cs
index a736933d0fa..53a620bd46d 100644
--- a/Content.Client/TextScreen/TextScreenSystem.cs
+++ b/Content.Client/TextScreen/TextScreenSystem.cs
@@ -62,6 +62,8 @@ public override void Initialize()
 
         SubscribeLocalEvent<TextScreenVisualsComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<TextScreenTimerComponent, ComponentInit>(OnTimerInit);
+
+        UpdatesOutsidePrediction = true;
     }
 
     private void OnInit(EntityUid uid, TextScreenVisualsComponent component, ComponentInit args)
@@ -110,17 +112,11 @@ protected override void OnAppearanceChange(EntityUid uid, TextScreenVisualsCompo
         if (args.AppearanceData.TryGetValue(TextScreenVisuals.Color, out var color) && color is Color)
             component.Color = (Color) color;
 
-        // DefaultText: broadcast updates from comms consoles
-        // ScreenText: the text accompanying shuttle timers e.g. "ETA"
+        // DefaultText: fallback text e.g. broadcast updates from comms consoles
         if (args.AppearanceData.TryGetValue(TextScreenVisuals.DefaultText, out var newDefault) && newDefault is string)
-        {
-            string?[] defaultText = SegmentText((string) newDefault, component);
-            component.Text = defaultText;
-            component.TextToDraw = defaultText;
-            ResetText(uid, component);
-            BuildTextLayers(uid, component, args.Sprite);
-            DrawLayers(uid, component.LayerStatesToDraw);
-        }
+            component.Text = SegmentText((string) newDefault, component);
+
+        // ScreenText: currently rendered text e.g. the "ETA" accompanying shuttle timers
         if (args.AppearanceData.TryGetValue(TextScreenVisuals.ScreenText, out var text) && text is string)
         {
             component.TextToDraw = SegmentText((string) text, component);
diff --git a/Content.Client/Throwing/ThrownItemVisualizerSystem.cs b/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
index bbd36731104..b25b4fbb7de 100644
--- a/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
+++ b/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
@@ -24,7 +24,7 @@ public override void Initialize()
 
     private void OnAutoHandleState(EntityUid uid, ThrownItemComponent component, ref AfterAutoHandleStateEvent args)
     {
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
+        if (!TryComp<SpriteComponent>(uid, out var sprite) || !component.Animate)
             return;
 
         var animationPlayer = EnsureComp<AnimationPlayerComponent>(uid);
diff --git a/Content.Client/Toilet/ToiletVisualsSystem.cs b/Content.Client/Toilet/ToiletVisualsSystem.cs
deleted file mode 100644
index 5367772ab08..00000000000
--- a/Content.Client/Toilet/ToiletVisualsSystem.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Shared.Toilet;
-using Robust.Client.GameObjects;
-
-namespace Content.Client.Toilet;
-
-public sealed class ToiletVisualsSystem : VisualizerSystem<ToiletComponent>
-{
-    protected override void OnAppearanceChange(EntityUid uid, ToiletComponent component, ref AppearanceChangeEvent args)
-    {
-        if (args.Sprite == null) return;
-
-        AppearanceSystem.TryGetData<bool>(uid, ToiletVisuals.LidOpen, out var lidOpen, args.Component);
-        AppearanceSystem.TryGetData<bool>(uid, ToiletVisuals.SeatUp, out var seatUp, args.Component);
-
-        var state = (lidOpen, seatUp) switch
-        {
-            (false, false) => "closed_toilet_seat_down",
-            (false, true) => "closed_toilet_seat_up",
-            (true, false) => "open_toilet_seat_down",
-            (true, true) => "open_toilet_seat_up"
-        };
-
-        args.Sprite.LayerSetState(0, state);
-    }
-}
diff --git a/Content.Client/UserInterface/Controls/RadialContainer.cs b/Content.Client/UserInterface/Controls/RadialContainer.cs
new file mode 100644
index 00000000000..be263d12772
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/RadialContainer.cs
@@ -0,0 +1,105 @@
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using System.Linq;
+using System.Numerics;
+
+namespace Content.Client.UserInterface.Controls;
+
+[Virtual]
+public class RadialContainer : LayoutContainer
+{
+    /// <summary>
+    /// Specifies the anglular range, in radians, in which child elements will be placed.
+    /// The first value denotes the angle at which the first element is to be placed, and
+    /// the second value denotes the angle at which the last element is to be placed.
+    /// Both values must be between 0 and 2 PI radians
+    /// </summary>
+    /// <remarks>
+    /// The top of the screen is at 0 radians, and the bottom of the screen is at PI radians
+    /// </remarks>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public Vector2 AngularRange
+    {
+        get
+        {
+            return _angularRange;
+        }
+
+        set
+        {
+            var x = value.X;
+            var y = value.Y;
+
+            x = x > MathF.Tau ? x % MathF.Tau : x;
+            y = y > MathF.Tau ? y % MathF.Tau : y;
+
+            x = x < 0 ? MathF.Tau + x : x;
+            y = y < 0 ? MathF.Tau + y : y;
+
+            _angularRange = new Vector2(x, y);
+        }
+    }
+
+    private Vector2 _angularRange = new Vector2(0f, MathF.Tau - float.Epsilon);
+
+    /// <summary>
+    /// Determines the direction in which child elements will be arranged
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public RAlignment RadialAlignment { get; set; } = RAlignment.Clockwise;
+
+    /// <summary>
+    /// Determines how far from the radial container's center that its child elements will be placed
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float Radius { get; set; } = 100f;
+
+    /// <summary>
+    /// Sets whether the container should reserve a space on the layout for child which are not currently visible
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public bool ReserveSpaceForHiddenChildren { get; set; } = true;
+
+    /// <summary>
+    /// This container arranges its children, evenly separated, in a radial pattern
+    /// </summary>
+    public RadialContainer()
+    {
+
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        var children = ReserveSpaceForHiddenChildren ? Children : Children.Where(x => x.Visible);
+        var childCount = children.Count();
+
+        // Determine the size of the arc, accounting for clockwise and anti-clockwise arrangements
+        var arc = AngularRange.Y - AngularRange.X;
+        arc = (arc < 0) ? MathF.Tau + arc : arc;
+        arc = (RadialAlignment == RAlignment.AntiClockwise) ? MathF.Tau - arc : arc;
+
+        // Account for both circular arrangements and arc-based arrangements
+        var childMod = MathHelper.CloseTo(arc, MathF.Tau, 0.01f) ? 0 : 1;
+
+        // Determine the separation between child elements
+        var sepAngle = arc / (childCount - childMod);
+        sepAngle *= (RadialAlignment == RAlignment.AntiClockwise) ? -1f : 1f;
+
+        // Adjust the positions of all the child elements
+        foreach (var (i, child) in children.Select((x, i) => (i, x)))
+        {
+            var position = new Vector2(Radius * MathF.Sin(AngularRange.X + sepAngle * i) + Width / 2f - child.Width / 2f, -Radius * MathF.Cos(AngularRange.X + sepAngle * i) + Height / 2f - child.Height / 2f);
+            SetPosition(child, position);
+        }
+    }
+
+    /// <summary>
+    /// Specifies the different radial alignment modes
+    /// </summary>
+    /// <seealso cref="RadialAlignment"/>
+    public enum RAlignment : byte
+    {
+        Clockwise,
+        AntiClockwise,
+    }
+}
diff --git a/Content.Client/UserInterface/Controls/RadialMenu.cs b/Content.Client/UserInterface/Controls/RadialMenu.cs
new file mode 100644
index 00000000000..5f56ad7f866
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/RadialMenu.cs
@@ -0,0 +1,255 @@
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using System.Linq;
+using System.Numerics;
+
+namespace Content.Client.UserInterface.Controls;
+
+[Virtual]
+public class RadialMenu : BaseWindow
+{
+    /// <summary>
+    /// Contextual button used to traverse through previous layers of the radial menu
+    /// </summary>
+    public TextureButton? ContextualButton { get; set; }
+
+    /// <summary>
+    /// Set a style class to be applied to the contextual button when it is set to move the user back through previous layers of the radial menu
+    /// </summary>  
+    public string? BackButtonStyleClass
+    {
+        get
+        {
+            return _backButtonStyleClass;
+        }
+
+        set
+        {
+            _backButtonStyleClass = value;
+
+            if (_path.Count > 0 && ContextualButton != null && _backButtonStyleClass != null)
+                ContextualButton.SetOnlyStyleClass(_backButtonStyleClass);
+        }
+    }
+
+    /// <summary>
+    /// Set a style class to be applied to the contextual button when it will close the radial menu
+    /// </summary>
+    public string? CloseButtonStyleClass
+    {
+        get
+        {
+            return _closeButtonStyleClass;
+        }
+
+        set
+        {
+            _closeButtonStyleClass = value;
+
+            if (_path.Count == 0 && ContextualButton != null && _closeButtonStyleClass != null)
+                ContextualButton.SetOnlyStyleClass(_closeButtonStyleClass);
+        }
+    }
+
+    private List<Control> _path = new();
+    private string? _backButtonStyleClass;
+    private string? _closeButtonStyleClass;
+
+    /// <summary>
+    /// A free floating menu which enables the quick display of one or more radial containers
+    /// </summary>
+    /// <remarks>
+    /// Only one radial container is visible at a time (each container forming a separate 'layer' within 
+    /// the menu), along with a contextual button at the menu center, which will either return the user  
+    /// to the previous layer or close the menu if there are no previous layers left to traverse.
+    /// To create a functional radial menu, simply parent one or more named radial containers to it,
+    /// and populate the radial containers with RadialMenuButtons. Setting the TargetLayer field of these
+    /// buttons to the name of a radial conatiner will display the container in question to the user
+    /// whenever it is clicked in additon to any other actions assigned to the button
+    /// </remarks>
+    public RadialMenu()
+    {
+        // Hide all starting children (if any) except the first (this is the active layer)
+        if (ChildCount > 1)
+        {
+            for (int i = 1; i < ChildCount; i++)
+                GetChild(i).Visible = false;
+        }
+
+        // Auto generate a contextual button for moving back through visited layers
+        ContextualButton = new TextureButton()
+        {
+            HorizontalAlignment = HAlignment.Center,
+            VerticalAlignment = VAlignment.Center,
+            SetSize = new Vector2(64f, 64f),
+        };
+
+        ContextualButton.OnButtonUp += _ => ReturnToPreviousLayer();
+        AddChild(ContextualButton);
+
+        // Hide any further add children, unless its promoted to the active layer
+        OnChildAdded += child => child.Visible = (GetCurrentActiveLayer() == child);
+    }
+
+    private Control? GetCurrentActiveLayer()
+    {
+        var children = Children.Where(x => x != ContextualButton);
+
+        if (!children.Any())
+            return null;
+
+        return children.First(x => x.Visible);
+    }
+
+    public bool TryToMoveToNewLayer(string newLayer)
+    {
+        if (newLayer == string.Empty)
+            return false;
+
+        var currentLayer = GetCurrentActiveLayer();
+
+        if (currentLayer == null)
+            return false;
+
+        var result = false;
+
+        foreach (var child in Children)
+        {
+            if (child == ContextualButton)
+                continue;
+
+            // Hide layers which are not of interest
+            if (result == true || child.Name != newLayer)
+            {
+                child.Visible = false;
+            }
+
+            // Show the layer of interest
+            else
+            {
+                child.Visible = true;
+                result = true;
+            }
+        }
+
+        // Update the traversal path
+        if (result)
+            _path.Add(currentLayer);
+
+        // Set the style class of the button
+        if (_path.Count > 0 && ContextualButton != null && BackButtonStyleClass != null)
+            ContextualButton.SetOnlyStyleClass(BackButtonStyleClass);
+
+        return result;
+    }
+
+    public void ReturnToPreviousLayer()
+    {
+        // Close the menu if the traversal path is empty
+        if (_path.Count == 0)
+        {
+            Close();
+            return;
+        }
+
+        var lastChild = _path[^1];
+
+        // Hide all children except the contextual button
+        foreach (var child in Children)
+        {
+            if (child != ContextualButton)
+                child.Visible = false;
+        }
+
+        // Make the last visited layer visible, update the path list
+        lastChild.Visible = true;
+        _path.RemoveAt(_path.Count - 1);
+
+        // Set the style class of the button
+        if (_path.Count == 0 && ContextualButton != null && CloseButtonStyleClass != null)
+            ContextualButton.SetOnlyStyleClass(CloseButtonStyleClass);
+    }
+}
+
+[Virtual]
+public class RadialMenuButton : Button
+{
+    /// <summary>
+    /// Upon clicking this button the radial menu will transition to the named layer
+    /// </summary>
+    public string? TargetLayer { get; set; }
+
+    /// <summary>
+    /// A simple button that can move the user to a different layer within a radial menu
+    /// </summary>
+    public RadialMenuButton()
+    {
+        OnButtonUp += OnClicked;
+    }
+
+    private void OnClicked(ButtonEventArgs args)
+    {
+        if (TargetLayer == null || TargetLayer == string.Empty)
+            return;
+
+        var parent = FindParentMultiLayerContainer(this);
+
+        if (parent == null)
+            return;
+
+        parent.TryToMoveToNewLayer(TargetLayer);
+    }
+
+    private RadialMenu? FindParentMultiLayerContainer(Control control)
+    {
+        foreach (var ancestor in control.GetSelfAndLogicalAncestors())
+        {
+            if (ancestor is RadialMenu)
+                return ancestor as RadialMenu;
+        }
+
+        return null;
+    }
+}
+
+[Virtual]
+public class RadialMenuTextureButton : TextureButton
+{
+    /// <summary>
+    /// Upon clicking this button the radial menu will be moved to the named layer
+    /// </summary>
+    public string TargetLayer { get; set; } = string.Empty;
+
+    /// <summary>
+    /// A simple texture button that can move the user to a different layer within a radial menu
+    /// </summary>
+    public RadialMenuTextureButton()
+    {
+        OnButtonUp += OnClicked;
+    }
+
+    private void OnClicked(ButtonEventArgs args)
+    {
+        if (TargetLayer == string.Empty)
+            return;
+
+        var parent = FindParentMultiLayerContainer(this);
+
+        if (parent == null)
+            return;
+
+        parent.TryToMoveToNewLayer(TargetLayer);
+    }
+
+    private RadialMenu? FindParentMultiLayerContainer(Control control)
+    {
+        foreach (var ancestor in control.GetSelfAndLogicalAncestors())
+        {
+            if (ancestor is RadialMenu)
+                return ancestor as RadialMenu;
+        }
+
+        return null;
+    }
+}
diff --git a/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs b/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs
index 826bbf199ba..3b85972a9b2 100644
--- a/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs
@@ -3,6 +3,8 @@
 using Content.Client.UserInterface.Systems.Alerts.Widgets;
 using Content.Client.UserInterface.Systems.Gameplay;
 using Content.Shared.Alert;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
 
@@ -10,6 +12,8 @@ namespace Content.Client.UserInterface.Systems.Alerts;
 
 public sealed class AlertsUIController : UIController, IOnStateEntered<GameplayState>, IOnSystemChanged<ClientAlertsSystem>
 {
+    [Dependency] private readonly IPlayerManager _player = default!;
+
     [UISystemDependency] private readonly ClientAlertsSystem? _alertsSystem = default;
 
     private AlertsUI? UI => UIManager.GetActiveUIWidgetOrNull<AlertsUI>();
@@ -84,4 +88,16 @@ public void SyncAlerts()
             SystemOnSyncAlerts(_alertsSystem, alerts);
         }
     }
+
+    public void UpdateAlertSpriteEntity(EntityUid spriteViewEnt, AlertPrototype alert)
+    {
+        if (_player.LocalEntity is not { } player)
+            return;
+
+        if (!EntityManager.TryGetComponent<SpriteComponent>(spriteViewEnt, out var sprite))
+            return;
+
+        var ev = new UpdateAlertSpriteEvent((spriteViewEnt, sprite), alert);
+        EntityManager.EventBus.RaiseLocalEvent(player, ref ev);
+    }
 }
diff --git a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
index 4445bb0cd08..9423f7288df 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
@@ -2,6 +2,8 @@
 using Content.Client.Actions.UI;
 using Content.Client.Cooldown;
 using Content.Shared.Alert;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
@@ -33,9 +35,12 @@ public sealed class AlertControl : BaseButton
 
         private short? _severity;
         private readonly IGameTiming _gameTiming;
-        private readonly AnimatedTextureRect _icon;
+        private readonly IEntityManager _entityManager;
+        private readonly SpriteView _icon;
         private readonly CooldownGraphic _cooldownGraphic;
 
+        private EntityUid _spriteViewEntity;
+
         /// <summary>
         /// Creates an alert control reflecting the indicated alert + state
         /// </summary>
@@ -44,19 +49,30 @@ public sealed class AlertControl : BaseButton
         public AlertControl(AlertPrototype alert, short? severity)
         {
             _gameTiming = IoCManager.Resolve<IGameTiming>();
+            _entityManager = IoCManager.Resolve<IEntityManager>();
             TooltipSupplier = SupplyTooltip;
             Alert = alert;
             _severity = severity;
-            var specifier = alert.GetIcon(_severity);
-            _icon = new AnimatedTextureRect
+
+            _spriteViewEntity = _entityManager.Spawn(Alert.AlertViewEntity);
+            if (_entityManager.TryGetComponent<SpriteComponent>(_spriteViewEntity, out var sprite))
             {
-                DisplayRect = {TextureScale = new Vector2(2, 2)}
-            };
+                var icon = Alert.GetIcon(_severity);
+                if (sprite.LayerMapTryGet(AlertVisualLayers.Base, out var layer))
+                    sprite.LayerSetSprite(layer, icon);
+            }
 
-            _icon.SetFromSpriteSpecifier(specifier);
+            _icon = new SpriteView
+            {
+                Scale = new Vector2(2, 2)
+            };
+            _icon.SetEntity(_spriteViewEntity);
 
             Children.Add(_icon);
-            _cooldownGraphic = new CooldownGraphic();
+            _cooldownGraphic = new CooldownGraphic
+            {
+                MaxSize = new Vector2(64, 64)
+            };
             Children.Add(_cooldownGraphic);
         }
 
@@ -72,16 +88,22 @@ private Control SupplyTooltip(Control? sender)
         /// </summary>
         public void SetSeverity(short? severity)
         {
-            if (_severity != severity)
-            {
-                _severity = severity;
-                _icon.SetFromSpriteSpecifier(Alert.GetIcon(_severity));
-            }
+            if (_severity == severity)
+                return;
+            _severity = severity;
+
+            if (!_entityManager.TryGetComponent<SpriteComponent>(_spriteViewEntity, out var sprite))
+                return;
+            var icon = Alert.GetIcon(_severity);
+            if (sprite.LayerMapTryGet(AlertVisualLayers.Base, out var layer))
+                sprite.LayerSetSprite(layer, icon);
         }
 
         protected override void FrameUpdate(FrameEventArgs args)
         {
             base.FrameUpdate(args);
+            UserInterfaceManager.GetUIController<AlertsUIController>().UpdateAlertSpriteEntity(_spriteViewEntity, Alert);
+
             if (!Cooldown.HasValue)
             {
                 _cooldownGraphic.Visible = false;
@@ -91,5 +113,17 @@ protected override void FrameUpdate(FrameEventArgs args)
 
             _cooldownGraphic.FromTime(Cooldown.Value.Start, Cooldown.Value.End);
         }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+
+            _entityManager.DeleteEntity(_spriteViewEntity);
+        }
+    }
+
+    public enum AlertVisualLayers : byte
+    {
+        Base
     }
 }
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index a12511e97c3..138dc9e52be 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -9,6 +9,7 @@
 using Content.Client.Examine;
 using Content.Client.Gameplay;
 using Content.Client.Ghost;
+using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Screens;
 using Content.Client.UserInterface.Systems.Chat.Widgets;
 using Content.Client.UserInterface.Systems.Gameplay;
@@ -55,7 +56,6 @@ public sealed class ChatUIController : UIController
     [Dependency] private readonly IStateManager _state = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
     [UISystemDependency] private readonly ExamineSystem? _examine = default;
     [UISystemDependency] private readonly GhostSystem? _ghost = default;
@@ -184,8 +184,8 @@ public override void Initialize()
         _net.RegisterNetMessage<MsgChatMessage>(OnChatMessage);
         _net.RegisterNetMessage<MsgDeleteChatMessagesBy>(OnDeleteChatMessagesBy);
         SubscribeNetworkEvent<DamageForceSayEvent>(OnDamageForceSay);
-        _cfg.OnValueChanged(CCVars.ChatEnableColorName, (value) => { _chatNameColorsEnabled = value; });
-        _chatNameColorsEnabled = _cfg.GetCVar(CCVars.ChatEnableColorName);
+        _config.OnValueChanged(CCVars.ChatEnableColorName, (value) => { _chatNameColorsEnabled = value; });
+        _chatNameColorsEnabled = _config.GetCVar(CCVars.ChatEnableColorName);
 
         _speechBubbleRoot = new LayoutContainer();
 
@@ -237,6 +237,9 @@ public override void Initialize()
         {
             _chatNameColors[i] = nameColors[i].ToHex();
         }
+
+        _config.OnValueChanged(CCVars.ChatWindowOpacity, OnChatWindowOpacityChanged);
+
     }
 
     public void OnScreenLoad()
@@ -245,6 +248,8 @@ public void OnScreenLoad()
 
         var viewportContainer = UIManager.ActiveScreen!.FindControl<LayoutContainer>("ViewportContainer");
         SetSpeechBubbleRoot(viewportContainer);
+
+        SetChatWindowOpacity(_config.GetCVar(CCVars.ChatWindowOpacity));
     }
 
     public void OnScreenUnload()
@@ -252,6 +257,34 @@ public void OnScreenUnload()
         SetMainChat(false);
     }
 
+    private void OnChatWindowOpacityChanged(float opacity)
+    {
+        SetChatWindowOpacity(opacity);
+    }
+
+    private void SetChatWindowOpacity(float opacity)
+    {
+        var chatBox = UIManager.ActiveScreen?.GetWidget<ChatBox>() ?? UIManager.ActiveScreen?.GetWidget<ResizableChatBox>();
+
+        var panel = chatBox?.ChatWindowPanel;
+        if (panel is null)
+            return;
+
+        Color color;
+        if (panel.PanelOverride is StyleBoxFlat styleBoxFlat)
+            color = styleBoxFlat.BackgroundColor;
+        else if (panel.TryGetStyleProperty<StyleBox>(PanelContainer.StylePropertyPanel, out var style)
+                 && style is StyleBoxFlat propStyleBoxFlat)
+            color = propStyleBoxFlat.BackgroundColor;
+        else
+            color = StyleNano.ChatBackgroundColor;
+
+        panel.PanelOverride = new StyleBoxFlat
+        {
+            BackgroundColor = color.WithAlpha(opacity)
+        };
+    }
+
     public void SetMainChat(bool setting)
     {
         if (UIManager.ActiveScreen == null)
@@ -784,7 +817,7 @@ private void OnChatMessage(MsgChatMessage message)
         ProcessChatMessage(msg);
 
         if ((msg.Channel & ChatChannel.AdminRelated) == 0 ||
-            _cfg.GetCVar(CCVars.ReplayRecordAdminChat))
+            _config.GetCVar(CCVars.ReplayRecordAdminChat))
         {
             _replayRecording.RecordClientMessage(msg);
         }
@@ -844,7 +877,7 @@ public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true)
                 break;
 
             case ChatChannel.LOOC:
-                if (_cfg.GetCVar(CCVars.LoocAboveHeadShow))
+                if (_config.GetCVar(CCVars.LoocAboveHeadShow))
                     AddSpeechBubble(msg, SpeechBubble.SpeechType.Looc);
                 break;
         }
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs
deleted file mode 100644
index 31a3f11b199..00000000000
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using Content.Shared.Chat;
-using Content.Shared.Input;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-
-namespace Content.Client.UserInterface.Systems.Chat.Controls;
-
-[Virtual]
-public class ChatInputBox : PanelContainer
-{
-    public readonly ChannelSelectorButton ChannelSelector;
-    public readonly HistoryLineEdit Input;
-    public readonly ChannelFilterButton FilterButton;
-    protected readonly BoxContainer Container;
-    protected ChatChannel ActiveChannel { get; private set; } = ChatChannel.Local;
-
-    public ChatInputBox()
-    {
-        Container = new BoxContainer
-        {
-            Orientation = BoxContainer.LayoutOrientation.Horizontal,
-            SeparationOverride = 4
-        };
-        AddChild(Container);
-
-        ChannelSelector = new ChannelSelectorButton
-        {
-            Name = "ChannelSelector",
-            ToggleMode = true,
-            StyleClasses = {"chatSelectorOptionButton"},
-            MinWidth = 75
-        };
-        Container.AddChild(ChannelSelector);
-        Input = new HistoryLineEdit
-        {
-            Name = "Input",
-            PlaceHolder = GetChatboxInfoPlaceholder(),
-            HorizontalExpand = true,
-            StyleClasses = {"chatLineEdit"}
-        };
-        Container.AddChild(Input);
-        FilterButton = new ChannelFilterButton
-        {
-            Name = "FilterButton",
-            StyleClasses = {"chatFilterOptionButton"}
-        };
-        Container.AddChild(FilterButton);
-        ChannelSelector.OnChannelSelect += UpdateActiveChannel;
-    }
-
-    private void UpdateActiveChannel(ChatSelectChannel selectedChannel)
-    {
-        ActiveChannel = (ChatChannel) selectedChannel;
-    }
-
-    private static string GetChatboxInfoPlaceholder()
-    {
-        return (BoundKeyHelper.IsBound(ContentKeyFunctions.FocusChat), BoundKeyHelper.IsBound(ContentKeyFunctions.CycleChatChannelForward)) switch
-        {
-            (true, true) => Loc.GetString("hud-chatbox-info", ("talk-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.FocusChat)), ("cycle-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.CycleChatChannelForward))),
-            (true, false) => Loc.GetString("hud-chatbox-info-talk", ("talk-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.FocusChat))),
-            (false, true) => Loc.GetString("hud-chatbox-info-cycle", ("cycle-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.CycleChatChannelForward))),
-            (false, false) => Loc.GetString("hud-chatbox-info-unbound")
-        };
-    }
-}
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs
new file mode 100644
index 00000000000..942f08042e2
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs
@@ -0,0 +1,68 @@
+using Content.Client.Stylesheets;
+using Content.Shared.Chat;
+using Content.Shared.Input;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.UserInterface.Systems.Chat.Controls;
+
+[Virtual]
+public class ChatInputBox : PanelContainer
+{
+    public readonly ChannelSelectorButton ChannelSelector;
+    public readonly HistoryLineEdit Input;
+    public readonly ChannelFilterButton FilterButton;
+    protected readonly BoxContainer Container;
+    protected ChatChannel ActiveChannel { get; private set; } = ChatChannel.Local;
+
+    public ChatInputBox()
+    {
+        Container = new BoxContainer
+        {
+            Orientation = BoxContainer.LayoutOrientation.Horizontal,
+            SeparationOverride = 4
+        };
+        AddChild(Container);
+
+        ChannelSelector = new ChannelSelectorButton
+        {
+            Name = "ChannelSelector",
+            ToggleMode = true,
+            StyleClasses = {"chatSelectorOptionButton"},
+            MinWidth = 75
+        };
+        Container.AddChild(ChannelSelector);
+        Input = new HistoryLineEdit
+        {
+            Name = "Input",
+            PlaceHolder = GetChatboxInfoPlaceholder(),
+            HorizontalExpand = true,
+            StyleClasses = {"chatLineEdit"}
+        };
+        Container.AddChild(Input);
+        FilterButton = new ChannelFilterButton
+        {
+            Name = "FilterButton",
+            StyleClasses = {"chatFilterOptionButton"}
+        };
+        Container.AddChild(FilterButton);
+        AddStyleClass(StyleNano.StyleClassChatSubPanel);
+        ChannelSelector.OnChannelSelect += UpdateActiveChannel;
+    }
+
+    private void UpdateActiveChannel(ChatSelectChannel selectedChannel)
+    {
+        ActiveChannel = (ChatChannel) selectedChannel;
+    }
+
+    private static string GetChatboxInfoPlaceholder()
+    {
+        return (BoundKeyHelper.IsBound(ContentKeyFunctions.FocusChat), BoundKeyHelper.IsBound(ContentKeyFunctions.CycleChatChannelForward)) switch
+        {
+            (true, true) => Loc.GetString("hud-chatbox-info", ("talk-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.FocusChat)), ("cycle-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.CycleChatChannelForward))),
+            (true, false) => Loc.GetString("hud-chatbox-info-talk", ("talk-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.FocusChat))),
+            (false, true) => Loc.GetString("hud-chatbox-info-cycle", ("cycle-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.CycleChatChannelForward))),
+            (false, false) => Loc.GetString("hud-chatbox-info-unbound")
+        };
+    }
+}
diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
index 090041fa93c..36cdce85985 100644
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
@@ -7,11 +7,8 @@
     HorizontalExpand="True"
     VerticalExpand="True"
     MinSize="465 225">
-    <PanelContainer HorizontalExpand="True" VerticalExpand="True">
-        <PanelContainer.PanelOverride>
-            <graphics:StyleBoxFlat BackgroundColor="#25252ADD" />
-        </PanelContainer.PanelOverride>
-
+    <PanelContainer Name="ChatWindowPanel" Access="Public" HorizontalExpand="True" VerticalExpand="True"
+                    StyleClasses="StyleNano.StyleClassChatPanel">
         <BoxContainer Orientation="Vertical" SeparationOverride="4" HorizontalExpand="True" VerticalExpand="True">
             <OutputPanel Name="Contents" HorizontalExpand="True" VerticalExpand="True" Margin="8 8 8 4" />
             <controls:ChatInputBox HorizontalExpand="True" Name="ChatInput" Access="Public" Margin="2"/>
diff --git a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml
index 2c622b82b9e..d469e6ced03 100644
--- a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml
+++ b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml
@@ -1,4 +1,4 @@
-<controls:ItemStatusPanel
+<controls:ItemStatusPanel
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Controls"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
@@ -18,7 +18,7 @@
         </PanelContainer.PanelOverride>
         <BoxContainer Orientation="Vertical" SeparationOverride="0">
             <BoxContainer Name="StatusContents" Orientation="Vertical"/>
-            <Label Name="ItemNameLabel" ClipText="True" StyleClasses="ItemStatus"/>
+            <Label Name="ItemNameLabel" StyleClasses="ItemStatus"/>
         </BoxContainer>
     </PanelContainer>
 </controls:ItemStatusPanel>
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
index bd952fe9577..e39ac5d322d 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
@@ -12,6 +12,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 namespace Content.Client.UserInterface.Systems.Storage.Controls;
 
@@ -355,6 +356,40 @@ protected override void FrameUpdate(FrameEventArgs args)
             origin,
             currentLocation.Rotation);
 
+        foreach (var locations in storageComponent.SavedLocations)
+        {
+            if (!_entity.TryGetComponent<MetaDataComponent>(currentEnt, out var meta) || meta.EntityName != locations.Key)
+                continue;
+
+            float spot = 0;
+            var marked = new List<Control>();
+
+            foreach (var location in locations.Value)
+            {
+                var shape = itemSystem.GetAdjustedItemShape(currentEnt, location);
+                var bound = shape.GetBoundingBox();
+
+                var spotFree = storageSystem.ItemFitsInGridLocation(currentEnt, StorageEntity.Value, location);
+
+                if (spotFree)
+                    spot++;
+
+                for (var y = bound.Bottom; y <= bound.Top; y++)
+                {
+                    for (var x = bound.Left; x <= bound.Right; x++)
+                    {
+                        if (TryGetBackgroundCell(x, y, out var cell) && shape.Contains(x, y) && !marked.Contains(cell))
+                        {
+                            marked.Add(cell);
+                            cell.ModulateSelfOverride = spotFree
+                                ? Color.FromHsv((0.18f, 1 / spot, 0.5f / spot + 0.5f, 1f))
+                                : Color.FromHex("#2222CC");
+                        }
+                    }
+                }
+            }
+        }
+
         var validColor = usingInHand ? Color.Goldenrod : Color.FromHex("#1E8000");
 
         for (var y = itemBounding.Bottom; y <= itemBounding.Top; y++)
diff --git a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
index 5f3ae3a2dac..b865b54dd0e 100644
--- a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
+++ b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
@@ -240,6 +240,16 @@ private void OnPiecePressed(GUIBoundKeyEventArgs args, ItemGridPiece control)
 
             args.Handle();
         }
+        else if (args.Function == ContentKeyFunctions.SaveItemLocation)
+        {
+            if (_container?.StorageEntity is not {} storage)
+                return;
+
+            _entity.RaisePredictiveEvent(new StorageSaveItemLocationEvent(
+                _entity.GetNetEntity(control.Entity),
+                _entity.GetNetEntity(storage)));
+            args.Handle();
+        }
         else if (args.Function == ContentKeyFunctions.ExamineEntity)
         {
             _entity.System<ExamineSystem>().DoExamine(control.Entity);
diff --git a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
index 0650482b108..f700c6663b9 100644
--- a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
+++ b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
@@ -1,10 +1,13 @@
 using Content.Shared.VoiceMask;
 using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.VoiceMask;
 
 public sealed class VoiceMaskBoundUserInterface : BoundUserInterface
 {
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+
     [ViewVariables]
     private VoiceMaskNameChangeWindow? _window;
 
@@ -16,10 +19,11 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new();
+        _window = new(_proto);
 
         _window.OpenCentered();
         _window.OnNameChange += OnNameSelected;
+        _window.OnVerbChange += verb => SendMessage(new VoiceMaskChangeVerbMessage(verb));
         _window.OnClose += Close;
     }
 
@@ -35,7 +39,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             return;
         }
 
-        _window.UpdateState(cast.Name);
+        _window.UpdateState(cast.Name, cast.Verb);
     }
 
     protected override void Dispose(bool disposing)
diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
index 2316ec9c7d8..e23aca12391 100644
--- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
+++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
@@ -1,11 +1,16 @@
-<DefaultWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                Title="{Loc 'voice-mask-name-change-window'}"
-               MinSize="5 20">
-    <BoxContainer Orientation="Vertical">
+               MinSize="5 30">
+    <BoxContainer Orientation="Vertical" Margin="5">
         <Label Text="{Loc 'voice-mask-name-change-info'}" />
-        <BoxContainer Orientation="Horizontal">
+        <BoxContainer Orientation="Horizontal" Margin="5">
             <LineEdit Name="NameSelector" HorizontalExpand="True" />
             <Button Name="NameSelectorSet" Text="{Loc 'voice-mask-name-change-set'}" />
         </BoxContainer>
+        <BoxContainer Orientation="Horizontal" Margin="5">
+            <Label Text="{Loc 'voice-mask-name-change-speech-style'}" />
+            <OptionButton Name="SpeechVerbSelector" /> <!-- Populated in LoadVerbs -->
+        </BoxContainer>
     </BoxContainer>
-</DefaultWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
index e373acbd0a0..16a28f9d9b3 100644
--- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
+++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
@@ -1,26 +1,85 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Speech;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.VoiceMask;
 
 [GenerateTypedNameReferences]
-public sealed partial class VoiceMaskNameChangeWindow : DefaultWindow
+public sealed partial class VoiceMaskNameChangeWindow : FancyWindow
 {
     public Action<string>? OnNameChange;
+    public Action<string?>? OnVerbChange;
 
-    public VoiceMaskNameChangeWindow()
+    private List<(string, string)> _verbs = new();
+
+    private string? _verb;
+
+    public VoiceMaskNameChangeWindow(IPrototypeManager proto)
     {
         RobustXamlLoader.Load(this);
 
         NameSelectorSet.OnPressed += _ =>
         {
-            OnNameChange!(NameSelector.Text);
+            OnNameChange?.Invoke(NameSelector.Text);
+        };
+
+        SpeechVerbSelector.OnItemSelected += args =>
+        {
+            OnVerbChange?.Invoke((string?) args.Button.GetItemMetadata(args.Id));
+            SpeechVerbSelector.SelectId(args.Id);
         };
+
+        ReloadVerbs(proto);
+
+        AddVerbs();
+    }
+
+    private void ReloadVerbs(IPrototypeManager proto)
+    {
+        foreach (var verb in proto.EnumeratePrototypes<SpeechVerbPrototype>())
+        {
+            _verbs.Add((Loc.GetString(verb.Name), verb.ID));
+        }
+        _verbs.Sort((a, b) => a.Item1.CompareTo(b.Item1));
     }
 
-    public void UpdateState(string name)
+    private void AddVerbs()
+    {
+        SpeechVerbSelector.Clear();
+
+        AddVerb(Loc.GetString("chat-speech-verb-name-none"), null);
+        foreach (var (name, id) in _verbs)
+        {
+            AddVerb(name, id);
+        }
+    }
+
+    private void AddVerb(string name, string? verb)
+    {
+        var id = SpeechVerbSelector.ItemCount;
+        SpeechVerbSelector.AddItem(name);
+        if (verb is {} metadata)
+            SpeechVerbSelector.SetItemMetadata(id, metadata);
+
+        if (verb == _verb)
+            SpeechVerbSelector.SelectId(id);
+    }
+
+    public void UpdateState(string name, string? verb)
     {
         NameSelector.Text = name;
+        _verb = verb;
+
+        for (int id = 0; id < SpeechVerbSelector.ItemCount; id++)
+        {
+            if (string.Equals(verb, SpeechVerbSelector.GetItemMetadata(id)))
+            {
+                SpeechVerbSelector.SelectId(id);
+                break;
+            }
+        }
     }
 }
diff --git a/Content.Client/Zombies/ZombieSystem.cs b/Content.Client/Zombies/ZombieSystem.cs
index 7c1fb38e744..49b5d6aec18 100644
--- a/Content.Client/Zombies/ZombieSystem.cs
+++ b/Content.Client/Zombies/ZombieSystem.cs
@@ -46,7 +46,7 @@ private void OnCanDisplayStatusIcons(EntityUid uid, ZombieComponent component, r
         args.Cancelled = true;
     }
 
-    private void OnCanDisplayStatusIcons(EntityUid uid, InitialInfectedComponent component, CanDisplayStatusIconsEvent args)
+    private void OnCanDisplayStatusIcons(EntityUid uid, InitialInfectedComponent component, ref CanDisplayStatusIconsEvent args)
     {
         if (HasComp<InitialInfectedComponent>(args.User) && !HasComp<ZombieComponent>(args.User))
             return;
diff --git a/Content.IntegrationTests/Pair/TestMapData.cs b/Content.IntegrationTests/Pair/TestMapData.cs
index bdf12080388..343641e1613 100644
--- a/Content.IntegrationTests/Pair/TestMapData.cs
+++ b/Content.IntegrationTests/Pair/TestMapData.cs
@@ -10,9 +10,8 @@ namespace Content.IntegrationTests.Pair;
 public sealed class TestMapData
 {
     public EntityUid MapUid { get; set; }
-    public EntityUid GridUid { get; set; }
-    public MapId MapId { get; set; }
-    public MapGridComponent MapGrid { get; set; } = default!;
+    public Entity<MapGridComponent> Grid;
+    public MapId MapId;
     public EntityCoordinates GridCoords { get; set; }
     public MapCoordinates MapCoords { get; set; }
     public TileRef Tile { get; set; }
@@ -21,4 +20,4 @@ public sealed class TestMapData
     public EntityUid CMapUid { get; set; }
     public EntityUid CGridUid { get; set; }
     public EntityCoordinates CGridCoords { get; set; }
-}
\ No newline at end of file
+}
diff --git a/Content.IntegrationTests/Pair/TestPair.Helpers.cs b/Content.IntegrationTests/Pair/TestPair.Helpers.cs
index 554807b2d25..0ea6d3e2dcc 100644
--- a/Content.IntegrationTests/Pair/TestPair.Helpers.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Helpers.cs
@@ -1,5 +1,6 @@
 #nullable enable
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
@@ -14,36 +15,37 @@ public sealed partial class TestPair
     /// <summary>
     /// Creates a map, a grid, and a tile, and gives back references to them.
     /// </summary>
-    public async Task<TestMapData> CreateTestMap()
+    [MemberNotNull(nameof(TestMap))]
+    public async Task<TestMapData> CreateTestMap(bool initialized = true, string tile = "Plating")
     {
+        var mapData = new TestMapData();
+        TestMap = mapData;
         await Server.WaitIdleAsync();
         var tileDefinitionManager = Server.ResolveDependency<ITileDefinitionManager>();
 
-        var mapData = new TestMapData();
         TestMap = mapData;
         await Server.WaitPost(() =>
         {
-            mapData.MapId = Server.MapMan.CreateMap();
-            mapData.MapUid = Server.MapMan.GetMapEntityId(mapData.MapId);
-            var mapGrid = Server.MapMan.CreateGridEntity(mapData.MapId);
-            mapData.MapGrid = mapGrid;
-            mapData.GridUid = mapGrid.Owner; // Fixing this requires an engine PR.
-            mapData.GridCoords = new EntityCoordinates(mapData.GridUid, 0, 0);
-            var plating = tileDefinitionManager["Plating"];
+            mapData.MapUid = Server.System<SharedMapSystem>().CreateMap(out mapData.MapId, runMapInit: initialized);
+            mapData.Grid = Server.MapMan.CreateGridEntity(mapData.MapId);
+            mapData.GridCoords = new EntityCoordinates(mapData.Grid, 0, 0);
+            var plating = tileDefinitionManager[tile];
             var platingTile = new Tile(plating.TileId);
-            mapData.MapGrid.SetTile(mapData.GridCoords, platingTile);
+            mapData.Grid.Comp.SetTile(mapData.GridCoords, platingTile);
             mapData.MapCoords = new MapCoordinates(0, 0, mapData.MapId);
-            mapData.Tile = mapData.MapGrid.GetAllTiles().First();
+            mapData.Tile = mapData.Grid.Comp.GetAllTiles().First();
         });
 
+        TestMap = mapData;
         if (!Settings.Connected)
             return mapData;
 
         await RunTicksSync(10);
         mapData.CMapUid = ToClientUid(mapData.MapUid);
-        mapData.CGridUid = ToClientUid(mapData.GridUid);
+        mapData.CGridUid = ToClientUid(mapData.Grid);
         mapData.CGridCoords = new EntityCoordinates(mapData.CGridUid, 0, 0);
 
+        TestMap = mapData;
         return mapData;
     }
 
diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
index 6046ed65e44..b544fe28547 100644
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -306,11 +306,6 @@ await testOut.WriteLineAsync(
                 Pairs[fallback!] = true;
             }
 
-            if (fallback == null && _pairId > 8)
-            {
-                var x = 2;
-            }
-
             return fallback;
         }
     }
diff --git a/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs b/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
index 7d86fc2f6c2..895bb2cf878 100644
--- a/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
+++ b/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
@@ -57,9 +57,9 @@ await server.WaitAssertion(() =>
                 var reader = new AccessReaderComponent();
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "Foo" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "Bar" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "Foo" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "Bar" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.True);
                 });
 
                 // test deny
@@ -67,58 +67,58 @@ await server.WaitAssertion(() =>
                 reader.DenyTags.Add("A");
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "Foo" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A", "Foo" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "Foo" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A", "Foo" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.True);
                 });
 
                 // test one list
                 reader = new AccessReaderComponent();
-                reader.AccessLists.Add(new HashSet<string> { "A" });
+                reader.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>> { "A" });
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "B" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A", "B" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "B" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A", "B" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.False);
                 });
 
                 // test one list - two items
                 reader = new AccessReaderComponent();
-                reader.AccessLists.Add(new HashSet<string> { "A", "B" });
+                reader.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>> { "A", "B" });
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "B" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A", "B" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "B" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A", "B" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.False);
                 });
 
                 // test two list
                 reader = new AccessReaderComponent();
-                reader.AccessLists.Add(new HashSet<string> { "A" });
-                reader.AccessLists.Add(new HashSet<string> { "B", "C" });
+                reader.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>> { "A" });
+                reader.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>> { "B", "C" });
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "B" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A", "B" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "C", "B" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "C", "B", "A" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "B" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A", "B" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "C", "B" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "C", "B", "A" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.False);
                 });
 
                 // test deny list
                 reader = new AccessReaderComponent();
-                reader.AccessLists.Add(new HashSet<string> { "A" });
+                reader.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>> { "A" });
                 reader.DenyTags.Add("B");
                 Assert.Multiple(() =>
                 {
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A" }, reader), Is.True);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "B" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(new[] { "A", "B" }, reader), Is.False);
-                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A" }, reader), Is.True);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "B" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(new List<ProtoId<AccessLevelPrototype>> { "A", "B" }, reader), Is.False);
+                    Assert.That(system.AreAccessTagsAllowed(Array.Empty<ProtoId<AccessLevelPrototype>>(), reader), Is.False);
                 });
             });
             await pair.CleanReturnAsync();
diff --git a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs
index 98c7363a6c4..772af337a1a 100644
--- a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs
+++ b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs
@@ -32,8 +32,8 @@ public async Task AddAndGetSingleLog()
 
         var guid = Guid.NewGuid();
 
-        var testMap = await pair.CreateTestMap();
-        var coordinates = testMap.GridCoords;
+        await pair.CreateTestMap();
+        var coordinates = pair.TestMap.GridCoords;
         await server.WaitPost(() =>
         {
             var entity = sEntities.SpawnEntity(null, coordinates);
diff --git a/Content.IntegrationTests/Tests/Announcers/AnnouncerFallbackTest.cs b/Content.IntegrationTests/Tests/Announcers/AnnouncerFallbackTest.cs
new file mode 100644
index 00000000000..ac0a23b09fc
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Announcers/AnnouncerFallbackTest.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Linq;
+using Content.Shared.Announcements.Prototypes;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Announcers;
+
+[TestFixture]
+[TestOf(typeof(AnnouncerPrototype))]
+public sealed class AnnouncerPrototypeTests
+{
+    [Test]
+    public async Task TestAnnouncerFallbacks()
+    {
+        // Checks if every announcer has a fallback announcement
+
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var prototype = server.ResolveDependency<IPrototypeManager>();
+
+        await server.WaitAssertion(() =>
+        {
+            var success = true;
+            var why = new List<string>();
+
+            foreach (var announcer in prototype.EnumeratePrototypes<AnnouncerPrototype>())
+            {
+                if (announcer.Announcements.All(a => a.ID.ToLower() != "fallback"))
+                {
+                    success = false;
+                    why.Add(announcer.ID);
+                }
+            }
+
+            Assert.That(success, Is.True, $"The following announcers do not have a fallback announcement:\n  {string.Join("\n  ", why)}");
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Announcers/AnnouncerLocalizationTest.cs b/Content.IntegrationTests/Tests/Announcers/AnnouncerLocalizationTest.cs
new file mode 100644
index 00000000000..74e14475bc4
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Announcers/AnnouncerLocalizationTest.cs
@@ -0,0 +1,66 @@
+using System.Collections.Generic;
+using Content.Server.Announcements.Systems;
+using Content.Server.StationEvents;
+using Content.Shared.Announcements.Prototypes;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Localization;
+
+namespace Content.IntegrationTests.Tests.Announcers;
+
+[TestFixture]
+[TestOf(typeof(AnnouncerPrototype))]
+public sealed class AnnouncerLocalizationTest
+{
+    [Test]
+    public async Task TestEventLocalization()
+    {
+        // Checks if every station event wanting the announcerSystem to send messages has a localization string
+        // If an event doesn't have startAnnouncement or endAnnouncement set to true
+        //  it will be expected for that system to handle the announcements if it wants them
+
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var locale = server.ResolveDependency<ILocalizationManager>();
+        var entSysMan = server.ResolveDependency<IEntitySystemManager>();
+        var announcer = entSysMan.GetEntitySystem<AnnouncerSystem>();
+        var events = entSysMan.GetEntitySystem<EventManagerSystem>();
+
+        await server.WaitAssertion(() =>
+        {
+            var succeeded = true;
+            var why = new List<string>();
+
+            foreach (var ev in events.AllEvents())
+            {
+                if (ev.Value.StartAnnouncement)
+                {
+                    var announcementId = announcer.GetAnnouncementId(ev.Key.ID);
+                    var eventLocaleString = announcer.GetEventLocaleString(announcementId);
+
+                    if (locale.GetString(eventLocaleString) == eventLocaleString)
+                    {
+                        succeeded = false;
+                        why.Add($"\"{announcementId}\": \"{eventLocaleString}\"");
+                    }
+                }
+
+                if (ev.Value.EndAnnouncement)
+                {
+                    var announcementId = announcer.GetAnnouncementId(ev.Key.ID, true);
+                    var eventLocaleString = announcer.GetEventLocaleString(announcementId);
+
+                    if (locale.GetString(eventLocaleString) == eventLocaleString)
+                    {
+                        succeeded = false;
+                        why.Add($"\"{announcementId}\": \"{eventLocaleString}\"");
+                    }
+                }
+            }
+
+            Assert.That(succeeded, Is.True, $"The following announcements do not have a localization string:\n  {string.Join("\n  ", why)}");
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs
index f2e19849b00..dce3741c98d 100644
--- a/Content.IntegrationTests/Tests/Body/LungTest.cs
+++ b/Content.IntegrationTests/Tests/Body/LungTest.cs
@@ -9,7 +9,6 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Maths;
 using System.Linq;
 using System.Numerics;
 
@@ -61,12 +60,11 @@ public async Task AirConsistencyTest()
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
             var mapLoader = entityManager.System<MapLoaderSystem>();
-            RespiratorSystem respSys = default;
-            MetabolizerSystem metaSys = default;
 
             MapId mapId;
             EntityUid? grid = null;
             BodyComponent body = default;
+            RespiratorComponent resp = default;
             EntityUid human = default;
             GridAtmosphereComponent relevantAtmos = default;
             var startingMoles = 0.0f;
@@ -99,17 +97,15 @@ float GetMapMoles()
 
             await server.WaitAssertion(() =>
             {
-                var coords = new Vector2(0.5f, -1f);
-                var coordinates = new EntityCoordinates(grid.Value, coords);
+                var center = new Vector2(0.5f, 0.5f);
+                var coordinates = new EntityCoordinates(grid.Value, center);
                 human = entityManager.SpawnEntity("HumanLungDummy", coordinates);
-                respSys = entityManager.System<RespiratorSystem>();
-                metaSys = entityManager.System<MetabolizerSystem>();
                 relevantAtmos = entityManager.GetComponent<GridAtmosphereComponent>(grid.Value);
-                startingMoles = GetMapMoles();
+                startingMoles = 100f; // Hardcoded because GetMapMoles returns 900 here for some reason.
 
 #pragma warning disable NUnit2045
                 Assert.That(entityManager.TryGetComponent(human, out body), Is.True);
-                Assert.That(entityManager.HasComponent<RespiratorComponent>(human), Is.True);
+                Assert.That(entityManager.TryGetComponent(human, out resp), Is.True);
 #pragma warning restore NUnit2045
             });
 
@@ -118,18 +114,19 @@ await server.WaitAssertion(() =>
             var inhaleCycles = 100;
             for (var i = 0; i < inhaleCycles; i++)
             {
-                await server.WaitAssertion(() =>
-                {
-                    // inhale
-                    respSys.Update(2.0f);
-                    Assert.That(GetMapMoles(), Is.LessThan(startingMoles));
-
-                    // metabolize + exhale
-                    metaSys.Update(1.0f);
-                    metaSys.Update(1.0f);
-                    respSys.Update(2.0f);
-                    Assert.That(GetMapMoles(), Is.EqualTo(startingMoles).Within(0.0002));
-                });
+                // Breathe in
+                await PoolManager.WaitUntil(server, () => resp.Status == RespiratorStatus.Exhaling);
+                Assert.That(
+                    GetMapMoles(), Is.LessThan(startingMoles),
+                    "Did not inhale in any gas"
+                );
+
+                // Breathe out
+                await PoolManager.WaitUntil(server, () => resp.Status == RespiratorStatus.Inhaling);
+                Assert.That(
+                    GetMapMoles(), Is.EqualTo(startingMoles).Within(0.0002),
+                    "Did not exhale as much gas as was inhaled"
+                );
             }
 
             await pair.CleanReturnAsync();
diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index 6e2a080370d..7c700d9fb8a 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -181,9 +181,8 @@ await server.WaitAssertion(() =>
 #pragma warning restore NUnit2045
 
                 // Move away from the chair
-                var xformQuery = entityManager.GetEntityQuery<TransformComponent>();
-                var oldWorldPosition = xformSystem.GetWorldPosition(chair, xformQuery);
-                xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(1000, 1000), xformQuery);
+                var oldWorldPosition = xformSystem.GetWorldPosition(chair);
+                xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(1000, 1000));
 
                 // Out of range
 #pragma warning disable NUnit2045 // Interdependent asserts.
@@ -193,8 +192,8 @@ await server.WaitAssertion(() =>
 #pragma warning restore NUnit2045
 
                 // Move near the chair
-                oldWorldPosition = xformSystem.GetWorldPosition(chair, xformQuery);
-                xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(0.5f, 0), xformQuery);
+                oldWorldPosition = xformSystem.GetWorldPosition(chair);
+                xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(0.5f, 0));
 
                 // In range
 #pragma warning disable NUnit2045 // Interdependent asserts.
@@ -220,8 +219,8 @@ await server.WaitAssertion(() =>
                 Assert.That(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle));
 
                 // Move away from the chair
-                oldWorldPosition = xformSystem.GetWorldPosition(chair, xformQuery);
-                xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(1, 0), xformQuery);
+                oldWorldPosition = xformSystem.GetWorldPosition(chair);
+                xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(1, 0));
             });
 
             await server.WaitRunTicks(1);
@@ -371,9 +370,8 @@ await server.WaitAssertion(() =>
                 });
 
                 // Move the buckled entity away
-                var xformQuery = entityManager.GetEntityQuery<TransformComponent>();
-                var oldWorldPosition = xformSystem.GetWorldPosition(chair, xformQuery);
-                xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(100, 0), xformQuery);
+                var oldWorldPosition = xformSystem.GetWorldPosition(chair);
+                xformSystem.SetWorldPosition(human, oldWorldPosition + new Vector2(100, 0));
             });
 
             await PoolManager.WaitUntil(server, () => !buckle.Buckled, 10);
@@ -383,9 +381,8 @@ await server.WaitAssertion(() =>
             await server.WaitAssertion(() =>
             {
                 // Move the now unbuckled entity back onto the chair
-                var xformQuery = entityManager.GetEntityQuery<TransformComponent>();
-                var oldWorldPosition = xformSystem.GetWorldPosition(chair, xformQuery);
-                xformSystem.SetWorldPosition(human, oldWorldPosition, xformQuery);
+                var oldWorldPosition = xformSystem.GetWorldPosition(chair);
+                xformSystem.SetWorldPosition(human, oldWorldPosition);
 
                 // Buckle
                 Assert.That(buckleSystem.TryBuckle(human, human, chair, buckleComp: buckle));
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs b/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs
index c49e20981e3..76911eba5f7 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs
@@ -56,7 +56,7 @@ public async Task CraftSpear()
 
         // Player's hands should be full of the remaining rods, except those dropped during the failed crafting attempt.
         // Spear and left over stacks should be on the floor.
-        await AssertEntityLookup((Rod, 2), (Cable, 8), (ShardGlass, 2), (Spear, 1));
+        await AssertEntityLookup((Rod, 2), (Cable, 7), (ShardGlass, 2), (Spear, 1));
     }
 
     // The following is wrapped in an if DEBUG. This is because of cursed state handling bugs. Tests don't (de)serialize
@@ -100,7 +100,7 @@ public async Task CancelCraft()
             Assert.That(sys.IsEntityInContainer(rods), Is.False);
             Assert.That(sys.IsEntityInContainer(wires), Is.False);
             Assert.That(rodStack, Has.Count.EqualTo(8));
-            Assert.That(wireStack, Has.Count.EqualTo(8));
+            Assert.That(wireStack, Has.Count.EqualTo(7));
 
             await FindEntity(Spear, shouldSucceed: false);
         });
diff --git a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
index 26ea726211b..b37f7cfa468 100644
--- a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
+++ b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
@@ -212,7 +212,7 @@ public async Task WiredNetworkDeviceSendAndReceive()
             DeviceNetworkComponent networkComponent1 = null;
             DeviceNetworkComponent networkComponent2 = null;
             WiredNetworkComponent wiredNetworkComponent = null;
-            var grid = testMap.MapGrid;
+            var grid = testMap.Grid.Comp;
 
             var testValue = "test";
             var payload = new NetworkPayload
diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
index 976fc2eceb5..9109fdbe4f7 100644
--- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
+++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
@@ -163,7 +163,6 @@ public async Task Test()
             var entityManager = server.ResolveDependency<IEntityManager>();
             var xformSystem = entityManager.System<SharedTransformSystem>();
             var disposalSystem = entityManager.System<DisposalUnitSystem>();
-
             await server.WaitAssertion(() =>
             {
                 // Spawn the entities
@@ -171,8 +170,7 @@ await server.WaitAssertion(() =>
                 human = entityManager.SpawnEntity("HumanDisposalDummy", coordinates);
                 wrench = entityManager.SpawnEntity("WrenchDummy", coordinates);
                 disposalUnit = entityManager.SpawnEntity("DisposalUnitDummy", coordinates);
-                disposalTrunk = entityManager.SpawnEntity("DisposalTrunkDummy",
-                    entityManager.GetComponent<TransformComponent>(disposalUnit).MapPosition);
+                disposalTrunk = entityManager.SpawnEntity("DisposalTrunkDummy", coordinates);
 
                 // Test for components existing
                 unitUid = disposalUnit;
@@ -204,10 +202,10 @@ await server.WaitAssertion(() =>
 
             await server.WaitAssertion(() =>
             {
-                // Move the disposal trunk away
-                var xform = entityManager.GetComponent<TransformComponent>(disposalTrunk);
                 var worldPos = xformSystem.GetWorldPosition(disposalTrunk);
-                xformSystem.SetWorldPosition(xform, worldPos + new Vector2(1, 0));
+
+                // Move the disposal trunk away
+                xformSystem.SetWorldPosition(disposalTrunk, worldPos + new Vector2(1, 0));
 
                 // Fail to flush with a mob and an item
                 Flush(disposalUnit, unitComponent, false, disposalSystem, human, wrench);
@@ -215,10 +213,12 @@ await server.WaitAssertion(() =>
 
             await server.WaitAssertion(() =>
             {
-                // Move the disposal trunk back
                 var xform = entityManager.GetComponent<TransformComponent>(disposalTrunk);
-                var worldPos = xformSystem.GetWorldPosition(disposalTrunk);
-                xformSystem.SetWorldPosition(xform, worldPos - new Vector2(1, 0));
+                var worldPos = xformSystem.GetWorldPosition(disposalUnit);
+
+                // Move the disposal trunk back
+                xformSystem.SetWorldPosition(disposalTrunk, worldPos);
+                xformSystem.AnchorEntity((disposalTrunk, xform));
 
                 // Fail to flush with a mob and an item, no power
                 Flush(disposalUnit, unitComponent, false, disposalSystem, human, wrench);
@@ -240,6 +240,7 @@ await server.WaitAssertion(() =>
                 // Re-pressurizing
                 Flush(disposalUnit, unitComponent, false, disposalSystem);
             });
+
             await pair.CleanReturnAsync();
         }
     }
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 152eb725221..d3b1fb47221 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -354,41 +354,18 @@ public async Task AllComponentsOneToOneDeleteTest()
 
             await using var pair = await PoolManager.GetServerClient();
             var server = pair.Server;
-
-            var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
             var componentFactory = server.ResolveDependency<IComponentFactory>();
-            var tileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
-            var mapSystem = entityManager.System<SharedMapSystem>();
             var logmill = server.ResolveDependency<ILogManager>().GetSawmill("EntityTest");
 
-            Entity<MapGridComponent> grid = default!;
-
-            await server.WaitPost(() =>
-            {
-                // Create a one tile grid to stave off the grid 0 monsters
-                var mapId = mapManager.CreateMap();
-
-                mapManager.AddUninitializedMap(mapId);
-
-                grid = mapManager.CreateGridEntity(mapId);
-
-                var tileDefinition = tileDefinitionManager["Plating"];
-                var tile = new Tile(tileDefinition.TileId);
-                var coordinates = new EntityCoordinates(grid.Owner, Vector2.Zero);
-
-                mapSystem.SetTile(grid.Owner, grid.Comp!, coordinates, tile);
-
-                mapManager.DoMapInitialize(mapId);
-            });
-
+            await pair.CreateTestMap();
             await server.WaitRunTicks(5);
+            var testLocation = pair.TestMap.GridCoords;
 
             await server.WaitAssertion(() =>
             {
                 Assert.Multiple(() =>
                 {
-                    var testLocation = new EntityCoordinates(grid.Owner, Vector2.Zero);
 
                     foreach (var type in componentFactory.AllRegisteredTypes)
                     {
diff --git a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
index 0d852bf2f0e..6e88d6928e6 100644
--- a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
@@ -72,7 +72,7 @@ await server.WaitPost(() =>
         var puddleOrigin = new Vector2i(0, 0);
         await server.WaitAssertion(() =>
         {
-            var grid = mapManager.GetGrid(gridId);
+            var grid = entityManager.GetComponent<MapGridComponent>(gridId);
             var solution = new Solution("Blood", FixedPoint2.New(100));
             var tileRef = grid.GetTileRef(puddleOrigin);
 #pragma warning disable NUnit2045 // Interdependent tests
@@ -86,7 +86,7 @@ await server.WaitAssertion(() =>
 
         await server.WaitAssertion(() =>
         {
-            var grid = mapManager.GetGrid(gridId);
+            var grid = entityManager.GetComponent<MapGridComponent>(gridId);
             var puddle = GetPuddleEntity(entityManager, grid, puddleOrigin);
 
 #pragma warning disable NUnit2045 // Interdependent tests
diff --git a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
index 3213bba51f9..a9069892dff 100644
--- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
@@ -46,17 +46,14 @@ public async Task SpaceNoPuddleTest()
             var server = pair.Server;
 
             var testMap = await pair.CreateTestMap();
+            var grid = testMap.Grid.Comp;
 
             var entitySystemManager = server.ResolveDependency<IEntitySystemManager>();
             var spillSystem = entitySystemManager.GetEntitySystem<PuddleSystem>();
 
-            MapGridComponent grid = null;
-
             // Remove all tiles
             await server.WaitPost(() =>
             {
-                grid = testMap.MapGrid;
-
                 foreach (var tile in grid.GetAllTiles())
                 {
                     grid.SetTile(tile.GridIndices, Tile.Empty);
@@ -67,7 +64,7 @@ await server.WaitPost(() =>
 
             await server.WaitAssertion(() =>
             {
-                var coordinates = grid.ToCoordinates();
+                var coordinates = grid.Owner.ToCoordinates();
                 var solution = new Solution("Water", FixedPoint2.New(20));
 
                 Assert.That(spillSystem.TrySpillAt(coordinates, solution, out _), Is.False);
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
index 1d5dd6d34e2..c6a8e618cc1 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
@@ -58,7 +58,6 @@ await server.WaitAssertion(() =>
 
                 var cuffableSys = entityManager.System<CuffableSystem>();
                 var xformSys = entityManager.System<SharedTransformSystem>();
-                var xformQuery = entityManager.GetEntityQuery<TransformComponent>();
 
                 // Spawn the entities
                 human = entityManager.SpawnEntity("HumanHandcuffDummy", coordinates);
@@ -66,8 +65,8 @@ await server.WaitAssertion(() =>
                 cuffs = entityManager.SpawnEntity("HandcuffsDummy", coordinates);
                 secondCuffs = entityManager.SpawnEntity("HandcuffsDummy", coordinates);
 
-                var coords = xformSys.GetWorldPosition(otherHuman, xformQuery);
-                xformSys.SetWorldPosition(human, coords, xformQuery);
+                var coords = xformSys.GetWorldPosition(otherHuman);
+                xformSys.SetWorldPosition(human, coords);
 
                 // Test for components existing
                 Assert.Multiple(() =>
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
index 88448e7b800..480fd9cde6f 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
@@ -989,7 +989,7 @@ protected void ToggleNeedPower(NetEntity? target = null)
     /// </summary>
     protected async Task AddGravity(EntityUid? uid = null)
     {
-        var target = uid ?? MapData.GridUid;
+        var target = uid ?? MapData.Grid;
         await Server.WaitPost(() =>
         {
             var gravity = SEntMan.EnsureComponent<GravityComponent>(target);
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index bed27ba6efe..a4ed31e9983 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -184,7 +184,7 @@ public virtual async Task Setup()
         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.MapGrid);
+        await SetTile(Plating, grid: MapData.Grid.Comp);
 
         // Get player data
         var sPlayerMan = Server.ResolveDependency<Robust.Server.Player.IPlayerManager>();
diff --git a/Content.IntegrationTests/Tests/Interaction/MovementTest.cs b/Content.IntegrationTests/Tests/Interaction/MovementTest.cs
index 553b031c2b7..dc5aec92cfc 100644
--- a/Content.IntegrationTests/Tests/Interaction/MovementTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/MovementTest.cs
@@ -31,7 +31,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.MapGrid);
+            await SetTile(Plating, SEntMan.GetNetCoordinates(pCoords.Offset(new Vector2(i, 0))), MapData.Grid.Comp);
         }
         AssertGridCount(1);
 
diff --git a/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs b/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs
new file mode 100644
index 00000000000..30724b50a6d
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs
@@ -0,0 +1,150 @@
+using System.Collections.Generic;
+using System.Linq;
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Reflection;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.IntegrationTests.Tests.Linter;
+
+/// <summary>
+/// Verify that the yaml linter successfully validates static fields
+/// </summary>
+[TestFixture]
+public sealed class StaticFieldValidationTest
+{
+    [Test]
+    public async Task TestStaticFieldValidation()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var protoMan = pair.Server.ProtoMan;
+
+        var protos = new Dictionary<Type, HashSet<string>>();
+        foreach (var kind in protoMan.EnumeratePrototypeKinds())
+        {
+            var ids = protoMan.EnumeratePrototypes(kind).Select(x => x.ID).ToHashSet();
+            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));
+        
+        await pair.CleanReturnAsync();
+    }
+
+    [TestPrototypes]
+    private const string TestPrototypes = @"
+- type: entity
+  id: StaticFieldTestEnt
+
+- type: Tag
+  id: StaticFieldTestTag
+";
+
+    [Reflect(false)] private sealed class StringValid
+    {
+        [ValidatePrototypeId<TagPrototype>] public static string Tag = "StaticFieldTestTag";
+    }
+
+    [Reflect(false)] private sealed class StringInvalid
+    {
+        [ValidatePrototypeId<TagPrototype>] public static string Tag = string.Empty;
+    }
+
+    [Reflect(false)] private sealed class StringArrayValid
+    {
+        [ValidatePrototypeId<TagPrototype>] public static string[] Tag = {"StaticFieldTestTag", "StaticFieldTestTag"};
+    }
+
+    [Reflect(false)] private sealed class StringArrayInvalid
+    {
+        [ValidatePrototypeId<TagPrototype>] public static string[] Tag = {string.Empty, "StaticFieldTestTag", string.Empty};
+    }
+
+    [Reflect(false)] private sealed class EntProtoIdValid
+    {
+        public static EntProtoId Tag = "StaticFieldTestEnt";
+    }
+
+    [Reflect(false)] private sealed class EntProtoIdInvalid
+    {
+        public static EntProtoId Tag = string.Empty;
+    }
+
+    [Reflect(false)] private sealed class EntProtoIdArrayValid
+    {
+        public static EntProtoId[] Tag = {"StaticFieldTestEnt", "StaticFieldTestEnt"};
+    }
+
+    [Reflect(false)] private sealed class EntProtoIdArrayInvalid
+    {
+        public static EntProtoId[] Tag = {string.Empty, "StaticFieldTestEnt", string.Empty};
+    }
+
+    [Reflect(false)] private sealed class ProtoIdTestValid
+    {
+        public static ProtoId<TagPrototype> Tag = "StaticFieldTestTag";
+    }
+
+    [Reflect(false)] private sealed class ProtoIdTestInvalid
+    {
+        public static ProtoId<TagPrototype> Tag = string.Empty;
+    }
+
+    [Reflect(false)] private sealed class ProtoIdArrayValid
+    {
+        public static ProtoId<TagPrototype>[] Tag = {"StaticFieldTestTag", "StaticFieldTestTag"};
+    }
+
+    [Reflect(false)] private sealed class ProtoIdArrayInvalid
+    {
+        public static ProtoId<TagPrototype>[] Tag = {string.Empty, "StaticFieldTestTag", string.Empty};
+    }
+
+    [Reflect(false)] private sealed class ProtoIdListValid
+    {
+        public static List<ProtoId<TagPrototype>> Tag = new() {"StaticFieldTestTag", "StaticFieldTestTag"};
+    }
+
+    [Reflect(false)] private sealed class ProtoIdListInvalid
+    {
+        public static List<ProtoId<TagPrototype>> Tag = new() {string.Empty, "StaticFieldTestTag", string.Empty};
+    }
+
+    [Reflect(false)] private sealed class ProtoIdSetValid
+    {
+        public static HashSet<ProtoId<TagPrototype>> Tag = new() {"StaticFieldTestTag", "StaticFieldTestTag"};
+    }
+
+    [Reflect(false)] private sealed class ProtoIdSetInvalid
+    {
+        public static HashSet<ProtoId<TagPrototype>> Tag = new() {string.Empty, "StaticFieldTestTag", string.Empty, " "};
+    }
+
+    [Reflect(false)] private sealed class PrivateProtoIdArrayValid
+    {
+        private static ProtoId<TagPrototype>[] Tag = {"StaticFieldTestTag", "StaticFieldTestTag"};
+    }
+
+    [Reflect(false)] private sealed class PrivateProtoIdArrayInvalid
+    {
+        private static ProtoId<TagPrototype>[] Tag = {string.Empty, "StaticFieldTestTag", string.Empty};
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
index 980559cc817..7bc62dfe2bc 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
@@ -19,7 +19,7 @@ public async Task DeleteAllThenGhost()
         await using var pair = await PoolManager.GetServerClient(settings);
 
         // Client is connected with a valid entity & mind
-        Assert.That(pair.Client.EntMan.EntityExists(pair.Client.Player?.ControlledEntity));
+        Assert.That(pair.Client.EntMan.EntityExists(pair.Client.AttachedEntity));
         Assert.That(pair.Server.EntMan.EntityExists(pair.PlayerData?.Mind));
 
         // Delete **everything**
@@ -28,6 +28,12 @@ public async Task DeleteAllThenGhost()
         await pair.RunTicksSync(5);
 
         Assert.That(pair.Server.EntMan.EntityCount, Is.EqualTo(0));
+
+        foreach (var ent in pair.Client.EntMan.GetEntities())
+        {
+            Console.WriteLine(pair.Client.EntMan.ToPrettyString(ent));
+        }
+
         Assert.That(pair.Client.EntMan.EntityCount, Is.EqualTo(0));
 
         // Create a new map.
@@ -36,7 +42,7 @@ public async Task DeleteAllThenGhost()
         await pair.RunTicksSync(5);
 
         // Client is not attached to anything
-        Assert.That(pair.Client.Player?.ControlledEntity, Is.Null);
+        Assert.That(pair.Client.AttachedEntity, Is.Null);
         Assert.That(pair.PlayerData?.Mind, Is.Null);
 
         // Attempt to ghost
@@ -45,9 +51,9 @@ public async Task DeleteAllThenGhost()
         await pair.RunTicksSync(10);
 
         // Client should be attached to a ghost placed on the new map.
-        Assert.That(pair.Client.EntMan.EntityExists(pair.Client.Player?.ControlledEntity));
+        Assert.That(pair.Client.EntMan.EntityExists(pair.Client.AttachedEntity));
         Assert.That(pair.Server.EntMan.EntityExists(pair.PlayerData?.Mind));
-        var xform = pair.Client.Transform(pair.Client.Player!.ControlledEntity!.Value);
+        var xform = pair.Client.Transform(pair.Client.AttachedEntity!.Value);
         Assert.That(xform.MapID, Is.EqualTo(new MapId(mapId)));
 
         await pair.CleanReturnAsync();
diff --git a/Content.IntegrationTests/Tests/Power/PowerTest.cs b/Content.IntegrationTests/Tests/Power/PowerTest.cs
index d4e2cde9b0d..a6af3e6a65b 100644
--- a/Content.IntegrationTests/Tests/Power/PowerTest.cs
+++ b/Content.IntegrationTests/Tests/Power/PowerTest.cs
@@ -176,16 +176,18 @@ await server.WaitAssertion(() =>
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
 
+                var gridOwner = grid.Owner;
+
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
+                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));
 
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
@@ -237,16 +239,18 @@ await server.WaitAssertion(() =>
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
 
+                var gridOwner = grid.Owner;
+
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
+                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));
 
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
@@ -292,16 +296,17 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 2));
 
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
@@ -383,16 +388,17 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("DischargingBatteryDummy", grid.ToCoordinates());
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("DischargingBatteryDummy", gridOwner.ToCoordinates());
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 2));
 
                 netBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(generatorEnt);
                 battery = entityManager.GetComponent<BatteryComponent>(generatorEnt);
@@ -486,17 +492,18 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1));
-                var batteryEnt = entityManager.SpawnEntity("DischargingBatteryDummy", grid.ToCoordinates(0, 2));
+                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));
                 netBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(batteryEnt);
                 battery = entityManager.GetComponent<BatteryComponent>(batteryEnt);
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
@@ -577,16 +584,17 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
-                var batteryEnt = entityManager.SpawnEntity("ChargingBatteryDummy", grid.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
+                var batteryEnt = entityManager.SpawnEntity("ChargingBatteryDummy", gridOwner.ToCoordinates(0, 2));
 
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 var netBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(batteryEnt);
@@ -635,20 +643,21 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // Power only works when anchored
                 for (var i = 0; i < 4; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                var terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
+                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));
 
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt);
@@ -712,20 +721,21 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // Power only works when anchored
                 for (var i = 0; i < 4; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                var terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
+                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));
 
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt);
@@ -787,6 +797,7 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // Map layout here is
                 // C - consumer
@@ -800,18 +811,18 @@ await server.WaitAssertion(() =>
                 for (var i = 0; i < 5; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2));
-                var terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2));
+                entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 1));
-                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 3));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 2));
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 4));
+                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));
 
                 consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
                 consumer2 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt2);
@@ -888,6 +899,7 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // 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
@@ -900,16 +912,16 @@ await server.WaitAssertion(() =>
                 for (var i = -2; i <= 2; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
-                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, -2));
+                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
+                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, -2));
 
-                var supplyEnt1 = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 1));
-                var supplyEnt2 = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, -1));
+                var supplyEnt1 = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 1));
+                var supplyEnt2 = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, -1));
 
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0));
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 0));
 
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                 supplier1 = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt1);
@@ -981,6 +993,7 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // Map layout here is
                 // C - consumer
@@ -994,18 +1007,18 @@ await server.WaitAssertion(() =>
                 for (var i = 0; i < 5; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2));
-                var terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2));
+                entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 1));
-                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 3));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 2));
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 4));
+                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));
 
                 consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
                 consumer2 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt2);
@@ -1068,20 +1081,21 @@ await server.WaitPost(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // Power only works when anchored
                 for (var i = 0; i < 4; i++)
                 {
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                 }
 
-                var terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
+                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));
 
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt);
@@ -1153,6 +1167,7 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // Power only works when anchored
                 for (var i = 0; i < 4; i++)
@@ -1160,15 +1175,15 @@ await server.WaitAssertion(() =>
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
                 }
 
-                var leftEnt = entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 0));
-                entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 1));
-                entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 2));
-                var rightEnt = entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 3));
+                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 terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var battery = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
+                var battery = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
                 var batteryNodeContainer = entityManager.GetComponent<NodeContainerComponent>(battery);
 
                 if (nodeContainer.TryGetNode<CableNode>(entityManager.GetComponent<NodeContainerComponent>(leftEnt),
@@ -1216,6 +1231,7 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
@@ -1223,14 +1239,14 @@ await server.WaitAssertion(() =>
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
                 }
 
-                entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 0));
-                entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 1));
-                entityManager.SpawnEntity("CableMV", grid.ToCoordinates(0, 1));
-                entityManager.SpawnEntity("CableMV", grid.ToCoordinates(0, 2));
+                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));
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
-                var substationEnt = entityManager.SpawnEntity("SubstationDummy", grid.ToCoordinates(0, 1));
-                var apcEnt = entityManager.SpawnEntity("ApcDummy", grid.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 generatorSupplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 substationNetBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(substationEnt);
@@ -1273,6 +1289,7 @@ await server.WaitAssertion(() =>
             {
                 var map = mapManager.CreateMap();
                 var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;
 
                 const int range = 5;
 
@@ -1282,15 +1299,15 @@ await server.WaitAssertion(() =>
                     grid.SetTile(new Vector2i(0, i), new Tile(1));
                 }
 
-                var apcEnt = entityManager.SpawnEntity("ApcDummy", grid.ToCoordinates(0, 0));
-                var apcExtensionEnt = entityManager.SpawnEntity("CableApcExtension", grid.ToCoordinates(0, 0));
+                var apcEnt = entityManager.SpawnEntity("ApcDummy", gridOwner.ToCoordinates(0, 0));
+                var apcExtensionEnt = entityManager.SpawnEntity("CableApcExtension", gridOwner.ToCoordinates(0, 0));
 
                 // Create a powered receiver in range (range is 0 indexed)
-                var powerReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", grid.ToCoordinates(0, range - 1));
+                var powerReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", gridOwner.ToCoordinates(0, range - 1));
                 receiver = entityManager.GetComponent<ApcPowerReceiverComponent>(powerReceiverEnt);
 
                 // Create an unpowered receiver outside range
-                var unpoweredReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", grid.ToCoordinates(0, range));
+                var unpoweredReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", gridOwner.ToCoordinates(0, range));
                 unpoweredReceiver = entityManager.GetComponent<ApcPowerReceiverComponent>(unpoweredReceiverEnt);
 
                 var battery = entityManager.GetComponent<BatteryComponent>(apcEnt);
diff --git a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs
index 6096c497efa..9e26fa5eaa2 100644
--- a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs
+++ b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs
@@ -38,31 +38,15 @@ public async Task UninitializedSaveTest()
         var mapManager = server.ResolveDependency<IMapManager>();
         var entityMan = server.ResolveDependency<IEntityManager>();
         var prototypeMan = server.ResolveDependency<IPrototypeManager>();
-        var tileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
         var seriMan = server.ResolveDependency<ISerializationManager>();
         var compFact = server.ResolveDependency<IComponentFactory>();
 
         var prototypes = new List<EntityPrototype>();
-        MapGridComponent grid = default!;
         EntityUid uid;
-        MapId mapId = default;
 
-        //Build up test environment
-        await server.WaitPost(() =>
-        {
-            // Create a one tile grid to stave off the grid 0 monsters
-            mapId = mapManager.CreateMap();
-
-            mapManager.AddUninitializedMap(mapId);
-
-            grid = mapManager.CreateGrid(mapId);
-
-            var tileDefinition = tileDefinitionManager["FloorSteel"]; // Wires n such disable ambiance while under the floor
-            var tile = new Tile(tileDefinition.TileId);
-            var coordinates = grid.ToCoordinates();
-
-            grid.SetTile(coordinates, tile);
-        });
+        await pair.CreateTestMap(false, "FloorSteel"); // Wires n such disable ambiance while under the floor
+        var mapId = pair.TestMap.MapId;
+        var grid = pair.TestMap.Grid;
 
         await server.WaitRunTicks(5);
 
@@ -94,7 +78,7 @@ await server.WaitPost(() =>
         await server.WaitAssertion(() =>
         {
             Assert.That(!mapManager.IsMapInitialized(mapId));
-            var testLocation = grid.ToCoordinates();
+            var testLocation = grid.Owner.ToCoordinates();
 
             Assert.Multiple(() =>
             {
diff --git a/Content.IntegrationTests/Tests/Puller/PullerTest.cs b/Content.IntegrationTests/Tests/Puller/PullerTest.cs
index ba91f54ff77..87d174f7272 100644
--- a/Content.IntegrationTests/Tests/Puller/PullerTest.cs
+++ b/Content.IntegrationTests/Tests/Puller/PullerTest.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Hands.Components;
+using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Prototypes;
-using Content.Shared.Pulling.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
@@ -29,7 +29,7 @@ await server.WaitAssertion(() =>
             {
                 foreach (var proto in protoManager.EnumeratePrototypes<EntityPrototype>())
                 {
-                    if (!proto.TryGetComponent(out SharedPullerComponent? puller))
+                    if (!proto.TryGetComponent(out PullerComponent? puller))
                         continue;
 
                     if (!puller.NeedsHands)
diff --git a/Content.IntegrationTests/Tests/Shuttle/DockTest.cs b/Content.IntegrationTests/Tests/Shuttle/DockTest.cs
index b6fc273570a..a1aa462a697 100644
--- a/Content.IntegrationTests/Tests/Shuttle/DockTest.cs
+++ b/Content.IntegrationTests/Tests/Shuttle/DockTest.cs
@@ -39,7 +39,7 @@ public async Task TestDockingConfig(Vector2 dock1Pos, Vector2 dock2Pos, Angle do
 
         await server.WaitAssertion(() =>
         {
-            entManager.DeleteEntity(map.GridUid);
+            entManager.DeleteEntity(map.Grid);
             var grid1 = mapManager.CreateGridEntity(mapId);
             var grid2 = mapManager.CreateGridEntity(mapId);
             var grid1Ent = grid1.Owner;
@@ -104,7 +104,7 @@ public async Task TestPlanetDock()
         // Spawn shuttle and affirm no valid docks.
         await server.WaitAssertion(() =>
         {
-            entManager.DeleteEntity(map.GridUid);
+            entManager.DeleteEntity(map.Grid);
             Assert.That(entManager.System<MapLoaderSystem>().TryLoad(otherMap.MapId, "/Maps/Shuttles/emergency.yml", out var rootUids));
             shuttle = rootUids[0];
 
diff --git a/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs b/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
index 0a2af88887a..083e817d697 100644
--- a/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
+++ b/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
@@ -37,7 +37,7 @@ public async Task CutThenPlaceLatticeNewGrid()
         // Remove grid
         await SetTile(null);
         await SetTile(null, PlayerCoords);
-        Assert.That(MapData.MapGrid.Deleted);
+        Assert.That(MapData.Grid.Comp.Deleted);
         AssertGridCount(0);
 
         // Place Lattice
@@ -70,7 +70,7 @@ public async Task FloorConstructDeconstruct()
         // Remove grid
         await SetTile(null);
         await SetTile(null, PlayerCoords);
-        Assert.That(MapData.MapGrid.Deleted);
+        Assert.That(MapData.Grid.Comp.Deleted);
         AssertGridCount(0);
 
         // Space -> Lattice
diff --git a/Content.Packaging/ClientPackaging.cs b/Content.Packaging/ClientPackaging.cs
index a989ebd968e..a66d4ec5b91 100644
--- a/Content.Packaging/ClientPackaging.cs
+++ b/Content.Packaging/ClientPackaging.cs
@@ -13,7 +13,7 @@ public static class ClientPackaging
     /// <summary>
     /// Be advised this can be called from server packaging during a HybridACZ build.
     /// </summary>
-    public static async Task PackageClient(bool skipBuild, IPackageLogger logger)
+    public static async Task PackageClient(bool skipBuild, string configuration, IPackageLogger logger)
     {
         logger.Info("Building client...");
 
@@ -26,7 +26,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
                 {
                     "build",
                     Path.Combine("Content.Client", "Content.Client.csproj"),
-                    "-c", "Release",
+                    "-c", configuration,
                     "--nologo",
                     "/v:m",
                     "/t:Rebuild",
diff --git a/Content.Packaging/CommandLineArgs.cs b/Content.Packaging/CommandLineArgs.cs
index 9f2b0755357..23f661921e0 100644
--- a/Content.Packaging/CommandLineArgs.cs
+++ b/Content.Packaging/CommandLineArgs.cs
@@ -31,6 +31,11 @@ public sealed class CommandLineArgs
     /// </summary>
     public bool HybridAcz { get; set; }
 
+    /// <summary>
+    /// Configuration used for when packaging the server. (Release, Debug, Tools)
+    /// </summary>
+    public string Configuration { get; set; }
+
     // CommandLineArgs, 3rd of her name.
     public static bool TryParse(IReadOnlyList<string> args, [NotNullWhen(true)] out CommandLineArgs? parsed)
     {
@@ -39,6 +44,7 @@ public static bool TryParse(IReadOnlyList<string> args, [NotNullWhen(true)] out
         var skipBuild = false;
         var wipeRelease = true;
         var hybridAcz = false;
+        var configuration = "Release";
         List<string>? platforms = null;
 
         using var enumerator = args.GetEnumerator();
@@ -89,6 +95,16 @@ public static bool TryParse(IReadOnlyList<string> args, [NotNullWhen(true)] out
                 platforms ??= new List<string>();
                 platforms.Add(enumerator.Current);
             }
+            else if (arg == "--configuration")
+            {
+                if (!enumerator.MoveNext())
+                {
+                    Console.WriteLine("No configuration provided");
+                    return false;
+                }
+
+                configuration = enumerator.Current;
+            }
             else if (arg == "--help")
             {
                 PrintHelp();
@@ -106,7 +122,7 @@ public static bool TryParse(IReadOnlyList<string> args, [NotNullWhen(true)] out
             return false;
         }
 
-        parsed = new CommandLineArgs(client.Value, skipBuild, wipeRelease, hybridAcz, platforms);
+        parsed = new CommandLineArgs(client.Value, skipBuild, wipeRelease, hybridAcz, platforms, configuration);
         return true;
     }
 
@@ -120,6 +136,7 @@ private static void PrintHelp()
   --no-wipe-release     Don't wipe the release folder before creating files.
   --hybrid-acz          Use HybridACZ for server builds.
   --platform            Platform for server builds. Default will output several x64 targets.
+  --configuration       Configuration to use for building the server (Release, Debug, Tools). Default is Release.
 ");
     }
 
@@ -128,12 +145,14 @@ private CommandLineArgs(
         bool skipBuild,
         bool wipeRelease,
         bool hybridAcz,
-        List<string>? platforms)
+        List<string>? platforms,
+        string configuration)
     {
         Client = client;
         SkipBuild = skipBuild;
         WipeRelease = wipeRelease;
         HybridAcz = hybridAcz;
         Platforms = platforms;
+        Configuration = configuration;
     }
 }
diff --git a/Content.Packaging/Program.cs b/Content.Packaging/Program.cs
index ba5924ec3e9..65c0e0131a4 100644
--- a/Content.Packaging/Program.cs
+++ b/Content.Packaging/Program.cs
@@ -17,11 +17,11 @@
 
 if (parsed.Client)
 {
-    await ClientPackaging.PackageClient(parsed.SkipBuild, logger);
+    await ClientPackaging.PackageClient(parsed.SkipBuild, parsed.Configuration, logger);
 }
 else
 {
-    await ServerPackaging.PackageServer(parsed.SkipBuild, parsed.HybridAcz, logger, parsed.Platforms);
+    await ServerPackaging.PackageServer(parsed.SkipBuild, parsed.HybridAcz, logger, parsed.Configuration, parsed.Platforms);
 }
 
 void WipeBin()
diff --git a/Content.Packaging/ServerPackaging.cs b/Content.Packaging/ServerPackaging.cs
index ba489629f79..d9ca57c4d11 100644
--- a/Content.Packaging/ServerPackaging.cs
+++ b/Content.Packaging/ServerPackaging.cs
@@ -69,7 +69,7 @@ public static class ServerPackaging
         "zh-Hant"
     };
 
-    public static async Task PackageServer(bool skipBuild, bool hybridAcz, IPackageLogger logger, List<string>? platforms = null)
+    public static async Task PackageServer(bool skipBuild, bool hybridAcz, IPackageLogger logger, string configuration, List<string>? platforms = null)
     {
         if (platforms == null)
         {
@@ -82,7 +82,7 @@ public static async Task PackageServer(bool skipBuild, bool hybridAcz, IPackageL
             // Rather than hosting the client ZIP on the watchdog or on a separate server,
             //  Hybrid ACZ uses the ACZ hosting functionality to host it as part of the status host,
             //  which means that features such as automatic UPnP forwarding still work properly.
-            await ClientPackaging.PackageClient(skipBuild, logger);
+            await ClientPackaging.PackageClient(skipBuild, configuration, logger);
         }
 
         // Good variable naming right here.
@@ -91,13 +91,13 @@ public static async Task PackageServer(bool skipBuild, bool hybridAcz, IPackageL
             if (!platforms.Contains(platform.Rid))
                 continue;
 
-            await BuildPlatform(platform, skipBuild, hybridAcz, logger);
+            await BuildPlatform(platform, skipBuild, hybridAcz, configuration, logger);
         }
     }
 
-    private static async Task BuildPlatform(PlatformReg platform, bool skipBuild, bool hybridAcz, IPackageLogger logger)
+    private static async Task BuildPlatform(PlatformReg platform, bool skipBuild, bool hybridAcz, string configuration, IPackageLogger logger)
     {
-        logger.Info($"Building project for {platform}...");
+        logger.Info($"Building project for {platform.TargetOs}...");
 
         if (!skipBuild)
         {
@@ -108,7 +108,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
                 {
                     "build",
                     Path.Combine("Content.Server", "Content.Server.csproj"),
-                    "-c", "Release",
+                    "-c", configuration,
                     "--nologo",
                     "/v:m",
                     $"/p:TargetOs={platform.TargetOs}",
@@ -118,7 +118,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
                 }
             });
 
-            await PublishClientServer(platform.Rid, platform.TargetOs);
+            await PublishClientServer(platform.Rid, platform.TargetOs, configuration);
         }
 
         logger.Info($"Packaging {platform.Rid} server...");
@@ -137,7 +137,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
         logger.Info($"Finished packaging server in {sw.Elapsed}");
     }
 
-    private static async Task PublishClientServer(string runtime, string targetOs)
+    private static async Task PublishClientServer(string runtime, string targetOs, string configuration)
     {
         await ProcessHelpers.RunCheck(new ProcessStartInfo
         {
@@ -147,7 +147,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
                 "publish",
                 "--runtime", runtime,
                 "--no-self-contained",
-                "-c", "Release",
+                "-c", configuration,
                 $"/p:TargetOs={targetOs}",
                 "/p:FullRelease=True",
                 "/m",
diff --git a/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.Designer.cs
new file mode 100644
index 00000000000..bb165c37e8c
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.Designer.cs
@@ -0,0 +1,1766 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20240409013837_FixRoundStartDateNullability")]
+    partial class FixRoundStartDateNullability
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.cs b/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.cs
new file mode 100644
index 00000000000..84b296d4fea
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240409013837_FixRoundStartDateNullability.cs
@@ -0,0 +1,40 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class FixRoundStartDateNullability : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "start_date",
+                table: "round",
+                type: "timestamp with time zone",
+                nullable: true,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp with time zone",
+                oldDefaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.Sql("UPDATE round SET start_date = NULL WHERE start_date = '-Infinity';");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "start_date",
+                table: "round",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp with time zone",
+                oldNullable: true);
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index f6ae50c269f..8fbcbf28356 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -882,10 +882,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("server_id");
 
-                    b.Property<DateTime>("StartDate")
-                        .ValueGeneratedOnAdd()
+                    b.Property<DateTime?>("StartDate")
                         .HasColumnType("timestamp with time zone")
-                        .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified))
                         .HasColumnName("start_date");
 
                     b.HasKey("Id")
diff --git a/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.Designer.cs
new file mode 100644
index 00000000000..e3ca0e78bd8
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.Designer.cs
@@ -0,0 +1,1697 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20240409013832_FixRoundStartDateNullability")]
+    partial class FixRoundStartDateNullability
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.cs b/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.cs
new file mode 100644
index 00000000000..dbfd7776ba5
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240409013832_FixRoundStartDateNullability.cs
@@ -0,0 +1,38 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class FixRoundStartDateNullability : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "start_date",
+                table: "round",
+                type: "TEXT",
+                nullable: true,
+                oldClrType: typeof(DateTime),
+                oldType: "TEXT",
+                oldDefaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "start_date",
+                table: "round",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                oldClrType: typeof(DateTime),
+                oldType: "TEXT",
+                oldNullable: true);
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.Designer.cs
new file mode 100644
index 00000000000..2ec05cdd45a
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.Designer.cs
@@ -0,0 +1,1697 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20240409014937_FixRoundStartDateNullability2")]
+    partial class FixRoundStartDateNullability2
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.cs b/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.cs
new file mode 100644
index 00000000000..01b90f8333d
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240409014937_FixRoundStartDateNullability2.cs
@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class FixRoundStartDateNullability2 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // This needs to be its own separate migration,
+            // because EF Core re-arranges the order of the commands if it's a single migration...
+            // (only relevant for SQLite since it needs cursed shit to do ALTER COLUMN)
+            migrationBuilder.Sql("UPDATE round SET start_date = NULL WHERE start_date = '0001-01-01 00:00:00';");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 8aa2e579222..e711247bc37 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -831,10 +831,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("INTEGER")
                         .HasColumnName("server_id");
 
-                    b.Property<DateTime>("StartDate")
-                        .ValueGeneratedOnAdd()
+                    b.Property<DateTime?>("StartDate")
                         .HasColumnType("TEXT")
-                        .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified))
                         .HasColumnName("start_date");
 
                     b.HasKey("Id")
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index dfb584b3f4b..6c6ae279df5 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -122,10 +122,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<Round>()
                 .HasIndex(round => round.StartDate);
 
-            modelBuilder.Entity<Round>()
-                .Property(round => round.StartDate)
-                .HasDefaultValue(default(DateTime));
-
             modelBuilder.Entity<AdminLogPlayer>()
                 .HasKey(logPlayer => new {logPlayer.RoundId, logPlayer.LogId, logPlayer.PlayerUserId});
 
@@ -510,7 +506,7 @@ public class Round
         [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int Id { get; set; }
 
-        public DateTime StartDate { get; set; }
+        public DateTime? StartDate { get; set; }
 
         public List<Player> Players { get; set; } = default!;
 
@@ -895,8 +891,35 @@ public sealed class UploadedResourceLog
         public byte[] Data { get; set; } = default!;
     }
 
+    // Note: this interface isn't used by the game, but it *is* used by SS14.Admin.
+    // Don't remove! Or face the consequences!
+    public interface IAdminRemarksCommon
+    {
+        public int Id { get; }
+
+        public int? RoundId { get; }
+        public Round? Round { get; }
+
+        public Guid? PlayerUserId { get; }
+        public Player? Player { get; }
+        public TimeSpan PlaytimeAtNote { get; }
+
+        public string Message { get; }
+
+        public Player? CreatedBy { get; }
+
+        public DateTime CreatedAt { get; }
+
+        public Player? LastEditedBy { get; }
+
+        public DateTime? LastEditedAt { get; }
+        public DateTime? ExpirationTime { get; }
+
+        public bool Deleted { get; }
+    }
+
     [Index(nameof(PlayerUserId))]
-    public class AdminNote
+    public class AdminNote : IAdminRemarksCommon
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 
@@ -930,7 +953,7 @@ public class AdminNote
     }
 
     [Index(nameof(PlayerUserId))]
-    public class AdminWatchlist
+    public class AdminWatchlist : IAdminRemarksCommon
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 
@@ -961,7 +984,7 @@ public class AdminWatchlist
     }
 
     [Index(nameof(PlayerUserId))]
-    public class AdminMessage
+    public class AdminMessage : IAdminRemarksCommon
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 
diff --git a/Content.Server/Abilities/Borgs/FabricateActionsComponent.cs b/Content.Server/Abilities/Borgs/FabricateActionsComponent.cs
new file mode 100644
index 00000000000..c9a693562ff
--- /dev/null
+++ b/Content.Server/Abilities/Borgs/FabricateActionsComponent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Abilities.Borgs;
+
+[RegisterComponent]
+public sealed partial class FabricateActionsComponent : Component
+{
+    /// <summary>
+    ///     IDs of fabrication actions that the entity should receive with this component.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<EntityPrototype>> Actions = new();
+
+    /// <summary>
+    ///     Action entities added by this component.
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<EntityPrototype>, EntityUid> ActionEntities = new();
+}
diff --git a/Content.Server/Abilities/Borgs/FabricateActionsSystem.cs b/Content.Server/Abilities/Borgs/FabricateActionsSystem.cs
new file mode 100644
index 00000000000..c73b46c0b8e
--- /dev/null
+++ b/Content.Server/Abilities/Borgs/FabricateActionsSystem.cs
@@ -0,0 +1,53 @@
+using Content.Shared.ActionBlocker;
+using Content.Shared.Actions;
+using Content.Shared.Actions.Events;
+
+namespace Content.Server.Abilities.Borgs;
+
+public sealed partial class FabricateActionsSystem : EntitySystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FabricateActionsComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<FabricateActionsComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<FabricateActionsComponent, FabricateActionEvent>(OnFabricate);
+    }
+
+
+    private void OnStartup(Entity<FabricateActionsComponent> entity, ref ComponentStartup args)
+    {
+        foreach (var actionId in entity.Comp.Actions)
+        {
+            EntityUid? actionEntity = null;
+            if (_actions.AddAction(entity, ref actionEntity, actionId))
+                entity.Comp.ActionEntities[actionId] = actionEntity.Value;
+        }
+    }
+
+    private void OnShutdown(Entity<FabricateActionsComponent> entity, ref ComponentShutdown args)
+    {
+        foreach (var (actionId, actionEntity) in entity.Comp.ActionEntities)
+        {
+            if (actionEntity is not { Valid: true })
+                continue;
+
+            _actions.RemoveAction(entity, actionEntity);
+            entity.Comp.ActionEntities.Remove(actionId);
+        }
+    }
+
+    private void OnFabricate(Entity<FabricateActionsComponent> entity, ref FabricateActionEvent args)
+    {
+        if (args.Handled || !_actionBlocker.CanConsciouslyPerformAction(entity))
+            return;
+
+        SpawnNextToOrDrop(args.Fabrication, entity);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Server/Access/Systems/AccessOverriderSystem.cs b/Content.Server/Access/Systems/AccessOverriderSystem.cs
index 10d7fd0f7a7..d0b8c31ab69 100644
--- a/Content.Server/Access/Systems/AccessOverriderSystem.cs
+++ b/Content.Server/Access/Systems/AccessOverriderSystem.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Server.Popups;
+using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Administration.Logs;
@@ -12,6 +13,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.AccessOverriderComponent;
 
 namespace Content.Server.Access.Systems;
@@ -26,6 +28,7 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
 
     public override void Initialize()
     {
@@ -109,17 +112,20 @@ private void UpdateUserInterface(EntityUid uid, AccessOverriderComponent compone
         var targetLabel = Loc.GetString("access-overrider-window-no-target");
         var targetLabelColor = Color.Red;
 
-        string[]? possibleAccess = null;
-        string[]? currentAccess = null;
-        string[]? missingAccess = null;
+        ProtoId<AccessLevelPrototype>[]? possibleAccess = null;
+        ProtoId<AccessLevelPrototype>[]? currentAccess = null;
+        ProtoId<AccessLevelPrototype>[]? missingAccess = null;
 
         if (component.TargetAccessReaderId is { Valid: true } accessReader)
         {
             targetLabel = Loc.GetString("access-overrider-window-target-label") + " " + EntityManager.GetComponent<MetaDataComponent>(component.TargetAccessReaderId).EntityName;
             targetLabelColor = Color.White;
 
-            List<HashSet<string>> currentAccessHashsets = EntityManager.GetComponent<AccessReaderComponent>(accessReader).AccessLists;
-            currentAccess = ConvertAccessHashSetsToList(currentAccessHashsets)?.ToArray();
+            if (!_accessReader.GetMainAccessReader(accessReader, out var accessReaderComponent))
+                return;
+
+            var currentAccessHashsets = accessReaderComponent.AccessLists;
+            currentAccess = ConvertAccessHashSetsToList(currentAccessHashsets).ToArray();
         }
 
         if (component.PrivilegedIdSlot.Item is { Valid: true } idCard)
@@ -152,15 +158,15 @@ private void UpdateUserInterface(EntityUid uid, AccessOverriderComponent compone
         _userInterface.TrySetUiState(uid, AccessOverriderUiKey.Key, newState);
     }
 
-    private List<string> ConvertAccessHashSetsToList(List<HashSet<string>> accessHashsets)
+    private List<ProtoId<AccessLevelPrototype>> ConvertAccessHashSetsToList(List<HashSet<ProtoId<AccessLevelPrototype>>> accessHashsets)
     {
-        List<string> accessList = new List<string>();
+        List<ProtoId<AccessLevelPrototype>> accessList = new List<ProtoId<AccessLevelPrototype>>();
 
         if (accessHashsets != null && accessHashsets.Any())
         {
-            foreach (HashSet<string> hashSet in accessHashsets)
+            foreach (HashSet<ProtoId<AccessLevelPrototype>> hashSet in accessHashsets)
             {
-                foreach (string hash in hashSet.ToArray())
+                foreach (ProtoId<AccessLevelPrototype> hash in hashSet.ToArray())
                 {
                     accessList.Add(hash);
                 }
@@ -170,15 +176,15 @@ private List<string> ConvertAccessHashSetsToList(List<HashSet<string>> accessHas
         return accessList;
     }
 
-    private List<HashSet<string>> ConvertAccessListToHashSet(List<string> accessList)
+    private List<HashSet<ProtoId<AccessLevelPrototype>>> ConvertAccessListToHashSet(List<ProtoId<AccessLevelPrototype>> accessList)
     {
-        List<HashSet<string>> accessHashsets = new List<HashSet<string>>();
+        List<HashSet<ProtoId<AccessLevelPrototype>>> accessHashsets = new List<HashSet<ProtoId<AccessLevelPrototype>>>();
 
         if (accessList != null && accessList.Any())
         {
-            foreach (string access in accessList)
+            foreach (ProtoId<AccessLevelPrototype> access in accessList)
             {
-                accessHashsets.Add(new HashSet<string>() { access });
+                accessHashsets.Add(new HashSet<ProtoId<AccessLevelPrototype>>() { access });
             }
         }
 
@@ -189,7 +195,7 @@ private List<HashSet<string>> ConvertAccessListToHashSet(List<string> accessList
     /// Called whenever an access button is pressed, adding or removing that access requirement from the target access reader.
     /// </summary>
     private void TryWriteToTargetAccessReaderId(EntityUid uid,
-        List<string> newAccessList,
+        List<ProtoId<AccessLevelPrototype>> newAccessList,
         EntityUid player,
         AccessOverriderComponent? component = null)
     {
@@ -212,9 +218,7 @@ private void TryWriteToTargetAccessReaderId(EntityUid uid,
             return;
         }
 
-        TryComp(component.TargetAccessReaderId, out AccessReaderComponent? accessReader);
-
-        if (accessReader == null)
+        if (!_accessReader.GetMainAccessReader(component.TargetAccessReaderId, out var accessReader))
             return;
 
         var oldTags = ConvertAccessHashSetsToList(accessReader.AccessLists);
@@ -263,10 +267,10 @@ private bool PrivilegedIdIsAuthorized(EntityUid uid, AccessOverriderComponent? c
         if (!Resolve(uid, ref component))
             return true;
 
-        if (!EntityManager.TryGetComponent<AccessReaderComponent>(uid, out var reader))
+        if (_accessReader.GetMainAccessReader(uid, out var accessReader))
             return true;
 
         var privilegedId = component.PrivilegedIdSlot.Item;
-        return privilegedId != null && _accessReader.IsAllowed(privilegedId.Value, uid, reader);
+        return privilegedId != null && _accessReader.IsAllowed(privilegedId.Value, uid, accessReader);
     }
 }
diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
index 791159f972b..db8b9d036e8 100644
--- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs
+++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
@@ -12,6 +12,7 @@
 using Robust.Shared.Prototypes;
 using System.Linq;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
+using Content.Shared.Access;
 
 namespace Content.Server.Access.Systems;
 
@@ -54,11 +55,11 @@ private void UpdateUserInterface(EntityUid uid, IdCardConsoleComponent component
             return;
 
         var privilegedIdName = string.Empty;
-        string[]? possibleAccess = null;
+        List<ProtoId<AccessLevelPrototype>>? possibleAccess = null;
         if (component.PrivilegedIdSlot.Item is { Valid: true } item)
         {
             privilegedIdName = EntityManager.GetComponent<MetaDataComponent>(item).EntityName;
-            possibleAccess = _accessReader.FindAccessTags(item).ToArray();
+            possibleAccess = _accessReader.FindAccessTags(item).ToList();
         }
 
         IdCardConsoleBoundUserInterfaceState newState;
@@ -82,7 +83,7 @@ private void UpdateUserInterface(EntityUid uid, IdCardConsoleComponent component
             var targetIdComponent = EntityManager.GetComponent<IdCardComponent>(targetId);
             var targetAccessComponent = EntityManager.GetComponent<AccessComponent>(targetId);
 
-            var jobProto = string.Empty;
+            var jobProto = new ProtoId<AccessLevelPrototype>(string.Empty);
             if (TryComp<StationRecordKeyStorageComponent>(targetId, out var keyStorage)
                 && keyStorage.Key is {} key
                 && _record.TryGetRecord<GeneralStationRecord>(key, out var record))
@@ -96,7 +97,7 @@ private void UpdateUserInterface(EntityUid uid, IdCardConsoleComponent component
                 true,
                 targetIdComponent.FullName,
                 targetIdComponent.JobTitle,
-                targetAccessComponent.Tags.ToArray(),
+                targetAccessComponent.Tags.ToList(),
                 possibleAccess,
                 jobProto,
                 privilegedIdName,
@@ -113,8 +114,8 @@ private void UpdateUserInterface(EntityUid uid, IdCardConsoleComponent component
     private void TryWriteToTargetId(EntityUid uid,
         string newFullName,
         string newJobTitle,
-        List<string> newAccessList,
-        string newJobProto,
+        List<ProtoId<AccessLevelPrototype>> newAccessList,
+        ProtoId<AccessLevelPrototype> newJobProto,
         EntityUid player,
         IdCardConsoleComponent? component = null)
     {
@@ -140,7 +141,7 @@ private void TryWriteToTargetId(EntityUid uid,
             return;
         }
 
-        var oldTags = _access.TryGetTags(targetId) ?? new List<string>();
+        var oldTags = _access.TryGetTags(targetId) ?? new List<ProtoId<AccessLevelPrototype>>();
         oldTags = oldTags.ToList();
 
         var privilegedId = component.PrivilegedIdSlot.Item;
@@ -189,7 +190,7 @@ private bool PrivilegedIdIsAuthorized(EntityUid uid, IdCardConsoleComponent? com
         return privilegedId != null && _accessReader.IsAllowed(privilegedId.Value, uid, reader);
     }
 
-    private void UpdateStationRecord(EntityUid uid, EntityUid targetId, string newFullName, string newJobTitle, JobPrototype? newJobProto)
+    private void UpdateStationRecord(EntityUid uid, EntityUid targetId, string newFullName, ProtoId<AccessLevelPrototype> newJobTitle, JobPrototype? newJobProto)
     {
         if (!TryComp<StationRecordKeyStorageComponent>(targetId, out var keyStorage)
             || keyStorage.Key is not { } key
diff --git a/Content.Server/Administration/Commands/AGhost.cs b/Content.Server/Administration/Commands/AGhost.cs
index d541b1c8840..935114e7a68 100644
--- a/Content.Server/Administration/Commands/AGhost.cs
+++ b/Content.Server/Administration/Commands/AGhost.cs
@@ -1,72 +1,122 @@
-using Content.Server.GameTicking;
+using System.Linq;
+using Content.Server.GameTicking;
+using Content.Server.Ghost;
+using Content.Server.Mind;
 using Content.Shared.Administration;
 using Content.Shared.Ghost;
 using Content.Shared.Mind;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 
-namespace Content.Server.Administration.Commands
+namespace Content.Server.Administration.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class AGhost : LocalizedCommands
 {
-    [AdminCommand(AdminFlags.Admin)]
-    public sealed class AGhost : IConsoleCommand
+    [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)
     {
-        [Dependency] private readonly IEntityManager _entities = default!;
+        if (args.Length == 1)
+        {
+            var names = _playerManager.Sessions.OrderBy(c => c.Name).Select(c => c.Name).ToArray();
+            return CompletionResult.FromHintOptions(names, LocalizationManager.GetString("shell-argument-username-optional-hint"));
+        }
 
-        public string Command => "aghost";
-        public string Description => "Makes you an admin ghost.";
-        public string Help => "aghost";
+        return CompletionResult.Empty;
+    }
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length > 1)
         {
-            var player = shell.Player;
-            if (player == null)
+            shell.WriteError(LocalizationManager.GetString("shell-wrong-arguments-number"));
+            return;
+        }
+
+        var player = shell.Player;
+        var self = player != null;
+        if (player == null)
+        {
+            // If you are not a player, you require a player argument.
+            if (args.Length == 0)
             {
-                shell.WriteLine("Nah");
+                shell.WriteError(LocalizationManager.GetString("shell-need-exactly-one-argument"));
                 return;
             }
 
-            var mindSystem = _entities.System<SharedMindSystem>();
-            if (!mindSystem.TryGetMind(player, out var mindId, out var mind))
+            var didFind = _playerManager.TryGetSessionByUsername(args[0], out player);
+            if (!didFind)
             {
-                shell.WriteLine("You can't ghost here!");
+                shell.WriteError(LocalizationManager.GetString("shell-target-player-does-not-exist"));
                 return;
             }
+        }
 
-            var metaDataSystem = _entities.System<MetaDataSystem>();
-
-            if (mind.VisitingEntity != default && _entities.TryGetComponent<GhostComponent>(mind.VisitingEntity, out var oldGhostComponent))
+        // If you are a player and a username is provided, a lookup is done to find the target player.
+        if (args.Length == 1)
+        {
+            var didFind = _playerManager.TryGetSessionByUsername(args[0], out player);
+            if (!didFind)
             {
-                mindSystem.UnVisit(mindId, mind);
-                // If already an admin ghost, then return to body.
-                if (oldGhostComponent.CanGhostInteract)
-                    return;
+                shell.WriteError(LocalizationManager.GetString("shell-target-player-does-not-exist"));
+                return;
             }
+        }
 
-            var canReturn = mind.CurrentEntity != null
-                            && !_entities.HasComponent<GhostComponent>(mind.CurrentEntity);
-            var coordinates = player.AttachedEntity != null
-                ? _entities.GetComponent<TransformComponent>(player.AttachedEntity.Value).Coordinates
-                : EntitySystem.Get<GameTicker>().GetObserverSpawnPoint();
-            var ghost = _entities.SpawnEntity(GameTicker.AdminObserverPrototypeName, coordinates);
-            _entities.GetComponent<TransformComponent>(ghost).AttachToGridOrMap();
+        var mindSystem = _entities.System<SharedMindSystem>();
+        var metaDataSystem = _entities.System<MetaDataSystem>();
+        var ghostSystem = _entities.System<SharedGhostSystem>();
+        var transformSystem = _entities.System<TransformSystem>();
+        var gameTicker = _entities.System<GameTicker>();
 
-            if (canReturn)
-            {
-                // TODO: Remove duplication between all this and "GamePreset.OnGhostAttempt()"...
-                if (!string.IsNullOrWhiteSpace(mind.CharacterName))
-                    metaDataSystem.SetEntityName(ghost, mind.CharacterName);
-                else if (!string.IsNullOrWhiteSpace(mind.Session?.Name))
-                    metaDataSystem.SetEntityName(ghost, mind.Session.Name);
+        if (!mindSystem.TryGetMind(player, out var mindId, out var mind))
+        {
+            shell.WriteError(self
+                ? LocalizationManager.GetString("aghost-no-mind-self")
+                : LocalizationManager.GetString("aghost-no-mind-other"));
+            return;
+        }
 
-                mindSystem.Visit(mindId, ghost, mind);
-            }
-            else
-            {
-                metaDataSystem.SetEntityName(ghost, player.Name);
-                mindSystem.TransferTo(mindId, ghost, mind: mind);
-            }
+        if (mind.VisitingEntity != default && _entities.TryGetComponent<GhostComponent>(mind.VisitingEntity, out var oldGhostComponent))
+        {
+            mindSystem.UnVisit(mindId, mind);
+            // If already an admin ghost, then return to body.
+            if (oldGhostComponent.CanGhostInteract)
+                return;
+        }
+
+        var canReturn = mind.CurrentEntity != null
+                        && !_entities.HasComponent<GhostComponent>(mind.CurrentEntity);
+        var coordinates = player!.AttachedEntity != null
+            ? _entities.GetComponent<TransformComponent>(player.AttachedEntity.Value).Coordinates
+            : gameTicker.GetObserverSpawnPoint();
+        var ghost = _entities.SpawnEntity(GameTicker.AdminObserverPrototypeName, coordinates);
+        transformSystem.AttachToGridOrMap(ghost, _entities.GetComponent<TransformComponent>(ghost));
+
+        if (canReturn)
+        {
+            // TODO: Remove duplication between all this and "GamePreset.OnGhostAttempt()"...
+            if (!string.IsNullOrWhiteSpace(mind.CharacterName))
+                metaDataSystem.SetEntityName(ghost, mind.CharacterName);
+            else if (!string.IsNullOrWhiteSpace(mind.Session?.Name))
+                metaDataSystem.SetEntityName(ghost, mind.Session.Name);
 
-            var comp = _entities.GetComponent<GhostComponent>(ghost);
-            EntitySystem.Get<SharedGhostSystem>().SetCanReturnToBody(comp, canReturn);
+            mindSystem.Visit(mindId, ghost, mind);
         }
+        else
+        {
+            metaDataSystem.SetEntityName(ghost, player.Name);
+            mindSystem.TransferTo(mindId, ghost, mind: mind);
+        }
+
+        var comp = _entities.GetComponent<GhostComponent>(ghost);
+        ghostSystem.SetCanReturnToBody(comp, canReturn);
     }
 }
diff --git a/Content.Server/Administration/Commands/AdminWhoCommand.cs b/Content.Server/Administration/Commands/AdminWhoCommand.cs
index 9765e8385f0..cf2f8c453c8 100644
--- a/Content.Server/Administration/Commands/AdminWhoCommand.cs
+++ b/Content.Server/Administration/Commands/AdminWhoCommand.cs
@@ -19,6 +19,16 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         var adminMgr = IoCManager.Resolve<IAdminManager>();
         var afk = IoCManager.Resolve<IAfkManager>();
 
+        var seeStealth = true;
+
+        // If null it (hopefully) means it is being called from the console.
+        if (shell.Player != null)
+        {
+            var playerData = adminMgr.GetAdminData(shell.Player);
+
+            seeStealth = playerData != null && playerData.CanStealth();
+        }
+
         var sb = new StringBuilder();
         var first = true;
         foreach (var admin in adminMgr.ActiveAdmins)
@@ -30,10 +40,16 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             var adminData = adminMgr.GetAdminData(admin)!;
             DebugTools.AssertNotNull(adminData);
 
+            if (adminData.Stealth && !seeStealth)
+                continue;
+
             sb.Append(admin.Name);
             if (adminData.Title is { } title)
                 sb.Append($": [{title}]");
 
+            if (adminData.Stealth)
+                sb.Append(" (S)");
+
             if (shell.Player is { } player && adminMgr.HasAdminFlag(player, AdminFlags.Admin))
             {
                 if (afk.IsAfk(admin))
diff --git a/Content.Server/Administration/Commands/PersistenceSaveCommand.cs b/Content.Server/Administration/Commands/PersistenceSaveCommand.cs
index 2684e85d5f1..7ef1932c568 100644
--- a/Content.Server/Administration/Commands/PersistenceSaveCommand.cs
+++ b/Content.Server/Administration/Commands/PersistenceSaveCommand.cs
@@ -1,11 +1,6 @@
-using Content.Server.GameTicking;
-using Content.Server.Ghost.Components;
-using Content.Server.Players;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
-using Content.Shared.Ghost;
 using Robust.Server.GameObjects;
-using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
@@ -17,7 +12,6 @@ namespace Content.Server.Administration.Commands;
 public sealed class PersistenceSave : IConsoleCommand
 {
     [Dependency] private readonly IConfigurationManager _config = default!;
-    [Dependency] private readonly IEntityManager _entities = default!;
     [Dependency] private readonly IEntitySystemManager _system = default!;
     [Dependency] private readonly IMapManager _map = default!;
 
diff --git a/Content.Server/Administration/Commands/PlayGlobalSoundCommand.cs b/Content.Server/Administration/Commands/PlayGlobalSoundCommand.cs
index ac55ce83259..f1a5a57aa65 100644
--- a/Content.Server/Administration/Commands/PlayGlobalSoundCommand.cs
+++ b/Content.Server/Administration/Commands/PlayGlobalSoundCommand.cs
@@ -6,6 +6,7 @@
 using Robust.Shared.Console;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Administration.Commands;
 
@@ -14,6 +15,7 @@ public sealed class PlayGlobalSoundCommand : IConsoleCommand
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly IResourceManager _res = default!;
 
     public string Command => "playglobalsound";
@@ -95,7 +97,7 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         {
             var hint = Loc.GetString("play-global-sound-command-arg-path");
 
-            var options = CompletionHelper.ContentFilePath(args[0], _res);
+            var options = CompletionHelper.AudioFilePath(args[0], _protoManager, _res);
 
             return CompletionResult.FromHintOptions(options, hint);
         }
diff --git a/Content.Server/Administration/Commands/StealthminCommand.cs b/Content.Server/Administration/Commands/StealthminCommand.cs
new file mode 100644
index 00000000000..aa0e77a794a
--- /dev/null
+++ b/Content.Server/Administration/Commands/StealthminCommand.cs
@@ -0,0 +1,34 @@
+using Content.Server.Administration.Managers;
+using Content.Shared.Administration;
+using JetBrains.Annotations;
+using Robust.Shared.Console;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Administration.Commands;
+
+[UsedImplicitly]
+[AdminCommand(AdminFlags.Stealth)]
+public sealed class StealthminCommand : LocalizedCommands
+{
+    public override string Command => "stealthmin";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+            var player = shell.Player;
+            if (player == null)
+            {
+                shell.WriteLine(Loc.GetString("cmd-stealthmin-no-console"));
+                return;
+            }
+
+            var mgr = IoCManager.Resolve<IAdminManager>();
+            var adminData = mgr.GetAdminData(player);
+
+            DebugTools.AssertNotNull(adminData);
+
+            if (!adminData!.Stealth)
+                mgr.Stealth(player);
+            else
+                mgr.UnStealth(player);
+    }
+}
diff --git a/Content.Server/Administration/Commands/VariantizeCommand.cs b/Content.Server/Administration/Commands/VariantizeCommand.cs
index 7aabd76335e..3f9b7efd07e 100644
--- a/Content.Server/Administration/Commands/VariantizeCommand.cs
+++ b/Content.Server/Administration/Commands/VariantizeCommand.cs
@@ -3,7 +3,6 @@
 using Robust.Shared.Console;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Random;
 
 namespace Content.Server.Administration.Commands;
 
@@ -11,7 +10,6 @@ namespace Content.Server.Administration.Commands;
 public sealed class VariantizeCommand : IConsoleCommand
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
 
     public string Command => "variantize";
diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
index 57d6e089bd4..19c56282937 100644
--- a/Content.Server/Administration/Managers/AdminManager.cs
+++ b/Content.Server/Administration/Managers/AdminManager.cs
@@ -98,6 +98,40 @@ public void DeAdmin(ICommonSession session)
             UpdateAdminStatus(session);
         }
 
+        public void Stealth(ICommonSession session)
+        {
+            if (!_admins.TryGetValue(session, out var reg))
+                throw new ArgumentException($"Player {session} is not an admin");
+
+            if (reg.Data.Stealth)
+                return;
+
+            var playerData = session.ContentData()!;
+            playerData.Stealthed = true;
+            reg.Data.Stealth = true;
+
+            _chat.DispatchServerMessage(session, Loc.GetString("admin-manager-stealthed-message"));
+            _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-self-de-admin-message", ("exAdminName", session.Name)), AdminFlags.Stealth);
+            _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-self-enable-stealth", ("stealthAdminName", session.Name)), flagWhitelist: AdminFlags.Stealth);
+        }
+
+        public void UnStealth(ICommonSession session)
+        {
+            if (!_admins.TryGetValue(session, out var reg))
+                throw new ArgumentException($"Player {session} is not an admin");
+
+            if (!reg.Data.Stealth)
+                return;
+
+            var playerData = session.ContentData()!;
+            playerData.Stealthed = false;
+            reg.Data.Stealth = false;
+
+            _chat.DispatchServerMessage(session, Loc.GetString("admin-manager-unstealthed-message"));
+            _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-self-re-admin-message", ("newAdminName", session.Name)), flagBlacklist: AdminFlags.Stealth);
+            _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-self-disable-stealth", ("exStealthAdminName", session.Name)), flagWhitelist: AdminFlags.Stealth);
+        }
+
         public void ReAdmin(ICommonSession session)
         {
             if (!_admins.TryGetValue(session, out var reg))
@@ -116,7 +150,16 @@ public void ReAdmin(ICommonSession session)
             plyData.ExplicitlyDeadminned = false;
             reg.Data.Active = true;
 
-            _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-self-re-admin-message", ("newAdminName", session.Name)));
+            if (!reg.Data.Stealth)
+            {
+                _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-self-re-admin-message", ("newAdminName", session.Name)));
+            }
+            else
+            {
+                _chat.DispatchServerMessage(session, Loc.GetString("admin-manager-stealthed-message"));
+                _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-self-re-admin-message",
+                    ("newAdminName", session.Name)), flagWhitelist: AdminFlags.Stealth);
+            }
 
             SendPermsChangedEvent(session);
             UpdateAdminStatus(session);
@@ -168,6 +211,9 @@ public async void ReloadAdmin(ICommonSession player)
 
                     _chat.DispatchServerMessage(player, Loc.GetString("admin-manager-admin-permissions-updated-message"));
                 }
+
+                if (player.ContentData()!.Stealthed)
+                    aData.Stealth = true;
             }
 
             SendPermsChangedEvent(player);
@@ -290,9 +336,14 @@ private void PlayerStatusChanged(object? sender, SessionStatusEventArgs e)
             }
             else if (e.NewStatus == SessionStatus.Disconnected)
             {
-                if (_admins.Remove(e.Session) && _cfg.GetCVar(CCVars.AdminAnnounceLogout))
+                if (_admins.Remove(e.Session, out var reg ) && _cfg.GetCVar(CCVars.AdminAnnounceLogout))
                 {
-                    _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-logout-message", ("name", e.Session.Name)));
+                    if (reg.Data.Stealth)
+                        _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-logout-message",
+                            ("name", e.Session.Name)), flagWhitelist: AdminFlags.Stealth);
+                    else
+                        _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-logout-message",
+                            ("name", e.Session.Name)));
                 }
             }
         }
@@ -315,13 +366,27 @@ private async void LoginAdminMaybe(ICommonSession session)
 
             _admins.Add(session, reg);
 
-            if (!session.ContentData()?.ExplicitlyDeadminned ?? false)
+            if (session.ContentData()?.Stealthed == true)
+                reg.Data.Stealth = true;
+
+            if (!session.ContentData()?.ExplicitlyDeadminned ?? true)
             {
                 reg.Data.Active = true;
 
                 if (_cfg.GetCVar(CCVars.AdminAnnounceLogin))
                 {
-                    _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-login-message", ("name", session.Name)));
+                    if (reg.Data.Stealth)
+                    {
+
+                        _chat.DispatchServerMessage(session, Loc.GetString("admin-manager-stealthed-message"));
+                        _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-login-message",
+                            ("name", session.Name)), flagWhitelist: AdminFlags.Stealth);
+                    }
+                    else
+                    {
+                        _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-login-message",
+                            ("name", session.Name)));
+                    }
                 }
 
                 SendPermsChangedEvent(session);
diff --git a/Content.Server/Administration/Managers/IAdminManager.cs b/Content.Server/Administration/Managers/IAdminManager.cs
index a52ec7b099c..95967b24aca 100644
--- a/Content.Server/Administration/Managers/IAdminManager.cs
+++ b/Content.Server/Administration/Managers/IAdminManager.cs
@@ -41,6 +41,16 @@ public interface IAdminManager : ISharedAdminManager
         /// </summary>
         void ReAdmin(ICommonSession session);
 
+        /// <summary>
+        ///     Make admin hidden from adminwho.
+        /// </summary>
+        void Stealth(ICommonSession session);
+
+        /// <summary>
+        ///     Unhide admin from adminwho.
+        /// </summary>
+        void UnStealth(ICommonSession session);
+
         /// <summary>
         ///     Re-loads the permissions of an player in case their admin data changed DB-side.
         /// </summary>
diff --git a/Content.Server/Administration/ServerApi.Utility.cs b/Content.Server/Administration/ServerApi.Utility.cs
new file mode 100644
index 00000000000..951e0039d69
--- /dev/null
+++ b/Content.Server/Administration/ServerApi.Utility.cs
@@ -0,0 +1,147 @@
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Robust.Server.ServerStatus;
+
+namespace Content.Server.Administration;
+
+public sealed partial class ServerApi
+{
+    private void RegisterHandler(HttpMethod method, string exactPath, Func<IStatusHandlerContext, Task> handler)
+    {
+        _statusHost.AddHandler(async context =>
+        {
+            if (context.RequestMethod != method || context.Url.AbsolutePath != exactPath)
+                return false;
+
+            if (!await CheckAccess(context))
+                return true;
+
+            await handler(context);
+            return true;
+        });
+    }
+
+    private void RegisterActorHandler(HttpMethod method, string exactPath, Func<IStatusHandlerContext, Actor, Task> handler)
+    {
+        RegisterHandler(method, exactPath, async context =>
+        {
+            if (await CheckActor(context) is not { } actor)
+                return;
+
+            await handler(context, actor);
+        });
+    }
+
+    /// <summary>
+    /// Async helper function which runs a task on the main thread and returns the result.
+    /// </summary>
+    private async Task<T> RunOnMainThread<T>(Func<T> func)
+    {
+        var taskCompletionSource = new TaskCompletionSource<T>();
+        _taskManager.RunOnMainThread(() =>
+        {
+            try
+            {
+                taskCompletionSource.TrySetResult(func());
+            }
+            catch (Exception e)
+            {
+                taskCompletionSource.TrySetException(e);
+            }
+        });
+
+        var result = await taskCompletionSource.Task;
+        return result;
+    }
+
+    /// <summary>
+    /// Runs an action on the main thread. This does not return any value and is meant to be used for void functions. Use <see cref="RunOnMainThread{T}"/> for functions that return a value.
+    /// </summary>
+    private async Task RunOnMainThread(Action action)
+    {
+        var taskCompletionSource = new TaskCompletionSource();
+        _taskManager.RunOnMainThread(() =>
+        {
+            try
+            {
+                action();
+                taskCompletionSource.TrySetResult();
+            }
+            catch (Exception e)
+            {
+                taskCompletionSource.TrySetException(e);
+            }
+        });
+
+        await taskCompletionSource.Task;
+    }
+
+    private async Task RunOnMainThread(Func<Task> action)
+    {
+        var taskCompletionSource = new TaskCompletionSource();
+        // ReSharper disable once AsyncVoidLambda
+        _taskManager.RunOnMainThread(async () =>
+        {
+            try
+            {
+                await action();
+                taskCompletionSource.TrySetResult();
+            }
+            catch (Exception e)
+            {
+                taskCompletionSource.TrySetException(e);
+            }
+        });
+
+        await taskCompletionSource.Task;
+    }
+
+    /// <summary>
+    /// Helper function to read JSON encoded data from the request body.
+    /// </summary>
+    private static async Task<T?> ReadJson<T>(IStatusHandlerContext context) where T : notnull
+    {
+        try
+        {
+            var json = await context.RequestBodyJsonAsync<T>();
+            if (json == null)
+                await RespondBadRequest(context, "Request body is null");
+
+            return json;
+        }
+        catch (Exception e)
+        {
+            await RespondBadRequest(context, "Unable to parse request body", ExceptionData.FromException(e));
+            return default;
+        }
+    }
+
+    private static async Task RespondError(
+        IStatusHandlerContext context,
+        ErrorCode errorCode,
+        HttpStatusCode statusCode,
+        string message,
+        ExceptionData? exception = null)
+    {
+        await context.RespondJsonAsync(new BaseResponse(message, errorCode, exception), statusCode)
+            .ConfigureAwait(false);
+    }
+
+    private static async Task RespondBadRequest(
+        IStatusHandlerContext context,
+        string message,
+        ExceptionData? exception = null)
+    {
+        await RespondError(context, ErrorCode.BadRequest, HttpStatusCode.BadRequest, message, exception)
+            .ConfigureAwait(false);
+    }
+
+    private static async Task RespondOk(IStatusHandlerContext context)
+    {
+        await context.RespondJsonAsync(new BaseResponse("OK"))
+            .ConfigureAwait(false);
+    }
+
+    private static string FormatLogActor(Actor actor) => $"{actor.Name} ({actor.Guid})";
+}
diff --git a/Content.Server/Administration/ServerApi.cs b/Content.Server/Administration/ServerApi.cs
new file mode 100644
index 00000000000..6f10ef9b479
--- /dev/null
+++ b/Content.Server/Administration/ServerApi.cs
@@ -0,0 +1,711 @@
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Content.Server.Administration.Systems;
+using Content.Server.GameTicking;
+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.Prototypes;
+using Robust.Server.ServerStatus;
+using Robust.Shared.Asynchronous;
+using Robust.Shared.Configuration;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Administration;
+
+/// <summary>
+/// Exposes various admin-related APIs via the game server's <see cref="StatusHost"/>.
+/// </summary>
+public sealed partial class ServerApi : IPostInjectInit
+{
+    private const string SS14TokenScheme = "SS14Token";
+
+    private static readonly HashSet<string> PanicBunkerCVars =
+    [
+        CCVars.PanicBunkerEnabled.Name,
+        CCVars.PanicBunkerDisableWithAdmins.Name,
+        CCVars.PanicBunkerEnableWithoutAdmins.Name,
+        CCVars.PanicBunkerCountDeadminnedAdmins.Name,
+        CCVars.PanicBunkerShowReason.Name,
+        CCVars.PanicBunkerMinAccountAge.Name,
+        CCVars.PanicBunkerMinOverallHours.Name,
+        CCVars.PanicBunkerCustomReason.Name,
+    ];
+
+    [Dependency] private readonly IStatusHost _statusHost = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
+    [Dependency] private readonly ISharedAdminManager _adminManager = default!;
+    [Dependency] private readonly IGameMapManager _gameMapManager = default!;
+    [Dependency] private readonly IServerNetManager _netManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IComponentFactory _componentFactory = default!;
+    [Dependency] private readonly ITaskManager _taskManager = default!;
+    [Dependency] private readonly EntityManager _entityManager = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
+    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+    [Dependency] private readonly ILocalizationManager _loc = default!;
+
+    private string _token = string.Empty;
+    private ISawmill _sawmill = default!;
+
+    void IPostInjectInit.PostInject()
+    {
+        _sawmill = _logManager.GetSawmill("serverApi");
+
+        // Get
+        RegisterActorHandler(HttpMethod.Get, "/admin/info", InfoHandler);
+        RegisterHandler(HttpMethod.Get, "/admin/game_rules", GetGameRules);
+        RegisterHandler(HttpMethod.Get, "/admin/presets", GetPresets);
+
+        // Post
+        RegisterActorHandler(HttpMethod.Post, "/admin/actions/round/start", ActionRoundStart);
+        RegisterActorHandler(HttpMethod.Post, "/admin/actions/round/end", ActionRoundEnd);
+        RegisterActorHandler(HttpMethod.Post, "/admin/actions/round/restartnow", ActionRoundRestartNow);
+        RegisterActorHandler(HttpMethod.Post, "/admin/actions/kick", ActionKick);
+        RegisterActorHandler(HttpMethod.Post, "/admin/actions/add_game_rule", ActionAddGameRule);
+        RegisterActorHandler(HttpMethod.Post, "/admin/actions/end_game_rule", ActionEndGameRule);
+        RegisterActorHandler(HttpMethod.Post, "/admin/actions/force_preset", ActionForcePreset);
+        RegisterActorHandler(HttpMethod.Post, "/admin/actions/set_motd", ActionForceMotd);
+        RegisterActorHandler(HttpMethod.Patch, "/admin/actions/panic_bunker", ActionPanicPunker);
+    }
+
+    public void Initialize()
+    {
+        _config.OnValueChanged(CCVars.AdminApiToken, UpdateToken, true);
+    }
+
+    public void Shutdown()
+    {
+        _config.UnsubValueChanged(CCVars.AdminApiToken, UpdateToken);
+    }
+
+    private void UpdateToken(string token)
+    {
+        _token = token;
+    }
+
+
+    #region Actions
+
+    /// <summary>
+    ///     Changes the panic bunker settings.
+    /// </summary>
+    private async Task ActionPanicPunker(IStatusHandlerContext context, Actor actor)
+    {
+        var request = await ReadJson<JsonObject>(context);
+        if (request == null)
+            return;
+
+        var toSet = new Dictionary<string, object>();
+        foreach (var (cVar, value) in request)
+        {
+            if (!PanicBunkerCVars.Contains(cVar))
+            {
+                await RespondBadRequest(context, $"Invalid panic bunker CVar: '{cVar}'");
+                return;
+            }
+
+            if (value == null)
+            {
+                await RespondBadRequest(context, $"Value is null: '{cVar}'");
+                return;
+            }
+
+            if (value is not JsonValue jsonValue)
+            {
+                await RespondBadRequest(context, $"Value is not valid: '{cVar}'");
+                return;
+            }
+
+            object castValue;
+            var cVarType = _config.GetCVarType(cVar);
+            if (cVarType == typeof(bool))
+            {
+                if (!jsonValue.TryGetValue(out bool b))
+                {
+                    await RespondBadRequest(context, $"CVar '{cVar}' must be of type bool.");
+                    return;
+                }
+
+                castValue = b;
+            }
+            else if (cVarType == typeof(int))
+            {
+                if (!jsonValue.TryGetValue(out int i))
+                {
+                    await RespondBadRequest(context, $"CVar '{cVar}' must be of type int.");
+                    return;
+                }
+
+                castValue = i;
+            }
+            else if (cVarType == typeof(string))
+            {
+                if (!jsonValue.TryGetValue(out string? s))
+                {
+                    await RespondBadRequest(context, $"CVar '{cVar}' must be of type string.");
+                    return;
+                }
+
+                castValue = s;
+            }
+            else
+            {
+                throw new NotSupportedException("Unsupported CVar type");
+            }
+
+            toSet[cVar] = castValue;
+        }
+
+        await RunOnMainThread(() =>
+        {
+            foreach (var (cVar, value) in toSet)
+            {
+                _config.SetCVar(cVar, value);
+                _sawmill.Info(
+                    $"Panic bunker property '{cVar}' changed to '{value}' by {FormatLogActor(actor)}.");
+            }
+        });
+
+        await RespondOk(context);
+    }
+
+    /// <summary>
+    ///     Sets the current MOTD.
+    /// </summary>
+    private async Task ActionForceMotd(IStatusHandlerContext context, Actor actor)
+    {
+        var motd = await ReadJson<MotdActionBody>(context);
+        if (motd == null)
+            return;
+
+        _sawmill.Info($"MOTD changed to \"{motd.Motd}\" by {FormatLogActor(actor)}.");
+
+        await RunOnMainThread(() => _config.SetCVar(CCVars.MOTD, motd.Motd));
+        // A hook in the MOTD system sends the changes to each client
+        await RespondOk(context);
+    }
+
+    /// <summary>
+    ///     Forces the next preset-
+    /// </summary>
+    private async Task ActionForcePreset(IStatusHandlerContext context, Actor actor)
+    {
+        var body = await ReadJson<PresetActionBody>(context);
+        if (body == null)
+            return;
+
+        await RunOnMainThread(async () =>
+        {
+            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            if (ticker.RunLevel != GameRunLevel.PreRoundLobby)
+            {
+                await RespondError(
+                    context,
+                    ErrorCode.InvalidRoundState,
+                    HttpStatusCode.Conflict,
+                    "Game must be in pre-round lobby");
+                return;
+            }
+
+            var preset = ticker.FindGamePreset(body.PresetId);
+            if (preset == null)
+            {
+                await RespondError(
+                    context,
+                    ErrorCode.GameRuleNotFound,
+                    HttpStatusCode.UnprocessableContent,
+                    $"Game rule '{body.PresetId}' doesn't exist");
+                return;
+            }
+
+            ticker.SetGamePreset(preset);
+            _sawmill.Info($"Forced the game to start with preset {body.PresetId} by {FormatLogActor(actor)}.");
+
+            await RespondOk(context);
+        });
+    }
+
+    /// <summary>
+    ///     Ends an active game rule.
+    /// </summary>
+    private async Task ActionEndGameRule(IStatusHandlerContext context, Actor actor)
+    {
+        var body = await ReadJson<GameRuleActionBody>(context);
+        if (body == null)
+            return;
+
+        await RunOnMainThread(async () =>
+        {
+            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            var gameRule = ticker
+                .GetActiveGameRules()
+                .FirstOrNull(rule =>
+                    _entityManager.MetaQuery.GetComponent(rule).EntityPrototype?.ID == body.GameRuleId);
+
+            if (gameRule == null)
+            {
+                await RespondError(context,
+                    ErrorCode.GameRuleNotFound,
+                    HttpStatusCode.UnprocessableContent,
+                    $"Game rule '{body.GameRuleId}' not found or not active");
+
+                return;
+            }
+
+            _sawmill.Info($"Ended game rule {body.GameRuleId} by {FormatLogActor(actor)}.");
+            ticker.EndGameRule(gameRule.Value);
+
+            await RespondOk(context);
+        });
+    }
+
+    /// <summary>
+    ///     Adds a game rule to the current round.
+    /// </summary>
+    private async Task ActionAddGameRule(IStatusHandlerContext context, Actor actor)
+    {
+        var body = await ReadJson<GameRuleActionBody>(context);
+        if (body == null)
+            return;
+
+        await RunOnMainThread(async () =>
+        {
+            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            if (!_prototypeManager.HasIndex<EntityPrototype>(body.GameRuleId))
+            {
+                await RespondError(context,
+                    ErrorCode.GameRuleNotFound,
+                    HttpStatusCode.UnprocessableContent,
+                    $"Game rule '{body.GameRuleId}' not found or not active");
+                return;
+            }
+
+            var ruleEntity = ticker.AddGameRule(body.GameRuleId);
+            _sawmill.Info($"Added game rule {body.GameRuleId} by {FormatLogActor(actor)}.");
+            if (ticker.RunLevel == GameRunLevel.InRound)
+            {
+                ticker.StartGameRule(ruleEntity);
+                _sawmill.Info($"Started game rule {body.GameRuleId} by {FormatLogActor(actor)}.");
+            }
+
+            await RespondOk(context);
+        });
+    }
+
+    /// <summary>
+    ///     Kicks a player.
+    /// </summary>
+    private async Task ActionKick(IStatusHandlerContext context, Actor actor)
+    {
+        var body = await ReadJson<KickActionBody>(context);
+        if (body == null)
+            return;
+
+        await RunOnMainThread(async () =>
+        {
+            if (!_playerManager.TryGetSessionById(new NetUserId(body.Guid), out var player))
+            {
+                await RespondError(
+                    context,
+                    ErrorCode.PlayerNotFound,
+                    HttpStatusCode.UnprocessableContent,
+                    "Player not found");
+                return;
+            }
+
+            var reason = body.Reason ?? "No reason supplied";
+            reason += " (kicked by admin)";
+
+            _netManager.DisconnectChannel(player.Channel, reason);
+            await RespondOk(context);
+
+            _sawmill.Info($"Kicked player {player.Name} ({player.UserId}) for {reason} by {FormatLogActor(actor)}");
+        });
+    }
+
+    private async Task ActionRoundStart(IStatusHandlerContext context, Actor actor)
+    {
+        await RunOnMainThread(async () =>
+        {
+            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+
+            if (ticker.RunLevel != GameRunLevel.PreRoundLobby)
+            {
+                await RespondError(
+                    context,
+                    ErrorCode.InvalidRoundState,
+                    HttpStatusCode.Conflict,
+                    "Round already started");
+                return;
+            }
+
+            ticker.StartRound();
+            _sawmill.Info($"Forced round start by {FormatLogActor(actor)}");
+            await RespondOk(context);
+        });
+    }
+
+    private async Task ActionRoundEnd(IStatusHandlerContext context, Actor actor)
+    {
+        await RunOnMainThread(async () =>
+        {
+            var roundEndSystem = _entitySystemManager.GetEntitySystem<RoundEndSystem>();
+            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+
+            if (ticker.RunLevel != GameRunLevel.InRound)
+            {
+                await RespondError(
+                    context,
+                    ErrorCode.InvalidRoundState,
+                    HttpStatusCode.Conflict,
+                    "Round is not active");
+                return;
+            }
+
+            roundEndSystem.EndRound();
+            _sawmill.Info($"Forced round end by {FormatLogActor(actor)}");
+            await RespondOk(context);
+        });
+    }
+
+    private async Task ActionRoundRestartNow(IStatusHandlerContext context, Actor actor)
+    {
+        await RunOnMainThread(async () =>
+        {
+            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+
+            ticker.RestartRound();
+            _sawmill.Info($"Forced instant round restart by {FormatLogActor(actor)}");
+            await RespondOk(context);
+        });
+    }
+
+    #endregion
+
+    #region Fetching
+
+    /// <summary>
+    ///     Returns an array containing all available presets.
+    /// </summary>
+    private async Task GetPresets(IStatusHandlerContext context)
+    {
+        var presets = await RunOnMainThread(() =>
+        {
+            var presets = new List<PresetResponse.Preset>();
+
+            foreach (var preset in _prototypeManager.EnumeratePrototypes<GamePresetPrototype>())
+            {
+                presets.Add(new PresetResponse.Preset
+                {
+                    Id = preset.ID,
+                    ModeTitle = _loc.GetString(preset.ModeTitle),
+                    Description = _loc.GetString(preset.Description)
+                });
+            }
+
+            return presets;
+        });
+
+        await context.RespondJsonAsync(new PresetResponse
+        {
+            Presets = presets
+        });
+    }
+
+    /// <summary>
+    ///    Returns an array containing all game rules.
+    /// </summary>
+    private async Task GetGameRules(IStatusHandlerContext context)
+    {
+        var gameRules = new List<string>();
+        foreach (var gameRule in _prototypeManager.EnumeratePrototypes<EntityPrototype>())
+        {
+            if (gameRule.Abstract)
+                continue;
+
+            if (gameRule.HasComponent<GameRuleComponent>(_componentFactory))
+                gameRules.Add(gameRule.ID);
+        }
+
+        await context.RespondJsonAsync(new GameruleResponse
+        {
+            GameRules = gameRules
+        });
+    }
+
+
+    /// <summary>
+    ///     Handles fetching information.
+    /// </summary>
+    private async Task InfoHandler(IStatusHandlerContext context, Actor actor)
+    {
+        /*
+        Information to display
+        Round number
+        Connected players
+        Active admins
+        Active game rules
+        Active game preset
+        Active map
+        MOTD
+        Panic bunker status
+        */
+
+        var info = await RunOnMainThread<InfoResponse>(() =>
+        {
+            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            var adminSystem = _entitySystemManager.GetEntitySystem<AdminSystem>();
+
+            var players = new List<InfoResponse.Player>();
+
+            foreach (var player in _playerManager.Sessions)
+            {
+                var adminData = _adminManager.GetAdminData(player, true);
+
+                players.Add(new InfoResponse.Player
+                {
+                    UserId = player.UserId.UserId,
+                    Name = player.Name,
+                    IsAdmin = adminData != null,
+                    IsDeadminned = !adminData?.Active ?? false
+                });
+            }
+
+            InfoResponse.MapInfo? mapInfo = null;
+            if (_gameMapManager.GetSelectedMap() is { } mapPrototype)
+            {
+                mapInfo = new InfoResponse.MapInfo
+                {
+                    Id = mapPrototype.ID,
+                    Name = mapPrototype.MapName
+                };
+            }
+
+            var gameRules = new List<string>();
+            foreach (var addedGameRule in ticker.GetActiveGameRules())
+            {
+                var meta = _entityManager.MetaQuery.GetComponent(addedGameRule);
+                gameRules.Add(meta.EntityPrototype?.ID ?? meta.EntityPrototype?.Name ?? "Unknown");
+            }
+
+            var panicBunkerCVars = PanicBunkerCVars.ToDictionary(c => c, c => _config.GetCVar(c));
+            return new InfoResponse
+            {
+                Players = players,
+                RoundId = ticker.RoundId,
+                Map = mapInfo,
+                PanicBunker = panicBunkerCVars,
+                GamePreset = ticker.CurrentPreset?.ID,
+                GameRules = gameRules,
+                MOTD = _config.GetCVar(CCVars.MOTD)
+            };
+        });
+
+        await context.RespondJsonAsync(info);
+    }
+
+    #endregion
+
+    private async Task<bool> CheckAccess(IStatusHandlerContext context)
+    {
+        var auth = context.RequestHeaders.TryGetValue("Authorization", out var authToken);
+        if (!auth)
+        {
+            await RespondError(
+                context,
+                ErrorCode.AuthenticationNeeded,
+                HttpStatusCode.Unauthorized,
+                "Authorization is required");
+            return false;
+        }
+
+        var authHeaderValue = authToken.ToString();
+        var spaceIndex = authHeaderValue.IndexOf(' ');
+        if (spaceIndex == -1)
+        {
+            await RespondBadRequest(context, "Invalid Authorization header value");
+            return false;
+        }
+
+        var authScheme = authHeaderValue[..spaceIndex];
+        var authValue = authHeaderValue[spaceIndex..].Trim();
+
+        if (authScheme != SS14TokenScheme)
+        {
+            await RespondBadRequest(context, "Invalid Authorization scheme");
+            return false;
+        }
+
+        if (_token == "")
+        {
+            _sawmill.Debug("No authorization token set for admin API");
+        }
+        else if (CryptographicOperations.FixedTimeEquals(
+                Encoding.UTF8.GetBytes(authValue),
+                Encoding.UTF8.GetBytes(_token)))
+        {
+            return true;
+        }
+
+        await RespondError(
+            context,
+            ErrorCode.AuthenticationInvalid,
+            HttpStatusCode.Unauthorized,
+            "Authorization is invalid");
+
+        // Invalid auth header, no access
+        _sawmill.Info($"Unauthorized access attempt to admin API from {context.RemoteEndPoint}");
+        return false;
+    }
+
+    private async Task<Actor?> CheckActor(IStatusHandlerContext context)
+    {
+        // The actor is JSON encoded in the header
+        var actor = context.RequestHeaders.TryGetValue("Actor", out var actorHeader) ? actorHeader.ToString() : null;
+        if (actor == null)
+        {
+            await RespondBadRequest(context, "Actor must be supplied");
+            return null;
+        }
+
+        Actor? actorData;
+        try
+        {
+            actorData = JsonSerializer.Deserialize<Actor>(actor);
+            if (actorData == null)
+            {
+                await RespondBadRequest(context, "Actor is null");
+                return null;
+            }
+        }
+        catch (JsonException exception)
+        {
+            await RespondBadRequest(context, "Actor field JSON is invalid", ExceptionData.FromException(exception));
+            return null;
+        }
+
+        return actorData;
+    }
+
+    #region From Client
+
+    private sealed class Actor
+    {
+        public required Guid Guid { get; init; }
+        public required string Name { get; init; }
+    }
+
+    private sealed class KickActionBody
+    {
+        public required Guid Guid { get; init; }
+        public string? Reason { get; init; }
+    }
+
+    private sealed class GameRuleActionBody
+    {
+        public required string GameRuleId { get; init; }
+    }
+
+    private sealed class PresetActionBody
+    {
+        public required string PresetId { get; init; }
+    }
+
+    private sealed class MotdActionBody
+    {
+        public required string Motd { get; init; }
+    }
+
+    #endregion
+
+    #region Responses
+
+    private record BaseResponse(
+        string Message,
+        ErrorCode ErrorCode = ErrorCode.None,
+        ExceptionData? Exception = null);
+
+    private record ExceptionData(string Message, string? StackTrace = null)
+    {
+        public static ExceptionData FromException(Exception e)
+        {
+            return new ExceptionData(e.Message, e.StackTrace);
+        }
+    }
+
+    private enum ErrorCode
+    {
+        None = 0,
+        AuthenticationNeeded = 1,
+        AuthenticationInvalid = 2,
+        InvalidRoundState = 3,
+        PlayerNotFound = 4,
+        GameRuleNotFound = 5,
+        BadRequest = 6,
+    }
+
+    #endregion
+
+    #region Misc
+
+    /// <summary>
+    /// Record used to send the response for the info endpoint.
+    /// </summary>
+    private sealed class InfoResponse
+    {
+        public required int RoundId { get; init; }
+        public required List<Player> Players { get; init; }
+        public required List<string> GameRules { get; init; }
+        public required string? GamePreset { get; init; }
+        public required MapInfo? Map { get; init; }
+        public required string? MOTD { get; init; }
+        public required Dictionary<string, object> PanicBunker { get; init; }
+
+        public sealed class Player
+        {
+            public required Guid UserId { get; init; }
+            public required string Name { get; init; }
+            public required bool IsAdmin { get; init; }
+            public required bool IsDeadminned { get; init; }
+        }
+
+        public sealed class MapInfo
+        {
+            public required string Id { get; init; }
+            public required string Name { get; init; }
+        }
+    }
+
+    private sealed class PresetResponse
+    {
+        public required List<Preset> Presets { get; init; }
+
+        public sealed class Preset
+        {
+            public required string Id { get; init; }
+            public required string Description { get; init; }
+            public required string ModeTitle { get; init; }
+        }
+    }
+
+    private sealed class GameruleResponse
+    {
+        public required List<string> GameRules { get; init; }
+    }
+
+    #endregion
+}
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index 53eabb1a481..82bbe6e266b 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -61,7 +61,7 @@ public sealed class AdminSystem : EntitySystem
         public IReadOnlySet<NetUserId> RoundActivePlayers => _roundActivePlayers;
 
         private readonly HashSet<NetUserId> _roundActivePlayers = new();
-        private readonly PanicBunkerStatus _panicBunker = new();
+        public readonly PanicBunkerStatus PanicBunker = new();
 
         public override void Initialize()
         {
@@ -240,7 +240,7 @@ private PlayerInfo GetPlayerInfo(SessionData data, ICommonSession? session)
 
         private void OnPanicBunkerChanged(bool enabled)
         {
-            _panicBunker.Enabled = enabled;
+            PanicBunker.Enabled = enabled;
             _chat.SendAdminAlert(Loc.GetString(enabled
                 ? "admin-ui-panic-bunker-enabled-admin-alert"
                 : "admin-ui-panic-bunker-disabled-admin-alert"
@@ -251,52 +251,52 @@ private void OnPanicBunkerChanged(bool enabled)
 
         private void OnPanicBunkerDisableWithAdminsChanged(bool enabled)
         {
-            _panicBunker.DisableWithAdmins = enabled;
+            PanicBunker.DisableWithAdmins = enabled;
             UpdatePanicBunker();
         }
 
         private void OnPanicBunkerEnableWithoutAdminsChanged(bool enabled)
         {
-            _panicBunker.EnableWithoutAdmins = enabled;
+            PanicBunker.EnableWithoutAdmins = enabled;
             UpdatePanicBunker();
         }
 
         private void OnPanicBunkerCountDeadminnedAdminsChanged(bool enabled)
         {
-            _panicBunker.CountDeadminnedAdmins = enabled;
+            PanicBunker.CountDeadminnedAdmins = enabled;
             UpdatePanicBunker();
         }
 
         private void OnShowReasonChanged(bool enabled)
         {
-            _panicBunker.ShowReason = enabled;
+            PanicBunker.ShowReason = enabled;
             SendPanicBunkerStatusAll();
         }
 
         private void OnPanicBunkerMinAccountAgeChanged(int minutes)
         {
-            _panicBunker.MinAccountAgeHours = minutes / 60;
+            PanicBunker.MinAccountAgeHours = minutes / 60;
             SendPanicBunkerStatusAll();
         }
 
         private void OnPanicBunkerMinOverallHoursChanged(int hours)
         {
-            _panicBunker.MinOverallHours = hours;
+            PanicBunker.MinOverallHours = hours;
             SendPanicBunkerStatusAll();
         }
 
         private void UpdatePanicBunker()
         {
-            var admins = _panicBunker.CountDeadminnedAdmins
+            var admins = PanicBunker.CountDeadminnedAdmins
                 ? _adminManager.AllAdmins
                 : _adminManager.ActiveAdmins;
             var hasAdmins = admins.Any();
 
-            if (hasAdmins && _panicBunker.DisableWithAdmins)
+            if (hasAdmins && PanicBunker.DisableWithAdmins)
             {
                 _config.SetCVar(CCVars.PanicBunkerEnabled, false);
             }
-            else if (!hasAdmins && _panicBunker.EnableWithoutAdmins)
+            else if (!hasAdmins && PanicBunker.EnableWithoutAdmins)
             {
                 _config.SetCVar(CCVars.PanicBunkerEnabled, true);
             }
@@ -306,7 +306,7 @@ private void UpdatePanicBunker()
 
         private void SendPanicBunkerStatusAll()
         {
-            var ev = new PanicBunkerChangedEvent(_panicBunker);
+            var ev = new PanicBunkerChangedEvent(PanicBunker);
             foreach (var admin in _adminManager.AllAdmins)
             {
                 RaiseNetworkEvent(ev, admin);
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 9d66338c8bf..328fa744846 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -35,6 +35,7 @@
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Administration.Systems;
@@ -844,14 +845,14 @@ private void GiveAllAccess(EntityUid entity)
     {
         var allAccess = _prototypeManager
             .EnumeratePrototypes<AccessLevelPrototype>()
-            .Select(p => p.ID).ToArray();
+            .Select(p => new ProtoId<AccessLevelPrototype>(p.ID)).ToArray();
 
         _accessSystem.TrySetTags(entity, allAccess);
     }
 
     private void RevokeAllAccess(EntityUid entity)
     {
-        _accessSystem.TrySetTags(entity, Array.Empty<string>());
+        _accessSystem.TrySetTags(entity, new List<ProtoId<AccessLevelPrototype>>());
     }
 
     public enum TricksVerbPriorities
diff --git a/Content.Server/Administration/UI/AdminAnnounceEui.cs b/Content.Server/Administration/UI/AdminAnnounceEui.cs
index b6a6ba99840..e6d17b5af40 100644
--- a/Content.Server/Administration/UI/AdminAnnounceEui.cs
+++ b/Content.Server/Administration/UI/AdminAnnounceEui.cs
@@ -5,6 +5,8 @@
 using Content.Server.EUI;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
+using Content.Server.Announcements.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.Administration.UI
 {
@@ -12,11 +14,14 @@ public sealed class AdminAnnounceEui : BaseEui
     {
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly IChatManager _chatManager = default!;
+        private readonly AnnouncerSystem _announcer;
         private readonly ChatSystem _chatSystem;
 
         public AdminAnnounceEui()
         {
             IoCManager.InjectDependencies(this);
+
+            _announcer = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AnnouncerSystem>();
             _chatSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
         }
 
@@ -50,7 +55,8 @@ public override void HandleMessage(EuiMessageBase msg)
                             break;
                         // TODO: Per-station announcement support
                         case AdminAnnounceType.Station:
-                            _chatSystem.DispatchGlobalAnnouncement(doAnnounce.Announcement, doAnnounce.Announcer, colorOverride: Color.Gold);
+                            _announcer.SendAnnouncement(_announcer.GetAnnouncementId("Announce"), Filter.Broadcast(),
+                                doAnnounce.Announcement, doAnnounce.Announcer, Color.Gold);
                             break;
                     }
 
diff --git a/Content.Server/Advertise/AdvertiseComponent.cs b/Content.Server/Advertise/AdvertiseComponent.cs
deleted file mode 100644
index f36cc7ae1e6..00000000000
--- a/Content.Server/Advertise/AdvertiseComponent.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Content.Server.Advertisements;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Advertise
-{
-    [RegisterComponent, Access(typeof(AdvertiseSystem))]
-    public sealed partial class AdvertiseComponent : Component
-    {
-        /// <summary>
-        ///     Minimum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal to 1.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("minWait")]
-        public int MinimumWait { get; private set; } = 8 * 60;
-
-        /// <summary>
-        ///     Maximum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal
-        ///     to <see cref="MinimumWait"/>
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("maxWait")]
-        public int MaximumWait { get; private set; } = 10 * 60;
-
-        /// <summary>
-        ///     The identifier for the advertisements pack prototype.
-        /// </summary>
-        [DataField("pack", customTypeSerializer:typeof(PrototypeIdSerializer<AdvertisementsPackPrototype>), required: true)]
-        public string PackPrototypeId { get; private set; } = string.Empty;
-
-        /// <summary>
-        ///     The next time an advertisement will be said.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public TimeSpan NextAdvertisementTime { get; set; } = TimeSpan.Zero;
-
-        /// <summary>
-        ///     Whether the entity will say advertisements or not.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool Enabled { get; set; } = true;
-    }
-}
diff --git a/Content.Server/Advertise/AdvertiseSystem.cs b/Content.Server/Advertise/AdvertiseSystem.cs
deleted file mode 100644
index ab538f3c779..00000000000
--- a/Content.Server/Advertise/AdvertiseSystem.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using Content.Server.Advertisements;
-using Content.Server.Chat.Systems;
-using Content.Server.Power.Components;
-using Content.Shared.VendingMachines;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Advertise
-{
-    public sealed class AdvertiseSystem : EntitySystem
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly ChatSystem _chat = default!;
-
-        /// <summary>
-        /// The maximum amount of time between checking if advertisements should be displayed
-        /// </summary>
-        private readonly TimeSpan _maximumNextCheckDuration = TimeSpan.FromSeconds(15);
-
-        /// <summary>
-        /// The next time the game will check if advertisements should be displayed
-        /// </summary>
-        private TimeSpan _nextCheckTime = TimeSpan.MaxValue;
-
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<AdvertiseComponent, ComponentInit>(OnComponentInit);
-            SubscribeLocalEvent<AdvertiseComponent, PowerChangedEvent>(OnPowerChanged);
-
-            SubscribeLocalEvent<ApcPowerReceiverComponent, AdvertiseEnableChangeAttemptEvent>(OnPowerReceiverEnableChangeAttempt);
-            SubscribeLocalEvent<VendingMachineComponent, AdvertiseEnableChangeAttemptEvent>(OnVendingEnableChangeAttempt);
-
-            // The component inits will lower this.
-            _nextCheckTime = TimeSpan.MaxValue;
-        }
-
-        private void OnComponentInit(EntityUid uid, AdvertiseComponent advertise, ComponentInit args)
-        {
-            RefreshTimer(uid, advertise);
-        }
-
-        private void OnPowerChanged(EntityUid uid, AdvertiseComponent advertise, ref PowerChangedEvent args)
-        {
-            SetEnabled(uid, args.Powered, advertise);
-        }
-
-        public void RefreshTimer(EntityUid uid, AdvertiseComponent? advertise = null)
-        {
-            if (!Resolve(uid, ref advertise))
-                return;
-
-            if (!advertise.Enabled)
-                return;
-
-            var minDuration = Math.Max(1, advertise.MinimumWait);
-            var maxDuration = Math.Max(minDuration, advertise.MaximumWait);
-            var waitDuration = TimeSpan.FromSeconds(_random.Next(minDuration, maxDuration));
-            var nextTime = _gameTiming.CurTime + waitDuration;
-
-            advertise.NextAdvertisementTime = nextTime;
-
-            _nextCheckTime = MathHelper.Min(nextTime, _nextCheckTime);
-        }
-
-        public void SayAdvertisement(EntityUid uid, AdvertiseComponent? advertise = null)
-        {
-            if (!Resolve(uid, ref advertise))
-                return;
-
-            if (_prototypeManager.TryIndex(advertise.PackPrototypeId, out AdvertisementsPackPrototype? advertisements))
-                _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Advertisements)), InGameICChatType.Speak, true);
-        }
-
-        public void SayThankYou(EntityUid uid, AdvertiseComponent? advertise = null)
-        {
-            if (!Resolve(uid, ref advertise))
-                return;
-
-            if (_prototypeManager.TryIndex(advertise.PackPrototypeId, out AdvertisementsPackPrototype? advertisements))
-            {
-                _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.ThankYous), ("name", Name(uid))), InGameICChatType.Speak, true);
-            }
-        }
-
-        public void SetEnabled(EntityUid uid, bool enable, AdvertiseComponent? advertise = null)
-        {
-            if (!Resolve(uid, ref advertise))
-                return;
-
-            if (advertise.Enabled == enable)
-                return;
-
-            var attemptEvent = new AdvertiseEnableChangeAttemptEvent(enable);
-            RaiseLocalEvent(uid, attemptEvent);
-
-            if (attemptEvent.Cancelled)
-                return;
-
-            advertise.Enabled = enable;
-            RefreshTimer(uid, advertise);
-        }
-
-        private static void OnPowerReceiverEnableChangeAttempt(EntityUid uid, ApcPowerReceiverComponent component, AdvertiseEnableChangeAttemptEvent args)
-        {
-            if(args.Enabling && !component.Powered)
-                args.Cancel();
-        }
-
-        private static void OnVendingEnableChangeAttempt(EntityUid uid, VendingMachineComponent component, AdvertiseEnableChangeAttemptEvent args)
-        {
-            if(args.Enabling && component.Broken)
-                args.Cancel();
-        }
-
-        public override void Update(float frameTime)
-        {
-            var curTime = _gameTiming.CurTime;
-            if (_nextCheckTime > curTime)
-                return;
-
-            _nextCheckTime = curTime + _maximumNextCheckDuration;
-
-            var query = EntityQueryEnumerator<AdvertiseComponent>();
-            while (query.MoveNext(out var uid, out var advert))
-            {
-                if (!advert.Enabled)
-                    continue;
-
-                // If this isn't advertising yet
-                if (advert.NextAdvertisementTime > curTime)
-                {
-                    _nextCheckTime = MathHelper.Min(advert.NextAdvertisementTime, _nextCheckTime);
-                    continue;
-                }
-
-                SayAdvertisement(uid, advert);
-                RefreshTimer(uid, advert);
-            }
-        }
-    }
-
-    public sealed class AdvertiseEnableChangeAttemptEvent : CancellableEntityEventArgs
-    {
-        public bool Enabling { get; }
-
-        public AdvertiseEnableChangeAttemptEvent(bool enabling)
-        {
-            Enabling = enabling;
-        }
-    }
-}
diff --git a/Content.Server/Advertise/Components/AdvertiseComponent.cs b/Content.Server/Advertise/Components/AdvertiseComponent.cs
new file mode 100644
index 00000000000..f413befc211
--- /dev/null
+++ b/Content.Server/Advertise/Components/AdvertiseComponent.cs
@@ -0,0 +1,46 @@
+using Content.Shared.Advertise;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Advertise.Components;
+
+/// <summary>
+/// Makes this entity periodically advertise by speaking a randomly selected
+/// message from a specified MessagePack into local chat.
+/// </summary>
+[RegisterComponent]
+public sealed partial class AdvertiseComponent : Component
+{
+    /// <summary>
+    /// Minimum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal to 1.
+    /// </summary>
+    [DataField]
+    public int MinimumWait { get; set; } = 8 * 60;
+
+    /// <summary>
+    /// Maximum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal
+    /// to <see cref="MinimumWait"/>
+    /// </summary>
+    [DataField]
+    public int MaximumWait { get; set; } = 10 * 60;
+
+    /// <summary>
+    /// If true, the delay before the first advertisement (at MapInit) will ignore <see cref="MinimumWait"/>
+    /// and instead be rolled between 0 and <see cref="MaximumWait"/>. This only applies to the initial delay;
+    /// <see cref="MinimumWait"/> will be respected after that.
+    /// </summary>
+    [DataField]
+    public bool Prewarm = true;
+
+    /// <summary>
+    /// The identifier for the advertisements pack prototype.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<MessagePackPrototype> Pack { get; private set; }
+
+    /// <summary>
+    /// The next time an advertisement will be said.
+    /// </summary>
+    [DataField]
+    public TimeSpan NextAdvertisementTime { get; set; } = TimeSpan.Zero;
+
+}
diff --git a/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs b/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs
new file mode 100644
index 00000000000..2a663b7f89d
--- /dev/null
+++ b/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Advertise;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Advertise.Components;
+
+/// <summary>
+/// Causes the entity to speak using the Chat system when its ActivatableUI is closed, optionally
+/// requiring that a Flag be set as well.
+/// </summary>
+[RegisterComponent, Access(typeof(SpeakOnUIClosedSystem))]
+public sealed partial class SpeakOnUIClosedComponent : Component
+{
+    /// <summary>
+    /// The identifier for the message pack prototype containing messages to be spoken by this entity.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<MessagePackPrototype> Pack { get; private set; }
+
+    /// <summary>
+    /// Is this component active? If false, no messages will be spoken.
+    /// </summary>
+    [DataField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// Should messages be spoken only if the <see cref="Flag"/> is set (true), or every time the UI is closed (false)?
+    /// </summary>
+    [DataField]
+    public bool RequireFlag = true;
+
+    /// <summary>
+    /// State variable only used if <see cref="RequireFlag"/> is true. Set with <see cref="SpeakOnUIClosedSystem.TrySetFlag"/>.
+    /// </summary>
+    [DataField]
+    public bool Flag;
+}
diff --git a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
new file mode 100644
index 00000000000..28fa01628f4
--- /dev/null
+++ b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
@@ -0,0 +1,106 @@
+using Content.Server.Advertise.Components;
+using Content.Server.Chat.Systems;
+using Content.Server.Power.Components;
+using Content.Shared.VendingMachines;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Advertise.EntitySystems;
+
+public sealed class AdvertiseSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+
+    /// <summary>
+    /// The maximum amount of time between checking if advertisements should be displayed
+    /// </summary>
+    private readonly TimeSpan _maximumNextCheckDuration = TimeSpan.FromSeconds(15);
+
+    /// <summary>
+    /// The next time the game will check if advertisements should be displayed
+    /// </summary>
+    private TimeSpan _nextCheckTime = TimeSpan.MinValue;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<AdvertiseComponent, MapInitEvent>(OnMapInit);
+
+        SubscribeLocalEvent<ApcPowerReceiverComponent, AttemptAdvertiseEvent>(OnPowerReceiverAttemptAdvertiseEvent);
+        SubscribeLocalEvent<VendingMachineComponent, AttemptAdvertiseEvent>(OnVendingAttemptAdvertiseEvent);
+
+        _nextCheckTime = TimeSpan.MinValue;
+    }
+
+    private void OnMapInit(EntityUid uid, AdvertiseComponent advert, MapInitEvent args)
+    {
+        var prewarm = advert.Prewarm;
+        RandomizeNextAdvertTime(advert, prewarm);
+        _nextCheckTime = MathHelper.Min(advert.NextAdvertisementTime, _nextCheckTime);
+    }
+
+    private void RandomizeNextAdvertTime(AdvertiseComponent advert, bool prewarm = false)
+    {
+        var minDuration = prewarm ? 0 : Math.Max(1, advert.MinimumWait);
+        var maxDuration = Math.Max(minDuration, advert.MaximumWait);
+        var waitDuration = TimeSpan.FromSeconds(_random.Next(minDuration, maxDuration));
+
+        advert.NextAdvertisementTime = _gameTiming.CurTime + waitDuration;
+    }
+
+    public void SayAdvertisement(EntityUid uid, AdvertiseComponent? advert = null)
+    {
+        if (!Resolve(uid, ref advert))
+            return;
+
+        var attemptEvent = new AttemptAdvertiseEvent(uid);
+        RaiseLocalEvent(uid, ref attemptEvent);
+        if (attemptEvent.Cancelled)
+            return;
+
+        if (_prototypeManager.TryIndex(advert.Pack, out var advertisements))
+            _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Messages)), InGameICChatType.Speak, hideChat: true);
+    }
+
+    public override void Update(float frameTime)
+    {
+        var currentGameTime = _gameTiming.CurTime;
+        if (_nextCheckTime > currentGameTime)
+            return;
+
+        // _nextCheckTime starts at TimeSpan.MinValue, so this has to SET the value, not just increment it.
+        _nextCheckTime = currentGameTime + _maximumNextCheckDuration;
+
+        var query = EntityQueryEnumerator<AdvertiseComponent>();
+        while (query.MoveNext(out var uid, out var advert))
+        {
+            if (currentGameTime > advert.NextAdvertisementTime)
+            {
+                SayAdvertisement(uid, advert);
+                // The timer is always refreshed when it expires, to prevent mass advertising (ex: all the vending machines have no power, and get it back at the same time).
+                RandomizeNextAdvertTime(advert);
+            }
+            _nextCheckTime = MathHelper.Min(advert.NextAdvertisementTime, _nextCheckTime);
+        }
+    }
+
+
+    private static void OnPowerReceiverAttemptAdvertiseEvent(EntityUid uid, ApcPowerReceiverComponent powerReceiver, ref AttemptAdvertiseEvent args)
+    {
+        args.Cancelled |= !powerReceiver.Powered;
+    }
+
+    private static void OnVendingAttemptAdvertiseEvent(EntityUid uid, VendingMachineComponent machine, ref AttemptAdvertiseEvent args)
+    {
+        args.Cancelled |= machine.Broken;
+    }
+}
+
+[ByRefEvent]
+public record struct AttemptAdvertiseEvent(EntityUid? Advertiser)
+{
+    public bool Cancelled = false;
+}
diff --git a/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs b/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
new file mode 100644
index 00000000000..048f59b8d33
--- /dev/null
+++ b/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
@@ -0,0 +1,58 @@
+using Content.Server.Advertise.Components;
+using Content.Server.Chat.Systems;
+using Content.Server.UserInterface;
+using Content.Shared.Advertise;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Advertise;
+
+public sealed partial class SpeakOnUIClosedSystem : EntitySystem
+{
+    [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<SpeakOnUIClosedComponent, BoundUIClosedEvent>(OnBoundUIClosed);
+    }
+    private void OnBoundUIClosed(Entity<SpeakOnUIClosedComponent> entity, ref BoundUIClosedEvent args)
+    {
+        if (!TryComp(entity, out ActivatableUIComponent? activatable) || !args.UiKey.Equals(activatable.Key))
+            return;
+
+        if (entity.Comp.RequireFlag && !entity.Comp.Flag)
+            return;
+
+        TrySpeak((entity, entity.Comp));
+    }
+
+    public bool TrySpeak(Entity<SpeakOnUIClosedComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return false;
+
+        if (!entity.Comp.Enabled)
+            return false;
+
+        if (!_prototypeManager.TryIndex(entity.Comp.Pack, out MessagePackPrototype? messagePack))
+            return false;
+
+        var message = Loc.GetString(_random.Pick(messagePack.Messages), ("name", Name(entity)));
+        _chat.TrySendInGameICMessage(entity, message, InGameICChatType.Speak, true);
+        entity.Comp.Flag = false;
+        return true;
+    }
+
+    public bool TrySetFlag(Entity<SpeakOnUIClosedComponent?> entity, bool value = true)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return false;
+
+        entity.Comp.Flag = value;
+        return true;
+    }
+}
diff --git a/Content.Server/Advertisements/AdvertisementsPackPrototype.cs b/Content.Server/Advertisements/AdvertisementsPackPrototype.cs
deleted file mode 100644
index 641ab3c56fd..00000000000
--- a/Content.Server/Advertisements/AdvertisementsPackPrototype.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Advertisements
-{
-    [Serializable, Prototype("advertisementsPack")]
-    public sealed partial class AdvertisementsPackPrototype : IPrototype
-    {
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = default!;
-
-        [DataField("advertisements")]
-        public List<string> Advertisements { get; private set; } = new();
-
-        [DataField("thankyous")]
-        public List<string> ThankYous { get; private set; } = new();
-    }
-}
diff --git a/Content.Server/Alert/Click/AcceptingOffer.cs b/Content.Server/Alert/Click/AcceptingOffer.cs
new file mode 100644
index 00000000000..b6adbf83bd3
--- /dev/null
+++ b/Content.Server/Alert/Click/AcceptingOffer.cs
@@ -0,0 +1,24 @@
+using Content.Shared.OfferItem;
+using Content.Server.OfferItem;
+using Content.Shared.Alert;
+using JetBrains.Annotations;
+
+namespace Content.Server.Alert.Click;
+
+/// <summary>
+/// Accepting the offer and receive item
+/// </summary>
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class AcceptOffer : IAlertClick
+{
+    public void AlertClicked(EntityUid player)
+    {
+        var entManager = IoCManager.Resolve<IEntityManager>();
+
+        if (entManager.TryGetComponent(player, out OfferItemComponent? offerItem))
+        {
+            entManager.System<OfferItemSystem>().Receive(player, offerItem);
+        }
+    }
+}
diff --git a/Content.Server/Alert/Click/StopBeingPulled.cs b/Content.Server/Alert/Click/StopBeingPulled.cs
index 2cf076fbeed..b02da38ecfa 100644
--- a/Content.Server/Alert/Click/StopBeingPulled.cs
+++ b/Content.Server/Alert/Click/StopBeingPulled.cs
@@ -1,7 +1,7 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
-using Content.Shared.Pulling.Components;
-using Content.Shared.Pulling;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
 using JetBrains.Annotations;
 
 namespace Content.Server.Alert.Click
@@ -20,9 +20,9 @@ public void AlertClicked(EntityUid player)
             if (!entityManager.System<ActionBlockerSystem>().CanInteract(player, null))
                 return;
 
-            if (entityManager.TryGetComponent(player, out SharedPullableComponent? playerPullable))
+            if (entityManager.TryGetComponent(player, out PullableComponent? playerPullable))
             {
-                entityManager.System<SharedPullingSystem>().TryStopPull(playerPullable);
+                entityManager.System<PullingSystem>().TryStopPull(player, playerPullable, user: player);
             }
         }
     }
diff --git a/Content.Server/Alert/Click/StopPulling.cs b/Content.Server/Alert/Click/StopPulling.cs
index 00a41495985..76f9569429f 100644
--- a/Content.Server/Alert/Click/StopPulling.cs
+++ b/Content.Server/Alert/Click/StopPulling.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Alert;
-using Content.Shared.Pulling;
-using Content.Shared.Pulling.Components;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
 using JetBrains.Annotations;
 
 namespace Content.Server.Alert.Click
@@ -15,12 +15,12 @@ public sealed partial class StopPulling : IAlertClick
         public void AlertClicked(EntityUid player)
         {
             var entManager = IoCManager.Resolve<IEntityManager>();
+            var ps = entManager.System<PullingSystem>();
 
-            var ps = entManager.System<SharedPullingSystem>();
-            var playerTarget = ps.GetPulled(player);
-            if (playerTarget != default && entManager.TryGetComponent(playerTarget, out SharedPullableComponent? playerPullable))
+            if (entManager.TryGetComponent(player, out PullerComponent? puller) &&
+                entManager.TryGetComponent(puller.Pulling, out PullableComponent? pullableComp))
             {
-                ps.TryStopPull(playerPullable);
+                ps.TryStopPull(puller.Pulling.Value, pullableComp, user: player);
             }
         }
     }
diff --git a/Content.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs
index 848170ba9dc..d856fab9da7 100644
--- a/Content.Server/AlertLevel/AlertLevelSystem.cs
+++ b/Content.Server/AlertLevel/AlertLevelSystem.cs
@@ -6,6 +6,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
+using Content.Server.Announcements.Systems;
 
 namespace Content.Server.AlertLevel;
 
@@ -16,6 +17,7 @@ public sealed class AlertLevelSystem : EntitySystem
     [Dependency] private readonly ChatSystem _chatSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     // Until stations are a prototype, this is how it's going to have to be.
     public const string DefaultAlertLevelSet = "stationAlerts";
@@ -122,18 +124,14 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
             || component.AlertLevels == null
             || !component.AlertLevels.Levels.TryGetValue(level, out var detail)
             || component.CurrentLevel == level)
-        {
             return;
-        }
 
         if (!force)
         {
             if (!detail.Selectable
                 || component.CurrentDelay > 0
                 || component.IsLevelLocked)
-            {
                 return;
-            }
 
             component.CurrentDelay = _cfg.GetCVar(CCVars.GameAlertLevelChangeDelay);
             component.ActiveDelay = true;
@@ -142,64 +140,31 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
         component.CurrentLevel = level;
         component.IsLevelLocked = locked;
 
-        var stationName = dataComponent.EntityName;
-
         var name = level.ToLower();
-
         if (Loc.TryGetString($"alert-level-{level}", out var locName))
-        {
             name = locName.ToLower();
-        }
 
         // Announcement text. Is passed into announcementFull.
         var announcement = detail.Announcement;
 
         if (Loc.TryGetString(detail.Announcement, out var locAnnouncement))
-        {
             announcement = locAnnouncement;
-        }
 
-        // The full announcement to be spat out into chat.
-        var announcementFull = Loc.GetString("alert-level-announcement", ("name", name), ("announcement", announcement));
-
-        var playDefault = false;
+        var alert = _announcer.GetAnnouncementId($"Alert{level}");
         if (playSound)
-        {
-            if (detail.Sound != null)
-            {
-                var filter = _stationSystem.GetInOwningStation(station);
-                _audio.PlayGlobal(detail.Sound, filter, true, detail.Sound.Params);
-            }
-            else
-            {
-                playDefault = true;
-            }
-        }
-
+            _announcer.SendAnnouncementAudio(alert, _stationSystem.GetInOwningStation(station));
         if (announce)
-        {
-            _chatSystem.DispatchStationAnnouncement(station, announcementFull, playDefaultSound: playDefault,
-                colorOverride: detail.Color, sender: stationName);
-        }
+            _announcer.SendAnnouncementMessage(alert, "alert-level-announcement", null, detail.Color, null, null,
+                ("name", name), ("announcement", announcement));
 
         RaiseLocalEvent(new AlertLevelChangedEvent(station, level));
     }
 }
 
-public sealed class AlertLevelDelayFinishedEvent : EntityEventArgs
-{}
-
-public sealed class AlertLevelPrototypeReloadedEvent : EntityEventArgs
-{}
-
-public sealed class AlertLevelChangedEvent : EntityEventArgs
+public sealed class AlertLevelDelayFinishedEvent : EntityEventArgs;
+public sealed class AlertLevelPrototypeReloadedEvent : EntityEventArgs;
+public sealed class AlertLevelChangedEvent(EntityUid station, string alertLevel) : EntityEventArgs
 {
-    public EntityUid Station { get; }
-    public string AlertLevel { get; }
-
-    public AlertLevelChangedEvent(EntityUid station, string alertLevel)
-    {
-        Station = station;
-        AlertLevel = alertLevel;
-    }
+    public EntityUid Station { get; } = station;
+    public string AlertLevel { get; } = alertLevel;
 }
diff --git a/Content.Server/Announcements/AnnounceCommand.cs b/Content.Server/Announcements/AnnounceCommand.cs
index cedde3fc140..c7158eac009 100644
--- a/Content.Server/Announcements/AnnounceCommand.cs
+++ b/Content.Server/Announcements/AnnounceCommand.cs
@@ -1,8 +1,11 @@
+using System.Linq;
 using Content.Server.Administration;
-using Content.Server.Chat;
-using Content.Server.Chat.Systems;
+using Content.Server.Announcements.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Announcements.Prototypes;
 using Robust.Shared.Console;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Announcements
 {
@@ -11,27 +14,77 @@ public sealed class AnnounceCommand : IConsoleCommand
     {
         public string Command => "announce";
         public string Description => "Send an in-game announcement.";
-        public string Help => $"{Command} <sender> <message> or {Command} <message> to send announcement as CentCom.";
+        public string Help => $"{Command} <sender> <message> <sound> <announcer>";
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var chat = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
+            var announcer = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AnnouncerSystem>();
+            var proto = IoCManager.Resolve<IPrototypeManager>();
 
-            if (args.Length == 0)
+            switch (args.Length)
             {
-                shell.WriteError("Not enough arguments! Need at least 1.");
-                return;
+                case 0:
+                    shell.WriteError("Not enough arguments! Need at least 1.");
+                    return;
+                case 1:
+                    announcer.SendAnnouncement(announcer.GetAnnouncementId("CommandReport"), Filter.Broadcast(),
+                        args[0], "Central Command", Color.Gold);
+                    break;
+                case 2:
+                    announcer.SendAnnouncement(announcer.GetAnnouncementId("CommandReport"), Filter.Broadcast(),
+                        args[1], args[0], Color.Gold);
+                    break;
+                case 3:
+                    announcer.SendAnnouncement(announcer.GetAnnouncementId(args[2]), Filter.Broadcast(), args[1],
+                        args[0], Color.Gold);
+                    break;
+                case 4:
+                    if (!proto.TryIndex(args[3], out AnnouncerPrototype? prototype))
+                    {
+                        shell.WriteError($"No announcer prototype with ID {args[3]} found!");
+                        return;
+                    }
+                    announcer.SendAnnouncement(args[2], Filter.Broadcast(), args[1], args[0], Color.Gold, null,
+                        prototype);
+                    break;
             }
 
-            if (args.Length == 1)
-            {
-                chat.DispatchGlobalAnnouncement(args[0], colorOverride: Color.Gold);
-            }
-            else
+            shell.WriteLine("Sent!");
+        }
+
+        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        {
+            switch (args.Length)
             {
-                var message = string.Join(' ', new ArraySegment<string>(args, 1, args.Length-1));
-                chat.DispatchGlobalAnnouncement(message, args[0], colorOverride: Color.Gold);
+                case 3:
+                {
+                    var list = new List<string>();
+
+                    foreach (var prototype in IoCManager.Resolve<IPrototypeManager>()
+                                 .EnumeratePrototypes<AnnouncerPrototype>()
+                                 .SelectMany<AnnouncerPrototype, string>(p => p.Announcements.Select(a => a.ID)))
+                    {
+                        if (!list.Contains(prototype))
+                            list.Add(prototype);
+                    }
+
+                    return CompletionResult.FromHintOptions(list, Loc.GetString("admin-announce-hint-sound"));
+                }
+                case 4:
+                {
+                    var list = new List<string>();
+
+                    foreach (var prototype in IoCManager.Resolve<IPrototypeManager>()
+                        .EnumeratePrototypes<AnnouncerPrototype>())
+                    {
+                        if (!list.Contains(prototype.ID))
+                            list.Add(prototype.ID);
+                    }
+
+                    return CompletionResult.FromHintOptions(list, Loc.GetString("admin-announce-hint-voice"));
+                }
+                default:
+                    return CompletionResult.Empty;
             }
-            shell.WriteLine("Sent!");
         }
     }
 }
diff --git a/Content.Server/Announcements/Systems/AnnouncerSystem.Announce.cs b/Content.Server/Announcements/Systems/AnnouncerSystem.Announce.cs
new file mode 100644
index 00000000000..d705b86384d
--- /dev/null
+++ b/Content.Server/Announcements/Systems/AnnouncerSystem.Announce.cs
@@ -0,0 +1,96 @@
+using System.Linq;
+using Content.Shared.Announcements.Events;
+using Content.Shared.Announcements.Prototypes;
+using Robust.Shared.Audio;
+using Robust.Shared.Player;
+
+namespace Content.Server.Announcements.Systems;
+
+public sealed partial class AnnouncerSystem
+{
+    /// <summary>
+    ///     Gets an announcement message from the announcer
+    /// </summary>
+    /// <param name="announcementId">ID of the announcement from the announcer to get information from</param>
+    private string? GetAnnouncementMessage(string announcementId)
+    {
+        // Get the announcement data from the announcer
+        // Will be the fallback if the data for the announcementId is not found
+        var announcementType = Announcer.Announcements.FirstOrDefault(a => a.ID == announcementId) ??
+            Announcer.Announcements.First(a => a.ID == "fallback");
+
+        // Return the announcementType.MessageOverride if it exists, otherwise return null
+        return announcementType.MessageOverride != null ? Loc.GetString(announcementType.MessageOverride) : null;
+    }
+
+
+    /// <summary>
+    ///     Sends an announcement audio
+    /// </summary>
+    /// <param name="announcementId">ID of the announcement to get information from</param>
+    /// <param name="filter">Who hears the announcement audio</param>
+    /// <param name="announcerOverride">Uses this announcer instead of the current global one</param>
+    public void SendAnnouncementAudio(string announcementId, Filter filter, AnnouncerPrototype? announcerOverride = null)
+    {
+        var ev = new AnnouncementSendEvent(
+            announcerOverride?.ID ?? Announcer.ID,
+            announcementId,
+            filter.Recipients.ToList().ConvertAll(p => p.UserId), // I hate this but IEnumerable isn't serializable, and then ICommonSession wasn't, so you get the User ID
+            GetAudioParams(announcementId, Announcer) ?? AudioParams.Default
+        );
+
+        RaiseNetworkEvent(ev);
+    }
+
+    /// <summary>
+    ///     Sends an announcement message
+    /// </summary>
+    /// <param name="announcementId">ID of the announcement to get information from</param>
+    /// <param name="locale">Text to send in the announcement</param>
+    /// <param name="sender">Who to show as the announcement announcer, defaults to the current announcer's name</param>
+    /// <param name="colorOverride">What color the announcement should be</param>
+    /// <param name="station">Station ID to send the announcement to</param>
+    /// <param name="announcerOverride">Uses this announcer instead of the current global one</param>
+    /// <param name="localeArgs">Locale arguments to pass to the announcement message</param>
+    public void SendAnnouncementMessage(string announcementId, string locale, string? sender = null,
+        Color? colorOverride = null, EntityUid? station = null, AnnouncerPrototype? announcerOverride = null,
+        params (string, object)[] localeArgs)
+    {
+        sender ??= Loc.GetString($"announcer-{announcerOverride?.ID ?? Announcer.ID}-name");
+
+        // If the announcement has a message override, use that instead of the message parameter
+        if (GetAnnouncementMessage(announcementId, announcerOverride?.ID ?? Announcer.ID, localeArgs) is { } announcementMessage)
+            locale = announcementMessage;
+        else
+            locale = Loc.GetString(locale, localeArgs);
+
+        // Don't send nothing
+        if (string.IsNullOrEmpty(locale))
+            return;
+
+        // If there is a station, send the announcement to the station, otherwise send it to everyone
+        if (station == null)
+            _chat.DispatchGlobalAnnouncement(locale, sender, false, colorOverride: colorOverride);
+        else
+            _chat.DispatchStationAnnouncement(station.Value, locale, sender, false, colorOverride: colorOverride);
+    }
+
+    /// <summary>
+    ///     Sends an announcement with a message and audio
+    /// </summary>
+    /// <param name="announcementId">ID of the announcement to get information from</param>
+    /// <param name="filter">Who hears the announcement audio</param>
+    /// <param name="locale">Text to send in the announcement</param>
+    /// <param name="sender">Who to show as the announcement announcer, defaults to the current announcer's name</param>
+    /// <param name="colorOverride">What color the announcement should be</param>
+    /// <param name="station">Station ID to send the announcement to</param>
+    /// <param name="announcerOverride">Uses this announcer instead of the current global one</param>
+    /// <param name="localeArgs">Locale arguments to pass to the announcement message</param>
+    public void SendAnnouncement(string announcementId, Filter filter, string locale, string? sender = null,
+        Color? colorOverride = null, EntityUid? station = null, AnnouncerPrototype? announcerOverride = null,
+        params (string, object)[] localeArgs)
+    {
+        SendAnnouncementAudio(announcementId, filter, announcerOverride);
+        SendAnnouncementMessage(announcementId, locale, sender, colorOverride, station, announcerOverride, localeArgs);
+    }
+}
diff --git a/Content.Server/Announcements/Systems/AnnouncerSystem.Announcer.cs b/Content.Server/Announcements/Systems/AnnouncerSystem.Announcer.cs
new file mode 100644
index 00000000000..30969361110
--- /dev/null
+++ b/Content.Server/Announcements/Systems/AnnouncerSystem.Announcer.cs
@@ -0,0 +1,68 @@
+using System.Linq;
+using Content.Shared.GameTicking;
+using Content.Shared.Announcements.Prototypes;
+using Content.Shared.CCVar;
+using Content.Shared.Random;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Announcements.Systems;
+
+public sealed partial class AnnouncerSystem
+{
+    private void OnRoundRestarting(RoundRestartCleanupEvent ev)
+    {
+        NewAnnouncer();
+    }
+
+
+    /// <summary>
+    ///     Sets the announcer to a random one or the CVar
+    /// </summary>
+    private void NewAnnouncer()
+    {
+        var announcer = _config.GetCVar(CCVars.Announcer);
+        if (string.IsNullOrEmpty(announcer) || !_proto.TryIndex<AnnouncerPrototype>(announcer, out _))
+            SetAnnouncer(PickAnnouncer());
+        else
+            SetAnnouncer(announcer);
+    }
+
+    /// <summary>
+    ///     Picks a random announcer prototype following blacklists
+    /// </summary>
+    public AnnouncerPrototype PickAnnouncer()
+    {
+        var list = _proto.Index<WeightedRandomPrototype>(_config.GetCVar(CCVars.AnnouncerList));
+        var blacklist = _config.GetCVar(CCVars.AnnouncerBlacklist).Split(',').Select(a => a.Trim()).ToList();
+        var modWeights = list.Weights.Where(a => !blacklist.Contains(a.Key));
+
+        list = new WeightedRandomPrototype();
+        foreach (var (key, value) in modWeights)
+            list.Weights.Add(key, value);
+
+        return _proto.Index<AnnouncerPrototype>(list.Pick());
+    }
+
+
+    /// <summary>
+    ///     Sets the announcer
+    /// </summary>
+    /// <param name="announcerId">ID of the announcer to choose</param>
+    public void SetAnnouncer(string announcerId)
+    {
+        if (!_proto.TryIndex<AnnouncerPrototype>(announcerId, out var announcer))
+            DebugTools.Assert($"Set announcer {announcerId} does not exist, attempting to use previously set one.");
+        else
+            Announcer = announcer;
+    }
+
+    /// <summary>
+    ///     Sets the announcer
+    /// </summary>
+    /// <param name="announcer">The announcer prototype to set the current announcer to</param>
+    public void SetAnnouncer(AnnouncerPrototype announcer)
+    {
+        Announcer = announcer;
+    }
+}
diff --git a/Content.Server/Announcements/Systems/AnnouncerSystem.cs b/Content.Server/Announcements/Systems/AnnouncerSystem.cs
new file mode 100644
index 00000000000..1770a2ce937
--- /dev/null
+++ b/Content.Server/Announcements/Systems/AnnouncerSystem.cs
@@ -0,0 +1,33 @@
+using Content.Server.Chat.Systems;
+using Content.Shared.GameTicking;
+using Content.Shared.Announcements.Prototypes;
+using Content.Shared.Announcements.Systems;
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Announcements.Systems;
+
+public sealed partial class AnnouncerSystem : SharedAnnouncerSystem
+{
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+
+    /// <summary>
+    ///     The currently selected announcer
+    /// </summary>
+    [Access(typeof(AnnouncerSystem))]
+    public AnnouncerPrototype Announcer { get; set; } = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        NewAnnouncer();
+
+        _config.OnValueChanged(CCVars.Announcer, _ => NewAnnouncer());
+
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestarting);
+    }
+}
diff --git a/Content.Server/Anomaly/AnomalySystem.Generator.cs b/Content.Server/Anomaly/AnomalySystem.Generator.cs
index 2053a7bbbe6..7aa1a8935f3 100644
--- a/Content.Server/Anomaly/AnomalySystem.Generator.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Generator.cs
@@ -24,7 +24,7 @@ namespace Content.Server.Anomaly;
 /// </summary>
 public sealed partial class AnomalySystem
 {
-    [Dependency] private readonly MapSystem _mapSystem = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     private void InitializeGenerator()
@@ -103,7 +103,7 @@ public void SpawnOnRandomGridLocation(EntityUid grid, string toSpawn)
             var tile = new Vector2i(randomX, randomY);
 
             // no air-blocked areas.
-            if (_atmosphere.IsTileSpace(grid, xform.MapUid, tile, mapGridComp: gridComp) ||
+            if (_atmosphere.IsTileSpace(grid, xform.MapUid, tile) ||
                 _atmosphere.IsTileAirBlocked(grid, tile, mapGridComp: gridComp))
             {
                 continue;
diff --git a/Content.Server/Anomaly/AnomalySystem.Psionics.cs b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
index 95fda1d5035..1011b199126 100644
--- a/Content.Server/Anomaly/AnomalySystem.Psionics.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
@@ -8,14 +8,15 @@ namespace Content.Server.Anomaly;
 public sealed partial class AnomalySystem
 {
     [Dependency] private readonly SharedAnomalySystem _sharedAnomaly = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly DispelPowerSystem _dispel = default!;
+
+
     private void InitializePsionics()
     {
         SubscribeLocalEvent<AnomalyComponent, DispelledEvent>(OnDispelled);
     }
 
-    //Nyano - Summary: gives dispellable behavior to Anomalies. 
+    //Nyano - Summary: gives dispellable behavior to Anomalies.
     private void OnDispelled(EntityUid uid, AnomalyComponent component, DispelledEvent args)
     {
         _dispel.DealDispelDamage(uid);
diff --git a/Content.Server/Anomaly/AnomalySystem.Scanner.cs b/Content.Server/Anomaly/AnomalySystem.Scanner.cs
index 74af8e67e3c..bce508903d0 100644
--- a/Content.Server/Anomaly/AnomalySystem.Scanner.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Scanner.cs
@@ -1,4 +1,4 @@
-using Content.Server.Anomaly.Components;
+using Content.Server.Anomaly.Components;
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.DoAfter;
@@ -21,6 +21,7 @@ private void InitializeScanner()
 
         SubscribeLocalEvent<AnomalySeverityChangedEvent>(OnScannerAnomalySeverityChanged);
         SubscribeLocalEvent<AnomalyHealthChangedEvent>(OnScannerAnomalyHealthChanged);
+        SubscribeLocalEvent<AnomalyBehaviorChangedEvent>(OnScannerAnomalyBehaviorChanged);
     }
 
     private void OnScannerAnomalyShutdown(ref AnomalyShutdownEvent args)
@@ -67,6 +68,17 @@ private void OnScannerAnomalyHealthChanged(ref AnomalyHealthChangedEvent args)
         }
     }
 
+    private void OnScannerAnomalyBehaviorChanged(ref AnomalyBehaviorChangedEvent args)
+    {
+        var query = EntityQueryEnumerator<AnomalyScannerComponent>();
+        while (query.MoveNext(out var uid, out var component))
+        {
+            if (component.ScannedAnomaly != args.Anomaly)
+                continue;
+            UpdateScannerUi(uid, component);
+        }
+    }
+
     private void OnScannerUiOpened(EntityUid uid, AnomalyScannerComponent component, BoundUIOpenedEvent args)
     {
         UpdateScannerUi(uid, component);
@@ -132,29 +144,95 @@ public FormattedMessage GetScannerMessage(AnomalyScannerComponent component)
             return msg;
         }
 
-        msg.AddMarkup(Loc.GetString("anomaly-scanner-severity-percentage", ("percent", anomalyComp.Severity.ToString("P"))));
+        TryComp<SecretDataAnomalyComponent>(anomaly, out var secret);
+
+        //Severity
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.Severity))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-severity-percentage-unknown"));
+        else
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-severity-percentage", ("percent", anomalyComp.Severity.ToString("P"))));
         msg.PushNewline();
-        string stateLoc;
-        if (anomalyComp.Stability < anomalyComp.DecayThreshold)
-            stateLoc = Loc.GetString("anomaly-scanner-stability-low");
-        else if (anomalyComp.Stability > anomalyComp.GrowthThreshold)
-            stateLoc =  Loc.GetString("anomaly-scanner-stability-high");
+
+        //Stability
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.Stability))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-stability-unknown"));
         else
-            stateLoc =  Loc.GetString("anomaly-scanner-stability-medium");
-        msg.AddMarkup(stateLoc);
+        {
+            string stateLoc;
+            if (anomalyComp.Stability < anomalyComp.DecayThreshold)
+                stateLoc = Loc.GetString("anomaly-scanner-stability-low");
+            else if (anomalyComp.Stability > anomalyComp.GrowthThreshold)
+                stateLoc = Loc.GetString("anomaly-scanner-stability-high");
+            else
+                stateLoc = Loc.GetString("anomaly-scanner-stability-medium");
+            msg.AddMarkup(stateLoc);
+        }
         msg.PushNewline();
 
-        msg.AddMarkup(Loc.GetString("anomaly-scanner-point-output", ("point", GetAnomalyPointValue(anomaly, anomalyComp))));
+        //Point output
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.OutputPoint))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-point-output-unknown"));
+        else
+            msg.AddMarkup(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.PushNewline();
-        msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-danger", ("type", GetParticleLocale(anomalyComp.SeverityParticleType))));
+
+        //Danger
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleDanger))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-danger-unknown"));
+        else
+            msg.AddMarkup(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"));
+        else
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-unstable", ("type", GetParticleLocale(anomalyComp.DestabilizingParticleType))));
         msg.PushNewline();
-        msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-unstable", ("type", GetParticleLocale(anomalyComp.DestabilizingParticleType))));
+
+        //Containment
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleContainment))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-containment-unknown"));
+        else
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-containment", ("type", GetParticleLocale(anomalyComp.WeakeningParticleType))));
         msg.PushNewline();
-        msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-containment", ("type", GetParticleLocale(anomalyComp.WeakeningParticleType))));
+
+        //Transformation
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleTransformation))
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-transformation-unknown"));
+        else
+            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-transformation", ("type", GetParticleLocale(anomalyComp.TransformationParticleType))));
+
+
+        //Behavior
+        msg.PushNewline();
+        msg.PushNewline();
+        msg.AddMarkup(Loc.GetString("anomaly-behavior-title"));
+        msg.PushNewline();
+
+        if (secret != null && secret.Secret.Contains(AnomalySecretData.Behavior))
+            msg.AddMarkup(Loc.GetString("anomaly-behavior-unknown"));
+        else
+        {
+            if (anomalyComp.CurrentBehavior != null)
+            {
+                var behavior = _prototype.Index(anomalyComp.CurrentBehavior.Value);
+
+                msg.AddMarkup("- " + Loc.GetString(behavior.Description));
+                msg.PushNewline();
+                var mod = Math.Floor((behavior.EarnPointModifier) * 100);
+                msg.AddMarkup("- " + Loc.GetString("anomaly-behavior-point", ("mod", mod)));
+            }
+            else
+            {
+                msg.AddMarkup(Loc.GetString("anomaly-behavior-balanced"));
+            }
+        }
 
         //The timer at the end here is actually added in the ui itself.
         return msg;
diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs
index 6f337097f48..29c83ab0299 100644
--- a/Content.Server/Anomaly/AnomalySystem.cs
+++ b/Content.Server/Anomaly/AnomalySystem.cs
@@ -8,13 +8,18 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
+using Content.Shared.Anomaly.Prototypes;
 using Content.Shared.DoAfter;
+using Content.Shared.Random;
+using Content.Shared.Random.Helpers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Serialization.Manager;
+using System.Linq;
 
 namespace Content.Server.Anomaly;
 
@@ -33,13 +38,20 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
     [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly RadioSystem _radio = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly RadiationSystem _radiation = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly IComponentFactory _componentFactory = default!;
+    [Dependency] private readonly ISerializationManager _serialization = default!;
+    [Dependency] private readonly IEntityManager _entity = default!;
 
     public const float MinParticleVariation = 0.8f;
     public const float MaxParticleVariation = 1.2f;
 
+    [ValidatePrototypeId<WeightedRandomPrototype>]
+    const string WeightListProto = "AnomalyBehaviorList";
+
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -55,25 +67,34 @@ public override void Initialize()
         InitializeCommands();
     }
 
-    private void OnMapInit(EntityUid uid, AnomalyComponent component, MapInitEvent args)
+    private void OnMapInit(Entity<AnomalyComponent> anomaly, ref MapInitEvent args)
     {
-        component.NextPulseTime = Timing.CurTime + GetPulseLength(component) * 3; // longer the first time
-        ChangeAnomalyStability(uid, Random.NextFloat(component.InitialStabilityRange.Item1 , component.InitialStabilityRange.Item2), component);
-        ChangeAnomalySeverity(uid, Random.NextFloat(component.InitialSeverityRange.Item1, component.InitialSeverityRange.Item2), component);
+        anomaly.Comp.NextPulseTime = Timing.CurTime + GetPulseLength(anomaly.Comp) * 3; // longer the first time
+        ChangeAnomalyStability(anomaly, Random.NextFloat(anomaly.Comp.InitialStabilityRange.Item1 , anomaly.Comp.InitialStabilityRange.Item2), anomaly.Comp);
+        ChangeAnomalySeverity(anomaly, Random.NextFloat(anomaly.Comp.InitialSeverityRange.Item1, anomaly.Comp.InitialSeverityRange.Item2), anomaly.Comp);
+
+        ShuffleParticlesEffect(anomaly.Comp);
+        anomaly.Comp.Continuity = _random.NextFloat(anomaly.Comp.MinContituty, anomaly.Comp.MaxContituty);
+        SetBehavior(anomaly, GetRandomBehavior());
+    }
 
+    public void ShuffleParticlesEffect(AnomalyComponent anomaly)
+    {
         var particles = new List<AnomalousParticleType>
-            { AnomalousParticleType.Delta, AnomalousParticleType.Epsilon, AnomalousParticleType.Zeta };
-        component.SeverityParticleType = Random.PickAndTake(particles);
-        component.DestabilizingParticleType = Random.PickAndTake(particles);
-        component.WeakeningParticleType = Random.PickAndTake(particles);
+            { AnomalousParticleType.Delta, AnomalousParticleType.Epsilon, AnomalousParticleType.Zeta, AnomalousParticleType.Sigma };
+
+        anomaly.SeverityParticleType = Random.PickAndTake(particles);
+        anomaly.DestabilizingParticleType = Random.PickAndTake(particles);
+        anomaly.WeakeningParticleType = Random.PickAndTake(particles);
+        anomaly.TransformationParticleType = Random.PickAndTake(particles);
     }
 
-    private void OnShutdown(EntityUid uid, AnomalyComponent component, ComponentShutdown args)
+    private void OnShutdown(Entity<AnomalyComponent> anomaly, ref ComponentShutdown args)
     {
-        EndAnomaly(uid, component);
+        EndAnomaly(anomaly);
     }
 
-    private void OnStartCollide(EntityUid uid, AnomalyComponent component, ref StartCollideEvent args)
+    private void OnStartCollide(Entity<AnomalyComponent> anomaly, ref StartCollideEvent args)
     {
         if (!TryComp<AnomalousParticleComponent>(args.OtherEntity, out var particle))
             return;
@@ -81,21 +102,33 @@ private void OnStartCollide(EntityUid uid, AnomalyComponent component, ref Start
         if (args.OtherFixtureId != particle.FixtureId)
             return;
 
+        var behaviorMod = 1f;
+        if (anomaly.Comp.CurrentBehavior != null)
+        {
+            var b = _prototype.Index(anomaly.Comp.CurrentBehavior.Value);
+            behaviorMod = b.ParticleSensivity;
+        }
         // small function to randomize because it's easier to read like this
-        float VaryValue(float v) => v * Random.NextFloat(MinParticleVariation, MaxParticleVariation);
+        float VaryValue(float v) => v * behaviorMod * Random.NextFloat(MinParticleVariation, MaxParticleVariation);
 
-        if (particle.ParticleType == component.DestabilizingParticleType || particle.DestabilzingOverride)
+        if (particle.ParticleType == anomaly.Comp.DestabilizingParticleType || particle.DestabilzingOverride)
         {
-            ChangeAnomalyStability(uid, VaryValue(particle.StabilityPerDestabilizingHit), component);
+            ChangeAnomalyStability(anomaly, VaryValue(particle.StabilityPerDestabilizingHit), anomaly.Comp);
         }
-        if (particle.ParticleType == component.SeverityParticleType || particle.SeverityOverride)
+        if (particle.ParticleType == anomaly.Comp.SeverityParticleType || particle.SeverityOverride)
         {
-            ChangeAnomalySeverity(uid, VaryValue(particle.SeverityPerSeverityHit), component);
+            ChangeAnomalySeverity(anomaly, VaryValue(particle.SeverityPerSeverityHit), anomaly.Comp);
         }
-        if (particle.ParticleType == component.WeakeningParticleType || particle.WeakeningOverride)
+        if (particle.ParticleType == anomaly.Comp.WeakeningParticleType || particle.WeakeningOverride)
         {
-            ChangeAnomalyHealth(uid, VaryValue(particle.HealthPerWeakeningeHit), component);
-            ChangeAnomalyStability(uid, VaryValue(particle.StabilityPerWeakeningeHit), component);
+            ChangeAnomalyHealth(anomaly, VaryValue(particle.HealthPerWeakeningeHit), anomaly.Comp);
+            ChangeAnomalyStability(anomaly, VaryValue(particle.StabilityPerWeakeningeHit), anomaly.Comp);
+        }
+        if (particle.ParticleType == anomaly.Comp.TransformationParticleType || particle.TransmutationOverride)
+        {
+            ChangeAnomalySeverity(anomaly, VaryValue(particle.SeverityPerSeverityHit), anomaly.Comp);
+            if (_random.Prob(anomaly.Comp.Continuity))
+                SetBehavior(anomaly, GetRandomBehavior());
         }
     }
 
@@ -117,6 +150,13 @@ public int GetAnomalyPointValue(EntityUid anomaly, AnomalyComponent? component =
         //penalty of up to 50% based on health
         multiplier *= MathF.Pow(1.5f, component.Health) - 0.5f;
 
+        //Apply behavior modifier
+        if (component.CurrentBehavior != null)
+        {
+            var behavior = _prototype.Index(component.CurrentBehavior.Value);
+            multiplier *= behavior.EarnPointModifier;
+        }
+
         var severityValue = 1 / (1 + MathF.Pow(MathF.E, -7 * (component.Severity - 0.5f)));
 
         return (int) ((component.MaxPointsPerSecond - component.MinPointsPerSecond) * severityValue * multiplier) + component.MinPointsPerSecond;
@@ -134,6 +174,7 @@ public string GetParticleLocale(AnomalousParticleType type)
             AnomalousParticleType.Delta => Loc.GetString("anomaly-particles-delta"),
             AnomalousParticleType.Epsilon => Loc.GetString("anomaly-particles-epsilon"),
             AnomalousParticleType.Zeta => Loc.GetString("anomaly-particles-zeta"),
+            AnomalousParticleType.Sigma => Loc.GetString("anomaly-particles-sigma"),
             _ => throw new ArgumentOutOfRangeException()
         };
     }
@@ -145,4 +186,40 @@ public override void Update(float frameTime)
         UpdateGenerator();
         UpdateVessels();
     }
+
+    #region Behavior
+    private string GetRandomBehavior()
+    {
+        var weightList = _prototype.Index<WeightedRandomPrototype>(WeightListProto);
+        return weightList.Pick(_random);
+    }
+
+    private void SetBehavior(Entity<AnomalyComponent> anomaly, ProtoId<AnomalyBehaviorPrototype> behaviorProto)
+    {
+        if (anomaly.Comp.CurrentBehavior == behaviorProto)
+            return;
+
+        if (anomaly.Comp.CurrentBehavior != null)
+            RemoveBehavior(anomaly, anomaly.Comp.CurrentBehavior.Value);
+
+        //event broadcast
+        var ev = new AnomalyBehaviorChangedEvent(anomaly, anomaly.Comp.CurrentBehavior, behaviorProto);
+        anomaly.Comp.CurrentBehavior = behaviorProto;
+        RaiseLocalEvent(anomaly, ref ev, true);
+
+        var behavior = _prototype.Index(behaviorProto);
+
+        EntityManager.AddComponents(anomaly, behavior.Components);
+    }
+
+    private void RemoveBehavior(Entity<AnomalyComponent> anomaly, ProtoId<AnomalyBehaviorPrototype> behaviorProto)
+    {
+        if (anomaly.Comp.CurrentBehavior == null)
+            return;
+
+        var behavior = _prototype.Index(anomaly.Comp.CurrentBehavior.Value);
+
+        EntityManager.RemoveComponents(anomaly, behavior.Components);
+    }
+    #endregion
 }
diff --git a/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs b/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs
index 9141ca6529c..5b05522bb9a 100644
--- a/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs
+++ b/Content.Server/Anomaly/Components/AnomalousParticleComponent.cs
@@ -13,58 +13,64 @@ public sealed partial class AnomalousParticleComponent : Component
     /// The type of particle that the projectile
     /// imbues onto the anomaly on contact.
     /// </summary>
-    [DataField("particleType", required: true)]
+    [DataField(required: true)]
     public AnomalousParticleType ParticleType;
 
     /// <summary>
     /// The fixture that's checked on collision.
     /// </summary>
-    [DataField("fixtureId")]
+    [DataField]
     public string FixtureId = "projectile";
 
     /// <summary>
     /// The amount that the <see cref="AnomalyComponent.Severity"/> increases by when hit
     /// of an anomalous particle of <seealso cref="AnomalyComponent.SeverityParticleType"/>.
     /// </summary>
-    [DataField("severityPerSeverityHit")]
+    [DataField]
     public float SeverityPerSeverityHit = 0.025f;
 
     /// <summary>
     /// The amount that the <see cref="AnomalyComponent.Stability"/> increases by when hit
     /// of an anomalous particle of <seealso cref="AnomalyComponent.DestabilizingParticleType"/>.
     /// </summary>
-    [DataField("stabilityPerDestabilizingHit")]
+    [DataField]
     public float StabilityPerDestabilizingHit = 0.04f;
 
     /// <summary>
     /// The amount that the <see cref="AnomalyComponent.Stability"/> increases by when hit
     /// of an anomalous particle of <seealso cref="AnomalyComponent.DestabilizingParticleType"/>.
     /// </summary>
-    [DataField("healthPerWeakeningeHit")]
+    [DataField]
     public float HealthPerWeakeningeHit = -0.05f;
 
     /// <summary>
     /// The amount that the <see cref="AnomalyComponent.Stability"/> increases by when hit
     /// of an anomalous particle of <seealso cref="AnomalyComponent.DestabilizingParticleType"/>.
     /// </summary>
-    [DataField("stabilityPerWeakeningeHit")]
+    [DataField]
     public float StabilityPerWeakeningeHit = -0.1f;
 
     /// <summary>
     /// If this is true then the particle will always affect the stability of the anomaly.
     /// </summary>
-    [DataField("destabilzingOverride")]
+    [DataField]
     public bool DestabilzingOverride = false;
 
     /// <summary>
     /// If this is true then the particle will always affect the weakeness of the anomaly.
     /// </summary>
-    [DataField("weakeningOverride")]
+    [DataField]
     public bool WeakeningOverride = false;
 
     /// <summary>
     /// If this is true then the particle will always affect the severity of the anomaly.
     /// </summary>
-    [DataField("severityOverride")]
+    [DataField]
     public bool SeverityOverride = false;
+
+    /// <summary>
+    /// If this is true then the particle will always affect the behaviour.
+    /// </summary>
+    [DataField]
+    public bool TransmutationOverride = false;
 }
diff --git a/Content.Server/Anomaly/Components/SecretDataAnomalyComponent.cs b/Content.Server/Anomaly/Components/SecretDataAnomalyComponent.cs
new file mode 100644
index 00000000000..80eecaafc79
--- /dev/null
+++ b/Content.Server/Anomaly/Components/SecretDataAnomalyComponent.cs
@@ -0,0 +1,45 @@
+using Content.Server.Anomaly.Effects;
+
+namespace Content.Server.Anomaly.Components;
+
+/// <summary>
+/// Hides some information about the anomaly when scanning it
+/// </summary>
+[RegisterComponent, Access(typeof(SecretDataAnomalySystem), typeof(AnomalySystem))]
+public sealed partial class SecretDataAnomalyComponent : Component
+{
+    /// <summary>
+    /// Minimum hidden data elements on MapInit
+    /// </summary>
+    [DataField]
+    public int RandomStartSecretMin = 0;
+
+    /// <summary>
+    /// Maximum hidden data elements on MapInit
+    /// </summary>
+    [DataField]
+    public int RandomStartSecretMax = 0;
+
+    /// <summary>
+    /// Current secret data
+    /// </summary>
+    [DataField]
+    public List<AnomalySecretData> Secret = new();
+}
+
+/// <summary>
+/// Enum with secret data field variants
+/// </summary>
+[Serializable]
+public enum AnomalySecretData : byte
+{
+    Severity,
+    Stability,
+    OutputPoint,
+    ParticleDanger,
+    ParticleUnstable,
+    ParticleContainment,
+    ParticleTransformation,
+    Behavior,
+    Default
+}
diff --git a/Content.Server/Anomaly/Components/ShuffleParticlesAnomalyComponent.cs b/Content.Server/Anomaly/Components/ShuffleParticlesAnomalyComponent.cs
new file mode 100644
index 00000000000..00db76d4864
--- /dev/null
+++ b/Content.Server/Anomaly/Components/ShuffleParticlesAnomalyComponent.cs
@@ -0,0 +1,28 @@
+using Content.Server.Anomaly.Effects;
+
+namespace Content.Server.Anomaly.Components;
+
+/// <summary>
+/// Shuffle Particle types in some situations
+/// </summary>
+[RegisterComponent, Access(typeof(ShuffleParticlesAnomalySystem))]
+public sealed partial class ShuffleParticlesAnomalyComponent : Component
+{
+    /// <summary>
+    /// Prob() chance to randomize particle types after Anomaly pulation
+    /// </summary>
+    [DataField]
+    public bool ShuffleOnPulse = false;
+
+    /// <summary>
+    /// Prob() chance to randomize particle types after APE or CHIMP projectile
+    /// </summary>
+    [DataField]
+    public bool ShuffleOnParticleHit = false;
+
+    /// <summary>
+    /// Chance to random particles
+    /// </summary>
+    [DataField]
+    public float Prob = 0.5f;
+}
diff --git a/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs b/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs
index 87c0ba4a4ee..bd8c2f3c7de 100644
--- a/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Numerics;
 using Content.Server.Anomaly.Components;
 using Content.Shared.Administration.Logs;
@@ -8,6 +8,7 @@
 using Content.Shared.Teleportation.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Collections;
 using Robust.Shared.Random;
 
 namespace Content.Server.Anomaly.Effects;
@@ -32,23 +33,22 @@ private void OnPulse(EntityUid uid, BluespaceAnomalyComponent component, ref Ano
     {
         var xformQuery = GetEntityQuery<TransformComponent>();
         var xform = xformQuery.GetComponent(uid);
-        var range = component.MaxShuffleRadius * args.Severity;
+        var range = component.MaxShuffleRadius * args.Severity * args.PowerModifier;
         var mobs = new HashSet<Entity<MobStateComponent>>();
         _lookup.GetEntitiesInRange(xform.Coordinates, range, mobs);
-        var allEnts = new List<EntityUid>(mobs.Select(m => m.Owner)) { uid };
-        var coords = new List<Vector2>();
+        var allEnts = new ValueList<EntityUid>(mobs.Select(m => m.Owner)) { uid };
+        var coords = new ValueList<Vector2>();
         foreach (var ent in allEnts)
         {
-            if (xformQuery.TryGetComponent(ent, out var xf))
-                coords.Add(xf.MapPosition.Position);
+            if (xformQuery.TryGetComponent(ent, out var allXform))
+                coords.Add(_xform.GetWorldPosition(allXform));
         }
 
         _random.Shuffle(coords);
         for (var i = 0; i < allEnts.Count; i++)
         {
-
             _adminLogger.Add(LogType.Teleport, $"{ToPrettyString(allEnts[i])} has been shuffled to {coords[i]} by the {ToPrettyString(uid)} at {xform.Coordinates}");
-            _xform.SetWorldPosition(allEnts[i], coords[i], xformQuery);
+            _xform.SetWorldPosition(allEnts[i], coords[i]);
         }
     }
 
@@ -56,7 +56,7 @@ private void OnSupercritical(EntityUid uid, BluespaceAnomalyComponent component,
     {
         var xform = Transform(uid);
         var mapPos = _xform.GetWorldPosition(xform);
-        var radius = component.SupercriticalTeleportRadius;
+        var radius = component.SupercriticalTeleportRadius * args.PowerModifier;
         var gridBounds = new Box2(mapPos - new Vector2(radius, radius), mapPos + new Vector2(radius, radius));
         var mobs = new HashSet<Entity<MobStateComponent>>();
         _lookup.GetEntitiesInRange(xform.Coordinates, component.MaxShuffleRadius, mobs);
diff --git a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
index 8b5a72449f3..f2a060d6295 100644
--- a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
@@ -28,7 +28,7 @@ public override void Initialize()
 
     private void OnPulse(Entity<ElectricityAnomalyComponent> anomaly, ref AnomalyPulseEvent args)
     {
-        var range = anomaly.Comp.MaxElectrocuteRange * args.Stability;
+        var range = anomaly.Comp.MaxElectrocuteRange * args.Stability * args.PowerModifier;
 
         int boltCount = (int)MathF.Floor(MathHelper.Lerp((float)anomaly.Comp.MinBoltCount, (float)anomaly.Comp.MaxBoltCount, args.Severity));
 
@@ -37,7 +37,7 @@ private void OnPulse(Entity<ElectricityAnomalyComponent> anomaly, ref AnomalyPul
 
     private void OnSupercritical(Entity<ElectricityAnomalyComponent> anomaly, ref AnomalySupercriticalEvent args)
     {
-        var range = anomaly.Comp.MaxElectrocuteRange * 3;
+        var range = anomaly.Comp.MaxElectrocuteRange * 3 * args.PowerModifier;
 
         _emp.EmpPulse(_transform.GetMapCoordinates(anomaly), range, anomaly.Comp.EmpEnergyConsumption, anomaly.Comp.EmpDisabledDuration);
         _lightning.ShootRandomLightnings(anomaly, range, anomaly.Comp.MaxBoltCount * 3, arcDepth: 3);
diff --git a/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs b/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs
index 7c397d68887..86d6937af5e 100644
--- a/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects;
 using Content.Shared.Anomaly.Effects.Components;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
@@ -12,7 +11,6 @@ namespace Content.Server.Anomaly.Effects;
 public sealed class EntityAnomalySystem : SharedEntityAnomalySystem
 {
     [Dependency] private readonly SharedAnomalySystem _anomaly = default!;
-    [Dependency] private readonly IMapManager _map = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
@@ -37,7 +35,7 @@ private void OnPulse(Entity<EntitySpawnAnomalyComponent> component, ref AnomalyP
             if (!entry.Settings.SpawnOnPulse)
                 continue;
 
-            SpawnEntities(component, entry, args.Stability, args.Severity);
+            SpawnEntities(component, entry, args.Stability, args.Severity, args.PowerModifier);
         }
     }
 
@@ -48,7 +46,7 @@ private void OnSupercritical(Entity<EntitySpawnAnomalyComponent> component, ref
             if (!entry.Settings.SpawnOnSuperCritical)
                 continue;
 
-            SpawnEntities(component, entry, 1, 1);
+            SpawnEntities(component, entry, 1, 1, args.PowerModifier);
         }
     }
 
@@ -59,7 +57,7 @@ private void OnShutdown(Entity<EntitySpawnAnomalyComponent> component, ref Anoma
             if (!entry.Settings.SpawnOnShutdown || args.Supercritical)
                 continue;
 
-            SpawnEntities(component, entry, 1, 1);
+            SpawnEntities(component, entry, 1, 1, 1);
         }
     }
 
@@ -70,7 +68,7 @@ private void OnStabilityChanged(Entity<EntitySpawnAnomalyComponent> component, r
             if (!entry.Settings.SpawnOnStabilityChanged)
                 continue;
 
-            SpawnEntities(component, entry, args.Stability, args.Severity);
+            SpawnEntities(component, entry, args.Stability, args.Severity, 1);
         }
     }
 
@@ -81,17 +79,17 @@ private void OnSeverityChanged(Entity<EntitySpawnAnomalyComponent> component, re
             if (!entry.Settings.SpawnOnSeverityChanged)
                 continue;
 
-            SpawnEntities(component, entry, args.Stability, args.Severity);
+            SpawnEntities(component, entry, args.Stability, args.Severity, 1);
         }
     }
 
-    private void SpawnEntities(Entity<EntitySpawnAnomalyComponent> anomaly, EntitySpawnSettingsEntry entry, float stability, float severity)
+    private void SpawnEntities(Entity<EntitySpawnAnomalyComponent> anomaly, EntitySpawnSettingsEntry entry, float stability, float severity, float powerMod)
     {
         var xform = Transform(anomaly);
         if (!TryComp(xform.GridUid, out MapGridComponent? grid))
             return;
 
-        var tiles = _anomaly.GetSpawningPoints(anomaly, stability, severity, entry.Settings);
+        var tiles = _anomaly.GetSpawningPoints(anomaly, stability, severity, entry.Settings, powerMod);
         if (tiles == null)
             return;
 
diff --git a/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs b/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs
index a5e42be5400..7fee8fdb985 100644
--- a/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs
@@ -2,11 +2,10 @@
 using Content.Server.Anomaly.Components;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Atmos;
-using Robust.Server.GameObjects;
-using Robust.Shared.Map;
 using Robust.Shared.Random;
 using System.Linq;
 using System.Numerics;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Anomaly.Effects;
 
@@ -16,8 +15,6 @@ namespace Content.Server.Anomaly.Effects;
 public sealed class GasProducerAnomalySystem : EntitySystem
 {
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
-    [Dependency] private readonly TransformSystem _xform = default!;
-    [Dependency] private readonly IMapManager _map = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
@@ -55,7 +52,7 @@ private void ReleaseGas(EntityUid uid, Gas gas, float mols, float radius, int co
     {
         var xform = Transform(uid);
 
-        if (!_map.TryGetGrid(xform.GridUid, out var grid))
+        if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
             return;
 
         var localpos = xform.Coordinates.Position;
@@ -65,7 +62,7 @@ private void ReleaseGas(EntityUid uid, Gas gas, float mols, float radius, int co
         if (tilerefs.Length == 0)
             return;
 
-        var mixture = _atmosphere.GetTileMixture((uid, xform), grid, true);
+        var mixture = _atmosphere.GetTileMixture((uid, xform), true);
         if (mixture != null)
         {
             mixture.AdjustMoles(gas, mols);
diff --git a/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs b/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs
index 2bef32e3228..731d853280c 100644
--- a/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs
@@ -29,12 +29,12 @@ public override void Initialize()
 
     private void OnPulse(Entity<InjectionAnomalyComponent> entity, ref AnomalyPulseEvent args)
     {
-        PulseScalableEffect(entity, entity.Comp.InjectRadius, entity.Comp.MaxSolutionInjection * args.Severity);
+        PulseScalableEffect(entity, entity.Comp.InjectRadius * args.PowerModifier, entity.Comp.MaxSolutionInjection * args.Severity * args.PowerModifier);
     }
 
     private void OnSupercritical(Entity<InjectionAnomalyComponent> entity, ref AnomalySupercriticalEvent args)
     {
-        PulseScalableEffect(entity, entity.Comp.SuperCriticalInjectRadius, entity.Comp.SuperCriticalSolutionInjection);
+        PulseScalableEffect(entity, entity.Comp.SuperCriticalInjectRadius * args.PowerModifier, entity.Comp.SuperCriticalSolutionInjection * args.PowerModifier);
     }
 
     private void PulseScalableEffect(Entity<InjectionAnomalyComponent> entity, float injectRadius, float maxInject)
diff --git a/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs b/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs
index 8483c86dbbf..23e0e472f0c 100644
--- a/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs
@@ -31,12 +31,12 @@ public override void Initialize()
 
     private void OnPulse(EntityUid uid, ProjectileAnomalyComponent component, ref AnomalyPulseEvent args)
     {
-        ShootProjectilesAtEntities(uid, component, args.Severity);
+        ShootProjectilesAtEntities(uid, component, args.Severity * args.PowerModifier);
     }
 
     private void OnSupercritical(EntityUid uid, ProjectileAnomalyComponent component, ref AnomalySupercriticalEvent args)
     {
-        ShootProjectilesAtEntities(uid, component, 1.0f);
+        ShootProjectilesAtEntities(uid, component, args.PowerModifier);
     }
 
     private void ShootProjectilesAtEntities(EntityUid uid, ProjectileAnomalyComponent component, float severity)
diff --git a/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs b/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs
index 90177bae8e3..d460e6f4b08 100644
--- a/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs
@@ -25,9 +25,10 @@ private void OnPulse(Entity<PuddleCreateAnomalyComponent> entity, ref AnomalyPul
             return;
 
         var xform = Transform(entity.Owner);
-        var puddleSol = _solutionContainer.SplitSolution(sol.Value, entity.Comp.MaxPuddleSize * args.Severity);
+        var puddleSol = _solutionContainer.SplitSolution(sol.Value, entity.Comp.MaxPuddleSize * args.Severity * args.PowerModifier);
         _puddle.TrySplashSpillAt(entity.Owner, xform.Coordinates, puddleSol, out _);
     }
+
     private void OnSupercritical(Entity<PuddleCreateAnomalyComponent> entity, ref AnomalySupercriticalEvent args)
     {
         if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var sol))
diff --git a/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs b/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs
index 6bd8be002e0..d38bda562bc 100644
--- a/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.Components;
+using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects.Components;
@@ -24,14 +24,14 @@ public override void Initialize()
     private void OnPulse(EntityUid uid, PyroclasticAnomalyComponent component, ref AnomalyPulseEvent args)
     {
         var xform = Transform(uid);
-        var ignitionRadius = component.MaximumIgnitionRadius * args.Stability;
+        var ignitionRadius = component.MaximumIgnitionRadius * args.Stability * args.PowerModifier;
         IgniteNearby(uid, xform.Coordinates, args.Severity, ignitionRadius);
     }
 
     private void OnSupercritical(EntityUid uid, PyroclasticAnomalyComponent component, ref AnomalySupercriticalEvent args)
     {
         var xform = Transform(uid);
-        IgniteNearby(uid, xform.Coordinates, 1, component.MaximumIgnitionRadius * 2);
+        IgniteNearby(uid, xform.Coordinates, 1, component.MaximumIgnitionRadius * 2 * args.PowerModifier);
     }
 
     public void IgniteNearby(EntityUid uid, EntityCoordinates coordinates, float severity, float radius)
diff --git a/Content.Server/Anomaly/Effects/SecretDataAnomalySystem.cs b/Content.Server/Anomaly/Effects/SecretDataAnomalySystem.cs
new file mode 100644
index 00000000000..cbdc4b04df1
--- /dev/null
+++ b/Content.Server/Anomaly/Effects/SecretDataAnomalySystem.cs
@@ -0,0 +1,40 @@
+using Content.Server.Anomaly.Components;
+using Robust.Shared.Random;
+
+namespace Content.Server.Anomaly.Effects;
+
+public sealed class SecretDataAnomalySystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    private readonly List<AnomalySecretData> _deita = new();
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<SecretDataAnomalyComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(EntityUid uid, SecretDataAnomalyComponent anomaly, MapInitEvent args)
+    {
+        RandomizeSecret(uid,_random.Next(anomaly.RandomStartSecretMin, anomaly.RandomStartSecretMax), anomaly);
+    }
+
+    public void RandomizeSecret(EntityUid uid, int count, SecretDataAnomalyComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        component.Secret.Clear();
+
+        // I also considered just adding all the enum values and pruning but that seems more wasteful.
+        _deita.Clear();
+        _deita.AddRange(Enum.GetValues<AnomalySecretData>());
+        var actualCount = Math.Min(count, _deita.Count);
+
+        for (int i = 0; i < actualCount; i++)
+        {
+            component.Secret.Add(_random.PickAndTake(_deita));
+        }
+    }
+}
+
diff --git a/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs b/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs
new file mode 100644
index 00000000000..7d4d9a2ee5d
--- /dev/null
+++ b/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs
@@ -0,0 +1,41 @@
+using Content.Server.Anomaly.Components;
+using Content.Shared.Anomaly.Components;
+using Robust.Shared.Physics.Events;
+using Robust.Shared.Random;
+
+namespace Content.Server.Anomaly.Effects;
+public sealed class ShuffleParticlesAnomalySystem : EntitySystem
+{
+    [Dependency] private readonly AnomalySystem _anomaly = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ShuffleParticlesAnomalyComponent, AnomalyPulseEvent>(OnPulse);
+        SubscribeLocalEvent<ShuffleParticlesAnomalyComponent, StartCollideEvent>(OnStartCollide);
+    }
+
+    private void OnStartCollide(EntityUid uid, ShuffleParticlesAnomalyComponent shuffle, StartCollideEvent args)
+    {
+        if (!TryComp<AnomalyComponent>(uid, out var anomaly))
+            return;
+
+        if (shuffle.ShuffleOnParticleHit && _random.Prob(shuffle.Prob))
+            _anomaly.ShuffleParticlesEffect(anomaly);
+
+        if (!TryComp<AnomalousParticleComponent>(args.OtherEntity, out var particle))
+            return;
+    }
+
+    private void OnPulse(EntityUid uid, ShuffleParticlesAnomalyComponent shuffle, AnomalyPulseEvent args)
+    {
+        if (!TryComp<AnomalyComponent>(uid, out var anomaly))
+            return;
+
+        if (shuffle.ShuffleOnPulse && _random.Prob(shuffle.Prob))
+        {
+            _anomaly.ShuffleParticlesEffect(anomaly);
+        }
+    }
+}
+
diff --git a/Content.Server/Anomaly/Effects/TileAnomalySystem.cs b/Content.Server/Anomaly/Effects/TileAnomalySystem.cs
index c1487cfc8c6..92f54152526 100644
--- a/Content.Server/Anomaly/Effects/TileAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/TileAnomalySystem.cs
@@ -34,7 +34,7 @@ private void OnPulse(Entity<TileSpawnAnomalyComponent> component, ref AnomalyPul
             if (!entry.Settings.SpawnOnPulse)
                 continue;
 
-            SpawnTiles(component, entry, args.Stability, args.Severity);
+            SpawnTiles(component, entry, args.Stability, args.Severity, args.PowerModifier);
         }
     }
 
@@ -45,7 +45,7 @@ private void OnSupercritical(Entity<TileSpawnAnomalyComponent> component, ref An
             if (!entry.Settings.SpawnOnSuperCritical)
                 continue;
 
-            SpawnTiles(component, entry, 1, 1);
+            SpawnTiles(component, entry, 1, 1, args.PowerModifier);
         }
     }
 
@@ -56,7 +56,7 @@ private void OnShutdown(Entity<TileSpawnAnomalyComponent> component, ref Anomaly
             if (!entry.Settings.SpawnOnShutdown || args.Supercritical)
                 continue;
 
-            SpawnTiles(component, entry, 1, 1);
+            SpawnTiles(component, entry, 1, 1, 1);
         }
     }
 
@@ -67,7 +67,7 @@ private void OnStabilityChanged(Entity<TileSpawnAnomalyComponent> component, ref
             if (!entry.Settings.SpawnOnStabilityChanged)
                 continue;
 
-            SpawnTiles(component, entry, args.Stability, args.Severity);
+            SpawnTiles(component, entry, args.Stability, args.Severity, 1);
         }
     }
 
@@ -78,17 +78,17 @@ private void OnSeverityChanged(Entity<TileSpawnAnomalyComponent> component, ref
             if (!entry.Settings.SpawnOnSeverityChanged)
                 continue;
 
-            SpawnTiles(component, entry, args.Stability, args.Severity);
+            SpawnTiles(component, entry, args.Stability, args.Severity, 1);
         }
     }
 
-    private void SpawnTiles(Entity<TileSpawnAnomalyComponent> anomaly, TileSpawnSettingsEntry entry, float stability, float severity)
+    private void SpawnTiles(Entity<TileSpawnAnomalyComponent> anomaly, TileSpawnSettingsEntry entry, float stability, float severity, float powerMod)
     {
         var xform = Transform(anomaly);
         if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
             return;
 
-        var tiles = _anomaly.GetSpawningPoints(anomaly, stability, severity, entry.Settings);
+        var tiles = _anomaly.GetSpawningPoints(anomaly, stability, severity, entry.Settings, powerMod);
         if (tiles == null)
             return;
 
diff --git a/Content.Server/Antag/Mimic/MobReplacementRuleComponent.cs b/Content.Server/Antag/Mimic/MobReplacementRuleComponent.cs
index d89d61606db..0824d48ae27 100644
--- a/Content.Server/Antag/Mimic/MobReplacementRuleComponent.cs
+++ b/Content.Server/Antag/Mimic/MobReplacementRuleComponent.cs
@@ -13,9 +13,33 @@ public sealed partial class MobReplacementRuleComponent : Component
     [DataField]
     public EntProtoId Proto = "MobMimic";
 
+    [DataField]
+    public int NumberToReplace { get; set; }
+
+    [DataField]
+    public string Announcement = "station-event-rampant-intelligence-announcement";
+
     /// <summary>
     /// Chance per-entity.
     /// </summary>
     [DataField]
     public float Chance = 0.001f;
+
+    [DataField]
+    public bool DoAnnouncement = true;
+
+    [DataField]
+    public float MimicMeleeDamage = 20f;
+
+    [DataField]
+    public float MimicMoveSpeed = 1f;
+
+    [DataField]
+    public string MimicAIType = "SimpleHostileCompound";
+
+    [DataField]
+    public bool MimicSmashGlass = true;
+
+    [DataField]
+    public bool VendorModify = true;
 }
diff --git a/Content.Server/Antag/MobReplacementRuleSystem.cs b/Content.Server/Antag/MobReplacementRuleSystem.cs
index 2446b976e1a..ba09c84bce4 100644
--- a/Content.Server/Antag/MobReplacementRuleSystem.cs
+++ b/Content.Server/Antag/MobReplacementRuleSystem.cs
@@ -1,15 +1,45 @@
+using System.Numerics;
+using Content.Server.Advertise.Components;
+using Content.Server.Advertise.EntitySystems;
 using Content.Server.Antag.Mimic;
+using Content.Server.Chat.Systems;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Server.NPC.Systems;
+using Content.Server.Station.Systems;
+using Content.Server.GameTicking;
 using Content.Shared.VendingMachines;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Server.GameObjects;
+using Robust.Shared.Physics.Systems;
+using System.Linq;
+using Robust.Shared.Physics;
+using Content.Shared.Movement.Components;
+using Content.Shared.Damage;
+using Content.Server.NPC.HTN;
+using Content.Server.NPC;
+using Content.Shared.Weapons.Melee;
+using Content.Server.Power.Components;
+using Content.Shared.CombatMode;
 
 namespace Content.Server.Antag;
 
 public sealed class MobReplacementRuleSystem : GameRuleSystem<MobReplacementRuleComponent>
 {
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+    [Dependency] private readonly GameTicker _gameTicker = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IComponentFactory _componentFactory = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
+    [Dependency] private readonly NPCSystem _npc = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly AdvertiseSystem _advertise = default!;
+
 
     protected override void Started(EntityUid uid, MobReplacementRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
@@ -17,21 +47,133 @@ protected override void Started(EntityUid uid, MobReplacementRuleComponent compo
 
         var query = AllEntityQuery<VendingMachineComponent, TransformComponent>();
         var spawns = new List<(EntityUid Entity, EntityCoordinates Coordinates)>();
+        var stations = _gameTicker.GetSpawnableStations();
 
         while (query.MoveNext(out var vendingUid, out _, out var xform))
         {
-            if (!_random.Prob(component.Chance))
+            var ownerStation = _station.GetOwningStation(vendingUid);
+
+            if (ownerStation == null
+                || ownerStation != stations[0])
+                continue;
+
+            // Make sure that we aren't running this on something that is already a mimic
+            if (HasComp<CombatModeComponent>(vendingUid))
                 continue;
 
             spawns.Add((vendingUid, xform.Coordinates));
         }
 
-        foreach (var entity in spawns)
+        if (spawns == null)
         {
-            var coordinates = entity.Coordinates;
-            Del(entity.Entity);
+            //WTF THE STATION DOESN'T EXIST! WE MUST BE IN A TEST! QUICK, PUT A MIMIC AT 0,0!!!
+            Spawn(component.Proto, new EntityCoordinates(uid, new Vector2(0, 0)));
+        }
+        else
+        {
+            // This is intentionally not clamped. If a server host wants to replace every vending machine in the entire station with a mimic, who am I to stop them?
+            var k = MathF.MaxMagnitude(component.NumberToReplace, 1);
+            while (k > 0 && spawns != null && spawns.Count > 0)
+            {
+                if (k > 1)
+                {
+                    var spawnLocation = _random.PickAndTake(spawns);
+                    BuildAMimicWorkshop(spawnLocation.Entity, component);
+                }
+                else
+                {
+                    BuildAMimicWorkshop(spawns[0].Entity, component);
+                }
+
+                if (k == MathF.MaxMagnitude(component.NumberToReplace, 1)
+                    && component.DoAnnouncement)
+                    _chat.DispatchStationAnnouncement(stations[0], Loc.GetString("station-event-rampant-intelligence-announcement"), playDefaultSound: true,
+                        colorOverride: Color.Red, sender: "Central Command");
+
+                k--;
+            }
+        }
+    }
+
+    /// <summary>
+    /// 	It's like Build a Bear, but MURDER
+    /// </summary>
+    /// <param name="uid"></param>
+    public void BuildAMimicWorkshop(EntityUid uid, MobReplacementRuleComponent component)
+    {
+        var metaData = MetaData(uid);
+        var vendorPrototype = metaData.EntityPrototype;
+        var mimicProto = _prototype.Index<EntityPrototype>(component.Proto);
+
+        var vendorComponents = vendorPrototype?.Components.Keys
+            .Where(n => n != "Transform" && n != "MetaData")
+            .Select(name => (name, _componentFactory.GetRegistration(name).Type))
+            .ToList() ?? new List<(string name, Type type)>();
+
+        var mimicComponents = mimicProto?.Components.Keys
+            .Where(n => n != "Transform" && n != "MetaData")
+            .Select(name => (name, _componentFactory.GetRegistration(name).Type))
+            .ToList() ?? new List<(string name, Type type)>();
 
-            Spawn(component.Proto, coordinates);
+        foreach (var name in mimicComponents.Except(vendorComponents))
+        {
+            var newComponent = _componentFactory.GetComponent(name.name);
+            EntityManager.AddComponent(uid, newComponent);
         }
+
+        var xform = Transform(uid);
+        if (xform.Anchored)
+            _transform.Unanchor(uid, xform);
+
+        SetupMimicNPC(uid, component);
+
+        if (TryComp<AdvertiseComponent>(uid, out var vendor)
+            && component.VendorModify)
+            SetupMimicVendor(uid, component, vendor);
+    }
+    /// <summary>
+    /// 	This handles getting the entity ready to be a hostile NPC
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="component"></param>
+    private void SetupMimicNPC(EntityUid uid, MobReplacementRuleComponent component)
+    {
+        _physics.SetBodyType(uid, BodyType.KinematicController);
+        _npcFaction.AddFaction(uid, "SimpleHostile");
+
+        var melee = EnsureComp<MeleeWeaponComponent>(uid);
+        melee.Angle = 0;
+        DamageSpecifier dspec = new()
+        {
+            DamageDict = new()
+            {
+                { "Blunt", component.MimicMeleeDamage }
+            }
+        };
+        melee.Damage = dspec;
+
+        var movementSpeed = EnsureComp<MovementSpeedModifierComponent>(uid);
+        (movementSpeed.BaseSprintSpeed, movementSpeed.BaseWalkSpeed) = (component.MimicMoveSpeed, component.MimicMoveSpeed);
+
+        var htn = EnsureComp<HTNComponent>(uid);
+        htn.RootTask = new HTNCompoundTask() { Task = component.MimicAIType };
+        htn.Blackboard.SetValue(NPCBlackboard.NavSmash, component.MimicSmashGlass);
+        _npc.WakeNPC(uid, htn);
+    }
+
+    /// <summary>
+    /// Handling specific interactions with vending machines
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="mimicComponent"></param>
+    /// <param name="vendorComponent"></param>
+    private void SetupMimicVendor(EntityUid uid, MobReplacementRuleComponent mimicComponent, AdvertiseComponent vendorComponent)
+    {
+        vendorComponent.MinimumWait = 5;
+        vendorComponent.MaximumWait = 15;
+        _advertise.SayAdvertisement(uid, vendorComponent);
+
+        if (TryComp<ApcPowerReceiverComponent>(uid, out var aPC))
+            aPC.NeedsPower = false;
     }
 }
diff --git a/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
index 34a5689fd15..ad65c5cca6b 100644
--- a/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
+++ b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
@@ -1,5 +1,7 @@
 using Content.Server.Power.Components;
 using Content.Shared.UserInterface;
+using Content.Server.Advertise;
+using Content.Server.Advertise.Components;
 using Content.Shared.Arcade;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
@@ -9,6 +11,7 @@ namespace Content.Server.Arcade.BlockGame;
 public sealed class BlockGameArcadeSystem : EntitySystem
 {
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!;
 
     public override void Initialize()
     {
@@ -88,8 +91,6 @@ private void OnAfterUiClose(EntityUid uid, BlockGameArcadeComponent component, B
             component.Spectators.Remove(component.Player);
             UpdatePlayerStatus(uid, component.Player, blockGame: component);
         }
-        else
-            component.Player = null;
 
         UpdatePlayerStatus(uid, temp, blockGame: component);
     }
@@ -122,6 +123,9 @@ private void OnPlayerAction(EntityUid uid, BlockGameArcadeComponent component, B
             return;
         }
 
+        if (TryComp<SpeakOnUIClosedComponent>(uid, out var speakComponent))
+            _speakOnUIClosed.TrySetFlag((uid, speakComponent));
+
         component.Game.ProcessInput(msg.PlayerAction);
     }
 }
diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
index d97c94fd992..f60d88ebf78 100644
--- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
+++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
@@ -1,5 +1,7 @@
 using Content.Server.Power.Components;
 using Content.Shared.UserInterface;
+using Content.Server.Advertise;
+using Content.Server.Advertise.Components;
 using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -13,6 +15,7 @@ public sealed partial class SpaceVillainArcadeSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!;
 
     public override void Initialize()
     {
@@ -79,6 +82,9 @@ private void OnSVPlayerAction(EntityUid uid, SpaceVillainArcadeComponent compone
             case PlayerAction.Heal:
             case PlayerAction.Recharge:
                 component.Game.ExecutePlayerAction(uid, msg.PlayerAction, component);
+                // Any sort of gameplay action counts
+                if (TryComp<SpeakOnUIClosedComponent>(uid, out var speakComponent))
+                    _speakOnUIClosed.TrySetFlag((uid, speakComponent));
                 break;
             case PlayerAction.NewGame:
                 _audioSystem.PlayPvs(component.NewGameSound, uid, AudioParams.Default.WithVolume(-4f));
diff --git a/Content.Server/Atmos/Commands/DeleteGasCommand.cs b/Content.Server/Atmos/Commands/DeleteGasCommand.cs
index 9e7594c024b..f4279db926a 100644
--- a/Content.Server/Atmos/Commands/DeleteGasCommand.cs
+++ b/Content.Server/Atmos/Commands/DeleteGasCommand.cs
@@ -3,7 +3,7 @@
 using Content.Shared.Administration;
 using Content.Shared.Atmos;
 using Robust.Shared.Console;
-using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Atmos.Commands
 {
@@ -11,7 +11,6 @@ namespace Content.Server.Atmos.Commands
     public sealed class DeleteGasCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
 
         public string Command => "deletegas";
         public string Description => "Removes all gases from a grid, or just of one type if specified.";
@@ -119,7 +118,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                     return;
             }
 
-            if (!_mapManager.TryGetGrid(gridId, out _))
+            if (!_entManager.TryGetComponent<MapGridComponent>(gridId, out _))
             {
                 shell.WriteLine($"No grid exists with id {gridId}");
                 return;
diff --git a/Content.Server/Atmos/EntitySystems/AirFilterSystem.cs b/Content.Server/Atmos/EntitySystems/AirFilterSystem.cs
index 416045fc5ed..2ab15cfb174 100644
--- a/Content.Server/Atmos/EntitySystems/AirFilterSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirFilterSystem.cs
@@ -1,8 +1,6 @@
-using Content.Server.Atmos;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.Piping.Components;
 using Content.Shared.Atmos;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using System.Diagnostics.CodeAnalysis;
 
@@ -34,7 +32,7 @@ private void OnIntakeUpdate(EntityUid uid, AirIntakeComponent intake, ref AtmosD
         if (air.Pressure >= intake.Pressure)
             return;
 
-        var environment = _atmosphere.GetContainingMixture(uid, true, true);
+        var environment = _atmosphere.GetContainingMixture(uid, args.Grid, args.Map, true, true);
         // nothing to intake from
         if (environment == null)
             return;
@@ -66,12 +64,11 @@ private void OnFilterUpdate(EntityUid uid, AirFilterComponent filter, ref AtmosD
         var oxygen = air.GetMoles(filter.Oxygen) / air.TotalMoles;
         var gases = oxygen >= filter.TargetOxygen ? filter.Gases : filter.OverflowGases;
 
-        var coordinates = Transform(uid).MapPosition;
         GasMixture? destination = null;
-        if (_map.TryFindGridAt(coordinates, out _, out var grid))
+        if (args.Grid is {} grid)
         {
-            var tile = grid.GetTileRef(coordinates);
-            destination = _atmosphere.GetTileMixture(tile.GridUid, null, tile.GridIndices, true);
+            var position = _transform.GetGridTilePositionOrDefault(uid);
+            destination = _atmosphere.GetTileMixture(grid, args.Map, position, true);
         }
 
         if (destination != null)
diff --git a/Content.Server/Atmos/EntitySystems/AtmosExposedSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosExposedSystem.cs
index 4be4d8271f3..9590b9aa548 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosExposedSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosExposedSystem.cs
@@ -24,6 +24,8 @@ public AtmosExposedUpdateEvent(EntityCoordinates coordinates, GasMixture mixture
 
     /// <summary>
     ///     Event that tries to query the mixture a certain entity is exposed to.
+    ///     This is mainly intended for use with entities inside of containers.
+    ///     This event is not raised for entities that are directly parented to the grid.
     /// </summary>
     [ByRefEvent]
     public struct AtmosExposedGetAirEvent
@@ -31,7 +33,7 @@ public struct AtmosExposedGetAirEvent
         /// <summary>
         ///     The entity we want to query this for.
         /// </summary>
-        public readonly EntityUid Entity;
+        public readonly Entity<TransformComponent> Entity;
 
         /// <summary>
         ///     The mixture that the entity is exposed to. Output parameter.
@@ -39,9 +41,9 @@ public struct AtmosExposedGetAirEvent
         public GasMixture? Gas = null;
 
         /// <summary>
-        ///     Whether to invalidate the mixture, if possible.
+        ///     Whether to excite the mixture, if possible.
         /// </summary>
-        public bool Invalidate = false;
+        public readonly bool Excite = false;
 
         /// <summary>
         ///     Whether this event has been handled or not.
@@ -49,10 +51,10 @@ public struct AtmosExposedGetAirEvent
         /// </summary>
         public bool Handled = false;
 
-        public AtmosExposedGetAirEvent(EntityUid entity, bool invalidate = false)
+        public AtmosExposedGetAirEvent(Entity<TransformComponent> entity, bool excite = false)
         {
             Entity = entity;
-            Invalidate = invalidate;
+            Excite = excite;
         }
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
index cece99cacf6..614d550c2f7 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
@@ -4,7 +4,7 @@
 using Content.Server.Atmos.Reactions;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.Atmos;
-using Robust.Server.GameObjects;
+using Content.Shared.Atmos.Components;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Utility;
 
@@ -12,50 +12,42 @@ namespace Content.Server.Atmos.EntitySystems;
 
 public partial class AtmosphereSystem
 {
-    public GasMixture? GetContainingMixture(EntityUid uid, bool ignoreExposed = false, bool excite = false, TransformComponent? transform = null)
+    public GasMixture? GetContainingMixture(Entity<TransformComponent?> ent, bool ignoreExposed = false, bool excite = false)
     {
-        if (!ignoreExposed)
-        {
-            // Used for things like disposals/cryo to change which air people are exposed to.
-            var ev = new AtmosExposedGetAirEvent(uid, excite);
-
-            // Give the entity itself a chance to handle this.
-            RaiseLocalEvent(uid, ref ev, false);
-
-            if (ev.Handled)
-                return ev.Gas;
+        if (!Resolve(ent, ref ent.Comp))
+            return null;
 
-            // We need to get the parent now, so we need the transform... If the parent is invalid, we can't do much else.
-            if(!Resolve(uid, ref transform) || !transform.ParentUid.IsValid() || transform.MapUid == null)
-                return GetTileMixture(null, null, Vector2i.Zero, excite);
+        return GetContainingMixture(ent, ent.Comp.GridUid, ent.Comp.MapUid, ignoreExposed, excite);
+    }
 
-            // Give the parent entity a chance to handle the event...
-            RaiseLocalEvent(transform.ParentUid, ref ev, false);
+    public GasMixture? GetContainingMixture(
+        Entity<TransformComponent?> ent,
+        Entity<GridAtmosphereComponent?, GasTileOverlayComponent?>? grid,
+        Entity<MapAtmosphereComponent?>? map,
+        bool ignoreExposed = false,
+        bool excite = false)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return null;
 
+        if (!ignoreExposed && !ent.Comp.Anchored)
+        {
+            // Used for things like disposals/cryo to change which air people are exposed to.
+            var ev = new AtmosExposedGetAirEvent((ent, ent.Comp), excite);
+            RaiseLocalEvent(ent, ref ev);
             if (ev.Handled)
                 return ev.Gas;
-        }
-        // Oops, we did a little bit of code duplication...
-        else if(!Resolve(uid, ref transform))
-        {
-            return GetTileMixture(null, null, Vector2i.Zero, excite);
-        }
 
+            // TODO ATMOS: recursively iterate up through parents
+            // This really needs recursive InContainer metadata flag for performance
+            // And ideally some fast way to get the innermost airtight container.
+        }
 
-        var gridUid = transform.GridUid;
-        var mapUid = transform.MapUid;
-        var position = _transformSystem.GetGridOrMapTilePosition(uid, transform);
-
-        return GetTileMixture(gridUid, mapUid, position, excite);
+        var position = _transformSystem.GetGridTilePositionOrDefault((ent, ent.Comp));
+        return GetTileMixture(grid, map, position, excite);
     }
 
-    public bool HasAtmosphere(EntityUid gridUid)
-    {
-        var ev = new HasAtmosphereMethodEvent(gridUid);
-        RaiseLocalEvent(gridUid, ref ev);
-
-        return ev.Result;
-    }
+    public bool HasAtmosphere(EntityUid gridUid) => _atmosQuery.HasComponent(gridUid);
 
     public bool SetSimulatedGrid(EntityUid gridUid, bool simulated)
     {
@@ -91,43 +83,70 @@ public void InvalidateTile(Entity<GridAtmosphereComponent?> entity, Vector2i til
             entity.Comp.InvalidatedCoords.Add(tile);
     }
 
-    public GasMixture?[]? GetTileMixtures(EntityUid? gridUid, EntityUid? mapUid, List<Vector2i> tiles, bool excite = false)
+    public GasMixture?[]? GetTileMixtures(
+        Entity<GridAtmosphereComponent?, GasTileOverlayComponent?>? grid,
+        Entity<MapAtmosphereComponent?>? map,
+        List<Vector2i> tiles,
+        bool excite = false)
     {
-        var ev = new GetTileMixturesMethodEvent(gridUid, mapUid, tiles, excite);
+        GasMixture?[]? mixtures = null;
+        var handled = false;
 
         // If we've been passed a grid, try to let it handle it.
-        if (gridUid.HasValue)
+        if (grid is {} gridEnt && Resolve(gridEnt, ref gridEnt.Comp1))
         {
-            DebugTools.Assert(_mapManager.IsGrid(gridUid.Value));
-            RaiseLocalEvent(gridUid.Value, ref ev, false);
+            if (excite)
+                Resolve(gridEnt, ref gridEnt.Comp2);
+
+            handled = true;
+            mixtures = new GasMixture?[tiles.Count];
+
+            for (var i = 0; i < tiles.Count; i++)
+            {
+                var tile = tiles[i];
+                if (!gridEnt.Comp1.Tiles.TryGetValue(tile, out var atmosTile))
+                {
+                    // need to get map atmosphere
+                    handled = false;
+                    continue;
+                }
+
+                mixtures[i] = atmosTile.Air;
+
+                if (excite)
+                {
+                    AddActiveTile(gridEnt.Comp1, atmosTile);
+                    InvalidateVisuals((gridEnt.Owner, gridEnt.Comp2), tile);
+                }
+            }
         }
 
-        if (ev.Handled)
-            return ev.Mixtures;
+        if (handled)
+            return mixtures;
 
         // We either don't have a grid, or the event wasn't handled.
         // Let the map handle it instead, and also broadcast the event.
-        if (mapUid.HasValue)
+        if (map is {} mapEnt && _mapAtmosQuery.Resolve(mapEnt, ref mapEnt.Comp))
         {
-            DebugTools.Assert(_mapManager.IsMap(mapUid.Value));
-            RaiseLocalEvent(mapUid.Value, ref ev, true);
-        }
-        else
-            RaiseLocalEvent(ref ev);
+            mixtures ??= new GasMixture?[tiles.Count];
+            for (var i = 0; i < tiles.Count; i++)
+            {
+                mixtures[i] ??= mapEnt.Comp.Mixture;
+            }
 
-        if (ev.Handled)
-            return ev.Mixtures;
+            return mixtures;
+        }
 
         // Default to a space mixture... This is a space game, after all!
-        ev.Mixtures ??= new GasMixture?[tiles.Count];
+        mixtures ??= new GasMixture?[tiles.Count];
         for (var i = 0; i < tiles.Count; i++)
         {
-            ev.Mixtures[i] ??= GasMixture.SpaceGas;
+            mixtures[i] ??= GasMixture.SpaceGas;
         }
-        return ev.Mixtures;
+        return mixtures;
     }
 
-    public GasMixture? GetTileMixture (Entity<TransformComponent?> entity, MapGridComponent? grid = null, bool excite = false)
+    public GasMixture? GetTileMixture (Entity<TransformComponent?> entity, bool excite = false)
     {
         if (!Resolve(entity.Owner, ref entity.Comp))
             return null;
@@ -136,32 +155,31 @@ public void InvalidateTile(Entity<GridAtmosphereComponent?> entity, Vector2i til
         return GetTileMixture(entity.Comp.GridUid, entity.Comp.MapUid, indices, excite);
     }
 
-    public GasMixture? GetTileMixture(EntityUid? gridUid, EntityUid? mapUid, Vector2i gridTile, bool excite = false)
+    public GasMixture? GetTileMixture(
+        Entity<GridAtmosphereComponent?, GasTileOverlayComponent?>? grid,
+        Entity<MapAtmosphereComponent?>? map,
+        Vector2i gridTile,
+        bool excite = false)
     {
-        var ev = new GetTileMixtureMethodEvent(gridUid, mapUid, gridTile, excite);
-
         // If we've been passed a grid, try to let it handle it.
-        if(gridUid.HasValue)
+        if (grid is {} gridEnt
+            && Resolve(gridEnt, ref gridEnt.Comp1, false)
+            && gridEnt.Comp1.Tiles.TryGetValue(gridTile, out var tile))
         {
-            DebugTools.Assert(_mapManager.IsGrid(gridUid.Value));
-            RaiseLocalEvent(gridUid.Value, ref ev, false);
-        }
-
-        if (ev.Handled)
-            return ev.Mixture;
+            if (excite)
+            {
+                AddActiveTile(gridEnt.Comp1, tile);
+                InvalidateVisuals((grid.Value.Owner, grid.Value.Comp2), gridTile);
+            }
 
-        // We either don't have a grid, or the event wasn't handled.
-        // Let the map handle it instead, and also broadcast the event.
-        if(mapUid.HasValue)
-        {
-            DebugTools.Assert(_mapManager.IsMap(mapUid.Value));
-            RaiseLocalEvent(mapUid.Value, ref ev, true);
+            return tile.Air;
         }
-        else
-            RaiseLocalEvent(ref ev);
+
+        if (map is {} mapEnt && _mapAtmosQuery.Resolve(mapEnt, ref mapEnt.Comp, false))
+            return mapEnt.Comp.Mixture;
 
         // Default to a space mixture... This is a space game, after all!
-        return ev.Mixture ?? GasMixture.SpaceGas;
+        return GasMixture.SpaceGas;
     }
 
     public ReactionResult ReactTile(EntityUid gridId, Vector2i tile)
@@ -176,66 +194,67 @@ public ReactionResult ReactTile(EntityUid gridId, Vector2i tile)
 
     public bool IsTileAirBlocked(EntityUid gridUid, Vector2i tile, AtmosDirection directions = AtmosDirection.All, MapGridComponent? mapGridComp = null)
     {
-        if (!Resolve(gridUid, ref mapGridComp))
+        if (!Resolve(gridUid, ref mapGridComp, false))
             return false;
 
         var data = GetAirtightData(gridUid, mapGridComp, tile);
         return data.BlockedDirections.IsFlagSet(directions);
     }
 
-    public bool IsTileSpace(EntityUid? gridUid, EntityUid? mapUid, Vector2i tile, MapGridComponent? mapGridComp = null)
+    public bool IsTileSpace(Entity<GridAtmosphereComponent?>? grid, Entity<MapAtmosphereComponent?>? map, Vector2i tile)
     {
-        var ev = new IsTileSpaceMethodEvent(gridUid, mapUid, tile, mapGridComp);
-
-        // Try to let the grid (if any) handle it...
-        if (gridUid.HasValue)
-            RaiseLocalEvent(gridUid.Value, ref ev, false);
-
-        // If we didn't have a grid or the event wasn't handled
-        // we let the map know, and also broadcast the event while at it!
-        if (mapUid.HasValue && !ev.Handled)
-            RaiseLocalEvent(mapUid.Value, ref ev, true);
+        if (grid is {} gridEnt && _atmosQuery.Resolve(gridEnt, ref gridEnt.Comp, false)
+            && gridEnt.Comp.Tiles.TryGetValue(tile, out var tileAtmos))
+        {
+            return tileAtmos.Space;
+        }
 
-        // We didn't have a map, and the event isn't handled, therefore broadcast the event.
-        else if (!mapUid.HasValue && !ev.Handled)
-            RaiseLocalEvent(ref ev);
+        if (map is {} mapEnt && _mapAtmosQuery.Resolve(mapEnt, ref mapEnt.Comp, false))
+            return mapEnt.Comp.Space;
 
         // If nothing handled the event, it'll default to true.
         // Oh well, this is a space game after all, deal with it!
-        return ev.Result;
+        return true;
     }
 
-    public bool IsTileMixtureProbablySafe(EntityUid? gridUid, EntityUid mapUid, Vector2i tile)
+    public bool IsTileMixtureProbablySafe(Entity<GridAtmosphereComponent?>? grid, Entity<MapAtmosphereComponent?> map, Vector2i tile)
     {
-        return IsMixtureProbablySafe(GetTileMixture(gridUid, mapUid, tile));
+        return IsMixtureProbablySafe(GetTileMixture(grid, map, tile));
     }
 
-    public float GetTileHeatCapacity(EntityUid? gridUid, EntityUid mapUid, Vector2i tile)
+    public float GetTileHeatCapacity(Entity<GridAtmosphereComponent?>? grid, Entity<MapAtmosphereComponent?> map, Vector2i tile)
     {
-        return GetHeatCapacity(GetTileMixture(gridUid, mapUid, tile) ?? GasMixture.SpaceGas);
+        return GetHeatCapacity(GetTileMixture(grid, map, tile) ?? GasMixture.SpaceGas);
     }
 
-    public IEnumerable<Vector2i> GetAdjacentTiles(EntityUid gridUid, Vector2i tile)
+    public TileMixtureEnumerator GetAdjacentTileMixtures(Entity<GridAtmosphereComponent?> grid, Vector2i tile, bool includeBlocked = false, bool excite = false)
     {
-        var ev = new GetAdjacentTilesMethodEvent(gridUid, tile);
-        RaiseLocalEvent(gridUid, ref ev);
+        if (!_atmosQuery.Resolve(grid, ref grid.Comp, false))
+            return TileMixtureEnumerator.Empty;
 
-        return ev.Result ?? Enumerable.Empty<Vector2i>();
+        return !grid.Comp.Tiles.TryGetValue(tile, out var atmosTile)
+            ? TileMixtureEnumerator.Empty
+            : new(atmosTile.AdjacentTiles);
     }
 
-    public IEnumerable<GasMixture> GetAdjacentTileMixtures(EntityUid gridUid, Vector2i tile, bool includeBlocked = false, bool excite = false)
+    public void HotspotExpose(Entity<GridAtmosphereComponent?> grid, Vector2i tile, float exposedTemperature, float exposedVolume,
+        EntityUid? sparkSourceUid = null, bool soh = false)
     {
-        var ev = new GetAdjacentTileMixturesMethodEvent(gridUid, tile, includeBlocked, excite);
-        RaiseLocalEvent(gridUid, ref ev);
+        if (!_atmosQuery.Resolve(grid, ref grid.Comp, false))
+            return;
 
-        return ev.Result ?? Enumerable.Empty<GasMixture>();
+        if (grid.Comp.Tiles.TryGetValue(tile, out var atmosTile))
+            HotspotExpose(grid.Comp, atmosTile, exposedTemperature, exposedVolume, soh, sparkSourceUid);
     }
 
-    public void HotspotExpose(EntityUid gridUid, Vector2i tile, float exposedTemperature, float exposedVolume,
+    public void HotspotExpose(TileAtmosphere tile, float exposedTemperature, float exposedVolume,
         EntityUid? sparkSourceUid = null, bool soh = false)
     {
-        var ev = new HotspotExposeMethodEvent(gridUid, sparkSourceUid, tile, exposedTemperature, exposedVolume, soh);
-        RaiseLocalEvent(gridUid, ref ev);
+        if (!_atmosQuery.TryGetComponent(tile.GridIndex, out var atmos))
+            return;
+
+        DebugTools.Assert(atmos.Tiles.TryGetValue(tile.GridIndices, out var tmp) && tmp == tile);
+        HotspotExpose(atmos, tile, exposedTemperature, exposedVolume, soh, sparkSourceUid);
     }
 
     public void HotspotExtinguish(EntityUid gridUid, Vector2i tile)
@@ -253,38 +272,44 @@ public bool IsHotspotActive(EntityUid gridUid, Vector2i tile)
         return ev.Result;
     }
 
-    public void AddPipeNet(EntityUid gridUid, PipeNet pipeNet)
+    public bool AddPipeNet(Entity<GridAtmosphereComponent?> grid, PipeNet pipeNet)
     {
-        var ev = new AddPipeNetMethodEvent(gridUid, pipeNet);
-        RaiseLocalEvent(gridUid, ref ev);
+        return _atmosQuery.Resolve(grid, ref grid.Comp, false) && grid.Comp.PipeNets.Add(pipeNet);
     }
 
-    public void RemovePipeNet(EntityUid gridUid, PipeNet pipeNet)
+    public bool RemovePipeNet(Entity<GridAtmosphereComponent?> grid, PipeNet pipeNet)
     {
-        var ev = new RemovePipeNetMethodEvent(gridUid, pipeNet);
-        RaiseLocalEvent(gridUid, ref ev);
+        return _atmosQuery.Resolve(grid, ref grid.Comp, false) && grid.Comp.PipeNets.Remove(pipeNet);
     }
 
-    public bool AddAtmosDevice(EntityUid gridUid, AtmosDeviceComponent device)
+    public bool AddAtmosDevice(Entity<GridAtmosphereComponent?> grid, Entity<AtmosDeviceComponent> device)
     {
-        // TODO: check device is on grid
+        DebugTools.Assert(device.Comp.JoinedGrid == null);
+        DebugTools.Assert(Transform(device).GridUid == grid);
 
-        var ev = new AddAtmosDeviceMethodEvent(gridUid, device);
-        RaiseLocalEvent(gridUid, ref ev);
-        return ev.Result;
+        if (!_atmosQuery.Resolve(grid, ref grid.Comp, false))
+            return false;
+
+        if (!grid.Comp.AtmosDevices.Add(device))
+            return false;
+
+        device.Comp.JoinedGrid = grid;
+        return true;
     }
 
-    public bool RemoveAtmosDevice(EntityUid gridUid, AtmosDeviceComponent device)
+    public bool RemoveAtmosDevice(Entity<GridAtmosphereComponent?> grid, Entity<AtmosDeviceComponent> device)
     {
-        // TODO: check device is on grid
+        DebugTools.Assert(device.Comp.JoinedGrid == grid);
 
-        var ev = new RemoveAtmosDeviceMethodEvent(gridUid, device);
-        RaiseLocalEvent(gridUid, ref ev);
-        return ev.Result;
-    }
+        if (!_atmosQuery.Resolve(grid, ref grid.Comp, false))
+            return false;
+
+        if (!grid.Comp.AtmosDevices.Remove(device))
+            return false;
 
-    [ByRefEvent] private record struct HasAtmosphereMethodEvent
-        (EntityUid Grid, bool Result = false, bool Handled = false);
+        device.Comp.JoinedGrid = null;
+        return true;
+    }
 
     [ByRefEvent] private record struct SetSimulatedGridMethodEvent
         (EntityUid Grid, bool Simulated, bool Handled = false);
@@ -295,43 +320,12 @@ [ByRefEvent] private record struct IsSimulatedGridMethodEvent
     [ByRefEvent] private record struct GetAllMixturesMethodEvent
         (EntityUid Grid, bool Excite = false, IEnumerable<GasMixture>? Mixtures = null, bool Handled = false);
 
-    [ByRefEvent] private record struct GetTileMixturesMethodEvent
-        (EntityUid? GridUid, EntityUid? MapUid, List<Vector2i> Tiles, bool Excite = false, GasMixture?[]? Mixtures = null, bool Handled = false);
-
-    [ByRefEvent] private record struct GetTileMixtureMethodEvent
-        (EntityUid? GridUid, EntityUid? MapUid, Vector2i Tile, bool Excite = false, GasMixture? Mixture = null, bool Handled = false);
-
     [ByRefEvent] private record struct ReactTileMethodEvent
         (EntityUid GridId, Vector2i Tile, ReactionResult Result = default, bool Handled = false);
 
-    [ByRefEvent] private record struct IsTileSpaceMethodEvent
-        (EntityUid? Grid, EntityUid? Map, Vector2i Tile, MapGridComponent? MapGridComponent = null, bool Result = true, bool Handled = false);
-
-    [ByRefEvent] private record struct GetAdjacentTilesMethodEvent
-        (EntityUid Grid, Vector2i Tile, IEnumerable<Vector2i>? Result = null, bool Handled = false);
-
-    [ByRefEvent] private record struct GetAdjacentTileMixturesMethodEvent
-        (EntityUid Grid, Vector2i Tile, bool IncludeBlocked, bool Excite,
-            IEnumerable<GasMixture>? Result = null, bool Handled = false);
-
-    [ByRefEvent] private record struct HotspotExposeMethodEvent
-        (EntityUid Grid, EntityUid? SparkSourceUid, Vector2i Tile, float ExposedTemperature, float ExposedVolume, bool soh, bool Handled = false);
-
     [ByRefEvent] private record struct HotspotExtinguishMethodEvent
         (EntityUid Grid, Vector2i Tile, bool Handled = false);
 
     [ByRefEvent] private record struct IsHotspotActiveMethodEvent
         (EntityUid Grid, Vector2i Tile, bool Result = false, bool Handled = false);
-
-    [ByRefEvent] private record struct AddPipeNetMethodEvent
-        (EntityUid Grid, PipeNet PipeNet, bool Handled = false);
-
-    [ByRefEvent] private record struct RemovePipeNetMethodEvent
-        (EntityUid Grid, PipeNet PipeNet, bool Handled = false);
-
-    [ByRefEvent] private record struct AddAtmosDeviceMethodEvent
-        (EntityUid Grid, AtmosDeviceComponent Device, bool Result = false, bool Handled = false);
-
-    [ByRefEvent] private record struct RemoveAtmosDeviceMethodEvent
-        (EntityUid Grid, AtmosDeviceComponent Device, bool Result = false, bool Handled = false);
 }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
index 3aaa5429fb0..4d50700738b 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
@@ -12,9 +12,14 @@ public sealed partial class AtmosphereSystem
         public float SpaceWindPressureForceDivisorPush { get; private set; }
         public float SpaceWindMaxVelocity { get; private set; }
         public float SpaceWindMaxPushForce { get; private set; }
+        public float SpaceWindMinimumCalculatedMass { get; private set; }
+        public float SpaceWindMaximumCalculatedInverseMass { get; private set; }
+        public bool MonstermosUseExpensiveAirflow { get; private set; }
         public bool MonstermosEqualization { get; private set; }
         public bool MonstermosDepressurization { get; private set; }
         public bool MonstermosRipTiles { get; private set; }
+        public float MonstermosRipTilesMinimumPressure { get; private set; }
+        public float MonstermosRipTilesPressureOffset { get; private set; }
         public bool GridImpulse { get; private set; }
         public float SpacingEscapeRatio { get; private set; }
         public float SpacingMinGas { get; private set; }
@@ -26,6 +31,7 @@ public sealed partial class AtmosphereSystem
         public float AtmosTickRate { get; private set; }
         public float Speedup { get; private set; }
         public float HeatScale { get; private set; }
+        public float HumanoidThrowMultiplier { get; private set; }
 
         /// <summary>
         /// Time between each atmos sub-update.  If you are writing an atmos device, use AtmosDeviceUpdateEvent.dt
@@ -41,9 +47,14 @@ private void InitializeCVars()
             Subs.CVar(_cfg, CCVars.SpaceWindPressureForceDivisorPush, value => SpaceWindPressureForceDivisorPush = value, true);
             Subs.CVar(_cfg, CCVars.SpaceWindMaxVelocity, value => SpaceWindMaxVelocity = value, true);
             Subs.CVar(_cfg, CCVars.SpaceWindMaxPushForce, value => SpaceWindMaxPushForce = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindMinimumCalculatedMass, value => SpaceWindMinimumCalculatedMass = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindMaximumCalculatedInverseMass, value => SpaceWindMaximumCalculatedInverseMass = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosUseExpensiveAirflow, value => MonstermosUseExpensiveAirflow = value, true);
             Subs.CVar(_cfg, CCVars.MonstermosEqualization, value => MonstermosEqualization = value, true);
             Subs.CVar(_cfg, CCVars.MonstermosDepressurization, value => MonstermosDepressurization = value, true);
             Subs.CVar(_cfg, CCVars.MonstermosRipTiles, value => MonstermosRipTiles = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosRipTilesMinimumPressure, value => MonstermosRipTilesMinimumPressure = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosRipTilesPressureOffset, value => MonstermosRipTilesPressureOffset = value, true);
             Subs.CVar(_cfg, CCVars.AtmosGridImpulse, value => GridImpulse = value, true);
             Subs.CVar(_cfg, CCVars.AtmosSpacingEscapeRatio, value => SpacingEscapeRatio = value, true);
             Subs.CVar(_cfg, CCVars.AtmosSpacingMinGas, value => SpacingMinGas = value, true);
@@ -55,6 +66,7 @@ private void InitializeCVars()
             Subs.CVar(_cfg, CCVars.AtmosHeatScale, value => { HeatScale = value; InitializeGases(); }, true);
             Subs.CVar(_cfg, CCVars.ExcitedGroups, value => ExcitedGroups = value, true);
             Subs.CVar(_cfg, CCVars.ExcitedGroupsSpaceIsAllConsuming, value => ExcitedGroupsSpaceIsAllConsuming = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosHumanoidThrowMultiplier, value => HumanoidThrowMultiplier = value, true);
         }
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
index 1c18b8fe29c..a5e37398c6a 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
@@ -98,7 +98,7 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar
                    continue;
                }
 
-               if (tile.Immutable && !IsTileSpace(euid, transform.MapUid, indices, gridComp))
+               if (tile.Immutable && !IsTileSpace(euid, transform.MapUid, indices))
                {
                    tile = new GasMixture(tile.Volume) { Temperature = tile.Temperature };
                    tileMain.Air = tile;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
index de4c9199cf7..c1b58f7a772 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
@@ -1,5 +1,7 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Atmos.EntitySystems
@@ -64,10 +66,12 @@ private void ExcitedGroupResetCooldowns(ExcitedGroup excitedGroup)
             excitedGroup.DismantleCooldown = 0;
         }
 
-        private void ExcitedGroupSelfBreakdown(GridAtmosphereComponent gridAtmosphere, ExcitedGroup excitedGroup)
+        private void ExcitedGroupSelfBreakdown(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+            ExcitedGroup excitedGroup)
         {
             DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!");
-            DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(excitedGroup), "Grid Atmosphere does not contain Excited Group!");
+            DebugTools.Assert(ent.Comp1.ExcitedGroups.Contains(excitedGroup), "Grid Atmosphere does not contain Excited Group!");
             var combined = new GasMixture(Atmospherics.CellVolume);
 
             var tileSize = excitedGroup.Tiles.Count;
@@ -77,7 +81,7 @@ private void ExcitedGroupSelfBreakdown(GridAtmosphereComponent gridAtmosphere, E
 
             if (tileSize == 0)
             {
-                ExcitedGroupDispose(gridAtmosphere, excitedGroup);
+                ExcitedGroupDispose(ent.Comp1, excitedGroup);
                 return;
             }
 
@@ -103,7 +107,7 @@ private void ExcitedGroupSelfBreakdown(GridAtmosphereComponent gridAtmosphere, E
                     continue;
 
                 tile.Air.CopyFromMutable(combined);
-                InvalidateVisuals(tile.GridIndex, tile.GridIndices);
+                InvalidateVisuals(ent, tile);
             }
 
             excitedGroup.BreakdownCooldown = 0;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
index beddef4be7e..4b9ef49a406 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.Reactions;
 using Content.Shared.Atmos;
@@ -20,22 +19,11 @@ private void InitializeGridAtmosphere()
 
         #region Atmos API Subscriptions
 
-        SubscribeLocalEvent<GridAtmosphereComponent, HasAtmosphereMethodEvent>(GridHasAtmosphere);
         SubscribeLocalEvent<GridAtmosphereComponent, IsSimulatedGridMethodEvent>(GridIsSimulated);
         SubscribeLocalEvent<GridAtmosphereComponent, GetAllMixturesMethodEvent>(GridGetAllMixtures);
-        SubscribeLocalEvent<GridAtmosphereComponent, GetTileMixtureMethodEvent>(GridGetTileMixture);
-        SubscribeLocalEvent<GridAtmosphereComponent, GetTileMixturesMethodEvent>(GridGetTileMixtures);
         SubscribeLocalEvent<GridAtmosphereComponent, ReactTileMethodEvent>(GridReactTile);
-        SubscribeLocalEvent<GridAtmosphereComponent, IsTileSpaceMethodEvent>(GridIsTileSpace);
-        SubscribeLocalEvent<GridAtmosphereComponent, GetAdjacentTilesMethodEvent>(GridGetAdjacentTiles);
-        SubscribeLocalEvent<GridAtmosphereComponent, GetAdjacentTileMixturesMethodEvent>(GridGetAdjacentTileMixtures);
-        SubscribeLocalEvent<GridAtmosphereComponent, HotspotExposeMethodEvent>(GridHotspotExpose);
         SubscribeLocalEvent<GridAtmosphereComponent, HotspotExtinguishMethodEvent>(GridHotspotExtinguish);
         SubscribeLocalEvent<GridAtmosphereComponent, IsHotspotActiveMethodEvent>(GridIsHotspotActive);
-        SubscribeLocalEvent<GridAtmosphereComponent, AddPipeNetMethodEvent>(GridAddPipeNet);
-        SubscribeLocalEvent<GridAtmosphereComponent, RemovePipeNetMethodEvent>(GridRemovePipeNet);
-        SubscribeLocalEvent<GridAtmosphereComponent, AddAtmosDeviceMethodEvent>(GridAddAtmosDevice);
-        SubscribeLocalEvent<GridAtmosphereComponent, RemoveAtmosDeviceMethodEvent>(GridRemoveAtmosDevice);
 
         #endregion
     }
@@ -120,15 +108,6 @@ private void OnGridSplit(EntityUid uid, GridAtmosphereComponent originalGridAtmo
         }
     }
 
-    private void GridHasAtmosphere(EntityUid uid, GridAtmosphereComponent component, ref HasAtmosphereMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Result = true;
-        args.Handled = true;
-    }
-
     private void GridIsSimulated(EntityUid uid, GridAtmosphereComponent component, ref IsSimulatedGridMethodEvent args)
     {
         if (args.Handled)
@@ -167,48 +146,6 @@ IEnumerable<GasMixture> EnumerateMixtures(EntityUid gridUid, GridAtmosphereCompo
         args.Handled = true;
     }
 
-    private void GridGetTileMixture(EntityUid uid, GridAtmosphereComponent component,
-        ref GetTileMixtureMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        if (!component.Tiles.TryGetValue(args.Tile, out var tile))
-            return; // Do NOT handle the event if we don't have that tile, the map will handle it instead.
-
-        if (args.Excite)
-            component.InvalidatedCoords.Add(args.Tile);
-
-        args.Mixture = tile.Air;
-        args.Handled = true;
-    }
-
-    private void GridGetTileMixtures(EntityUid uid, GridAtmosphereComponent component,
-        ref GetTileMixturesMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = true;
-        args.Mixtures = new GasMixture?[args.Tiles.Count];
-
-        for (var i = 0; i < args.Tiles.Count; i++)
-        {
-            var tile = args.Tiles[i];
-            if (!component.Tiles.TryGetValue(tile, out var atmosTile))
-            {
-                // need to get map atmosphere
-                args.Handled = false;
-                continue;
-            }
-
-            if (args.Excite)
-                component.InvalidatedCoords.Add(tile);
-
-            args.Mixtures[i] = atmosTile.Air;
-        }
-    }
-
     private void GridReactTile(EntityUid uid, GridAtmosphereComponent component, ref ReactTileMethodEvent args)
     {
         if (args.Handled)
@@ -221,69 +158,8 @@ private void GridReactTile(EntityUid uid, GridAtmosphereComponent component, ref
         args.Handled = true;
     }
 
-    private void GridIsTileSpace(EntityUid uid, GridAtmosphereComponent component, ref IsTileSpaceMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        // We don't have that tile, so let the map handle it.
-        if (!component.Tiles.TryGetValue(args.Tile, out var tile))
-            return;
-
-        args.Result = tile.Space;
-        args.Handled = true;
-    }
-
-    private void GridGetAdjacentTiles(EntityUid uid, GridAtmosphereComponent component,
-        ref GetAdjacentTilesMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        if (!component.Tiles.TryGetValue(args.Tile, out var tile))
-            return;
-
-        IEnumerable<Vector2i> EnumerateAdjacent(GridAtmosphereComponent grid, TileAtmosphere t)
-        {
-            foreach (var adj in t.AdjacentTiles)
-            {
-                if (adj == null)
-                    continue;
-
-                yield return adj.GridIndices;
-            }
-        }
-
-        args.Result = EnumerateAdjacent(component, tile);
-        args.Handled = true;
-    }
-
-    private void GridGetAdjacentTileMixtures(EntityUid uid, GridAtmosphereComponent component,
-        ref GetAdjacentTileMixturesMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        if (!component.Tiles.TryGetValue(args.Tile, out var tile))
-            return;
-
-        IEnumerable<GasMixture> EnumerateAdjacent(GridAtmosphereComponent grid, TileAtmosphere t)
-        {
-            foreach (var adj in t.AdjacentTiles)
-            {
-                if (adj?.Air == null)
-                    continue;
-
-                yield return adj.Air;
-            }
-        }
-
-        args.Result = EnumerateAdjacent(component, tile);
-        args.Handled = true;
-    }
-
     /// <summary>
-    /// Update array of adjacent tiles and the adjacency flags. Optionally activates all tiles with modified adjacencies.
+    /// Update array of adjacent tiles and the adjacency flags.
     /// </summary>
     private void UpdateAdjacentTiles(
         Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
@@ -318,14 +194,16 @@ private void UpdateAdjacentTiles(
             if (activate)
                 AddActiveTile(atmos, adjacent);
 
-            var oppositeDirection = direction.GetOpposite();
+            var oppositeIndex = i.ToOppositeIndex();
+            var oppositeDirection = (AtmosDirection) (1 << oppositeIndex);
+
             if (adjBlockDirs.IsFlagSet(oppositeDirection) || blockedDirs.IsFlagSet(direction))
             {
                 // Adjacency is blocked by some airtight entity.
                 tile.AdjacentBits &= ~direction;
                 adjacent.AdjacentBits &= ~oppositeDirection;
                 tile.AdjacentTiles[i] = null;
-                adjacent.AdjacentTiles[oppositeDirection.ToIndex()] = null;
+                adjacent.AdjacentTiles[oppositeIndex] = null;
             }
             else
             {
@@ -333,7 +211,7 @@ private void UpdateAdjacentTiles(
                 tile.AdjacentBits |= direction;
                 adjacent.AdjacentBits |= oppositeDirection;
                 tile.AdjacentTiles[i] = adjacent;
-                adjacent.AdjacentTiles[oppositeDirection.ToIndex()] = tile;
+                adjacent.AdjacentTiles[oppositeIndex] = tile;
             }
 
             DebugTools.Assert(!(tile.AdjacentBits.IsFlagSet(direction) ^
@@ -357,18 +235,6 @@ private void UpdateAdjacentTiles(
         return (air, map.Space);
     }
 
-    private void GridHotspotExpose(EntityUid uid, GridAtmosphereComponent component, ref HotspotExposeMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        if (!component.Tiles.TryGetValue(args.Tile, out var tile))
-            return;
-
-        HotspotExpose(component, tile, args.ExposedTemperature, args.ExposedVolume, args.soh, args.SparkSourceUid);
-        args.Handled = true;
-    }
-
     private void GridHotspotExtinguish(EntityUid uid, GridAtmosphereComponent component,
         ref HotspotExtinguishMethodEvent args)
     {
@@ -445,49 +311,6 @@ private void GridFixTileVacuum(TileAtmosphere tile)
         tile.Air.Temperature = totalTemperature / count;
     }
 
-    private void GridAddPipeNet(EntityUid uid, GridAtmosphereComponent component, ref AddPipeNetMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = component.PipeNets.Add(args.PipeNet);
-    }
-
-    private void GridRemovePipeNet(EntityUid uid, GridAtmosphereComponent component, ref RemovePipeNetMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = component.PipeNets.Remove(args.PipeNet);
-    }
-
-    private void GridAddAtmosDevice(Entity<GridAtmosphereComponent> grid, ref AddAtmosDeviceMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        if (!grid.Comp.AtmosDevices.Add((args.Device.Owner, args.Device)))
-            return;
-
-        args.Device.JoinedGrid = grid;
-        args.Handled = true;
-        args.Result = true;
-    }
-
-    private void GridRemoveAtmosDevice(EntityUid uid, GridAtmosphereComponent component,
-        ref RemoveAtmosDeviceMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        if (!component.AtmosDevices.Remove((args.Device.Owner, args.Device)))
-            return;
-
-        args.Device.JoinedGrid = null;
-        args.Handled = true;
-        args.Result = true;
-    }
-
     /// <summary>
     ///     Repopulates all tiles on a grid atmosphere.
     /// </summary>
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
index cb50ff114e0..461435f0624 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
@@ -1,5 +1,6 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
+using Content.Shared.Humanoid;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Physics;
 using Robust.Shared.Audio;
@@ -49,8 +50,7 @@ private void UpdateHighPressure(float frameTime)
                 comp.Accumulator = 0f;
                 toRemove.Add(ent);
 
-                if (HasComp<MobStateComponent>(uid) &&
-                    TryComp<PhysicsComponent>(uid, out var body))
+                if (TryComp<PhysicsComponent>(uid, out var body))
                 {
                     _physics.SetBodyStatus(uid, body, BodyStatus.OnGround);
                 }
@@ -70,27 +70,10 @@ private void UpdateHighPressure(float frameTime)
             }
         }
 
-        private void AddMobMovedByPressure(EntityUid uid, MovedByPressureComponent component, PhysicsComponent body)
-        {
-            if (!TryComp<FixturesComponent>(uid, out var fixtures))
-                return;
-
-            _physics.SetBodyStatus(uid, body, BodyStatus.InAir);
-
-            foreach (var (id, fixture) in fixtures.Fixtures)
-            {
-                _physics.RemoveCollisionMask(uid, id, fixture, (int) CollisionGroup.TableLayer, manager: fixtures);
-            }
-
-            // TODO: Make them dynamic type? Ehh but they still want movement so uhh make it non-predicted like weightless?
-            // idk it's hard.
-
-            component.Accumulator = 0f;
-            _activePressures.Add((uid, component));
-        }
-
         private void HighPressureMovements(Entity<GridAtmosphereComponent> gridAtmosphere, TileAtmosphere tile, EntityQuery<PhysicsComponent> bodies, EntityQuery<TransformComponent> xforms, EntityQuery<MovedByPressureComponent> pressureQuery, EntityQuery<MetaDataComponent> metas)
         {
+            if (tile.PressureDifference < SpaceWindMinimumCalculatedMass * SpaceWindMinimumCalculatedMass)
+                return;
             // TODO ATMOS finish this
 
             // Don't play the space wind sound on tiles that are on fire...
@@ -120,7 +103,8 @@ private void HighPressureMovements(Entity<GridAtmosphereComponent> gridAtmospher
             var gridWorldRotation = xforms.GetComponent(gridAtmosphere).WorldRotation;
 
             // If we're using monstermos, smooth out the yeet direction to follow the flow
-            if (MonstermosEqualization)
+            //TODO This is bad, don't run this. It just makes the throws worse by somehow rounding them to orthogonal
+            if (!MonstermosEqualization)
             {
                 // We step through tiles according to the pressure direction on the current tile.
                 // The goal is to get a general direction of the airflow in the area.
@@ -160,7 +144,7 @@ private void HighPressureMovements(Entity<GridAtmosphereComponent> gridAtmospher
                         (entity, pressureMovements),
                         gridAtmosphere.Comp.UpdateCounter,
                         tile.PressureDifference,
-                        tile.PressureDirection, 0,
+                        tile.PressureDirection,
                         tile.PressureSpecificTarget != null ? _mapSystem.ToCenterCoordinates(tile.GridIndex, tile.PressureSpecificTarget.GridIndices) : EntityCoordinates.Invalid,
                         gridWorldRotation,
                         xforms.GetComponent(entity),
@@ -181,12 +165,29 @@ private void ConsiderPressureDifference(GridAtmosphereComponent gridAtmosphere,
             tile.PressureDirection = differenceDirection;
         }
 
+        //INFO The EE version of this function drops pressureResistanceProbDelta, since it's not needed. If you are for whatever reason calling this function
+        //INFO And if it isn't working, you've probably still got the pressureResistanceProbDelta line included.
+        /// <notes>
+        /// EXPLANATION:
+        /// pressureDifference = Force of Air Flow on a given tile
+        /// physics.Mass = Mass of the object potentially being thrown
+        /// physics.InvMass = 1 divided by said Mass. More CPU efficient way to do division.
+        ///
+        /// Objects can only be thrown if the force of air flow is greater than the SQUARE of their mass or {SpaceWindMinimumCalculatedMass}, whichever is heavier
+        /// This means that the heavier an object is, the exponentially more force is required to move it
+        /// The force of a throw is equal to the force of air pressure, divided by an object's mass. So not only are heavier objects
+        /// less likely to be thrown, they are also harder to throw,
+        /// while lighter objects are yeeted easily, and from great distance.
+        ///
+        /// For a human sized entity with a standard weight of 80kg and a spacing between a hard vacuum and a room pressurized at 101kpa,
+        /// The human shall only be moved if he is either very close to the hole, or is standing in a region of high airflow
+        /// </notes>
+
         public void ExperiencePressureDifference(
             Entity<MovedByPressureComponent> ent,
             int cycle,
             float pressureDifference,
             AtmosDirection direction,
-            float pressureResistanceProbDelta,
             EntityCoordinates throwTarget,
             Angle gridWorldRotation,
             TransformComponent? xform = null,
@@ -199,50 +200,28 @@ public void ExperiencePressureDifference(
             if (!Resolve(uid, ref xform))
                 return;
 
-            // TODO ATMOS stuns?
-
-            var maxForce = MathF.Sqrt(pressureDifference) * 2.25f;
-            var moveProb = 100f;
 
-            if (component.PressureResistance > 0)
-                moveProb = MathF.Abs((pressureDifference / component.PressureResistance * MovedByPressureComponent.ProbabilityBasePercent) -
-                                     MovedByPressureComponent.ProbabilityOffset);
-
-            // Can we yeet the thing (due to probability, strength, etc.)
-            if (moveProb > MovedByPressureComponent.ProbabilityOffset && _robustRandom.Prob(MathF.Min(moveProb / 100f, 1f))
-                                                                      && !float.IsPositiveInfinity(component.MoveResist)
-                                                                      && (physics.BodyType != BodyType.Static
-                                                                          && (maxForce >= (component.MoveResist * MovedByPressureComponent.MoveForcePushRatio)))
-                || (physics.BodyType == BodyType.Static && (maxForce >= (component.MoveResist * MovedByPressureComponent.MoveForceForcePushRatio))))
+            if (physics.BodyType != BodyType.Static
+                && !float.IsPositiveInfinity(component.MoveResist))
             {
-                if (HasComp<MobStateComponent>(uid))
+                var moveForce = pressureDifference * MathF.Max(physics.InvMass, SpaceWindMaximumCalculatedInverseMass);
+                if (HasComp<HumanoidAppearanceComponent>(ent))
+                    moveForce *= HumanoidThrowMultiplier;
+                if (moveForce > physics.Mass)
                 {
-                    AddMobMovedByPressure(uid, component, physics);
-                }
-
-                if (maxForce > MovedByPressureComponent.ThrowForce)
-                {
-                    var moveForce = maxForce;
-                    moveForce /= (throwTarget != EntityCoordinates.Invalid) ? SpaceWindPressureForceDivisorThrow : SpaceWindPressureForceDivisorPush;
-                    moveForce *= MathHelper.Clamp(moveProb, 0, 100);
-
-                    // Apply a sanity clamp to prevent being thrown through objects.
-                    var maxSafeForceForObject = SpaceWindMaxVelocity * physics.Mass;
-                    moveForce = MathF.Min(moveForce, maxSafeForceForObject);
-
                     // Grid-rotation adjusted direction
                     var dirVec = (direction.ToAngle() + gridWorldRotation).ToWorldVec();
+                    moveForce *= MathF.Max(physics.InvMass, SpaceWindMaximumCalculatedInverseMass);
 
-                    // TODO: Technically these directions won't be correct but uhh I'm just here for optimisations buddy not to fix my old bugs.
+                    //TODO Consider replacing throw target with proper trigonometry angles.
                     if (throwTarget != EntityCoordinates.Invalid)
                     {
-                        var pos = ((throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition).Normalized() + dirVec).Normalized();
-                        _physics.ApplyLinearImpulse(uid, pos * moveForce, body: physics);
+                        var pos = throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition + dirVec;
+                        _throwing.TryThrow(uid, pos.Normalized() * MathF.Min(moveForce, SpaceWindMaxVelocity), moveForce);
                     }
                     else
                     {
-                        moveForce = MathF.Min(moveForce, SpaceWindMaxPushForce);
-                        _physics.ApplyLinearImpulse(uid, dirVec * moveForce, body: physics);
+                        _throwing.TryThrow(uid, dirVec.Normalized() * MathF.Min(moveForce, SpaceWindMaxVelocity), moveForce);
                     }
 
                     component.LastHighPressureMovementAirCycle = cycle;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
index 713d1c4682c..7163b4cd44c 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
@@ -1,10 +1,12 @@
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.Reactions;
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
 using Content.Shared.Audio;
 using Content.Shared.Database;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 
 namespace Content.Server.Atmos.EntitySystems
@@ -18,18 +20,18 @@ public sealed partial class AtmosphereSystem
         [ViewVariables(VVAccess.ReadWrite)]
         public string? HotspotSound { get; private set; } = "/Audio/Effects/fire.ogg";
 
-        private void ProcessHotspot(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
+        private void ProcessHotspot(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+            TileAtmosphere tile)
         {
+            var gridAtmosphere = ent.Comp1;
             if (!tile.Hotspot.Valid)
             {
                 gridAtmosphere.HotspotTiles.Remove(tile);
                 return;
             }
 
-            if (!tile.Excited)
-            {
-                AddActiveTile(gridAtmosphere, tile);
-            }
+            AddActiveTile(gridAtmosphere, tile);
 
             if (!tile.Hotspot.SkippedFirstProcess)
             {
@@ -44,7 +46,7 @@ private void ProcessHotspot(GridAtmosphereComponent gridAtmosphere, TileAtmosphe
                 || tile.Air == null || tile.Air.GetMoles(Gas.Oxygen) < 0.5f || (tile.Air.GetMoles(Gas.Plasma) < 0.5f && tile.Air.GetMoles(Gas.Tritium) < 0.5f))
             {
                 tile.Hotspot = new Hotspot();
-                InvalidateVisuals(tile.GridIndex, tile.GridIndices);
+                InvalidateVisuals(ent, tile);
                 return;
             }
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs
index c27e18b55b0..fb2375899d9 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs
@@ -1,14 +1,18 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Atmos.EntitySystems
 {
     public sealed partial class AtmosphereSystem
     {
-        private void ProcessCell(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, int fireCount, GasTileOverlayComponent visuals)
+        private void ProcessCell(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+            TileAtmosphere tile, int fireCount)
         {
+            var gridAtmosphere = ent.Comp1;
             // Can't process a tile without air
             if (tile.Air == null)
             {
@@ -52,11 +56,7 @@ private void ProcessCell(GridAtmosphereComponent gridAtmosphere, TileAtmosphere
                     shouldShareAir = true;
                 } else if (CompareExchange(tile.Air, enemyTile.Air) != GasCompareResult.NoExchange)
                 {
-                    if (!enemyTile.Excited)
-                    {
-                        AddActiveTile(gridAtmosphere, enemyTile);
-                    }
-
+                    AddActiveTile(gridAtmosphere, enemyTile);
                     if (ExcitedGroups)
                     {
                         var excitedGroup = tile.ExcitedGroup;
@@ -91,7 +91,7 @@ private void ProcessCell(GridAtmosphereComponent gridAtmosphere, TileAtmosphere
                         }
                         else
                         {
-                            ConsiderPressureDifference(gridAtmosphere, enemyTile, direction.GetOpposite(), -difference);
+                            ConsiderPressureDifference(gridAtmosphere, enemyTile, i.ToOppositeDir(), -difference);
                         }
                     }
 
@@ -102,7 +102,7 @@ private void ProcessCell(GridAtmosphereComponent gridAtmosphere, TileAtmosphere
             if(tile.Air != null)
                 React(tile.Air, tile);
 
-            InvalidateVisuals(tile.GridIndex, tile.GridIndices, visuals);
+            InvalidateVisuals(ent, tile);
 
             var remove = true;
 
@@ -146,7 +146,7 @@ private void LastShareCheck(TileAtmosphere tile)
         /// <param name="tile">Tile Atmosphere to be activated.</param>
         private void AddActiveTile(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
         {
-            if (tile.Air == null)
+            if (tile.Air == null || tile.Excited)
                 return;
 
             tile.Excited = true;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Map.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Map.cs
index ed105c8d33f..25b3b801f76 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Map.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Map.cs
@@ -12,9 +12,6 @@ private void InitializeMap()
     {
         SubscribeLocalEvent<MapAtmosphereComponent, ComponentInit>(OnMapStartup);
         SubscribeLocalEvent<MapAtmosphereComponent, ComponentRemove>(OnMapRemove);
-        SubscribeLocalEvent<MapAtmosphereComponent, IsTileSpaceMethodEvent>(MapIsTileSpace);
-        SubscribeLocalEvent<MapAtmosphereComponent, GetTileMixtureMethodEvent>(MapGetTileMixture);
-        SubscribeLocalEvent<MapAtmosphereComponent, GetTileMixturesMethodEvent>(MapGetTileMixtures);
         SubscribeLocalEvent<MapAtmosphereComponent, ComponentGetState>(OnMapGetState);
         SubscribeLocalEvent<GridAtmosphereComponent, EntParentChangedMessage>(OnGridParentChanged);
     }
@@ -31,37 +28,6 @@ private void OnMapRemove(EntityUid uid, MapAtmosphereComponent component, Compon
             RefreshAllGridMapAtmospheres(uid);
     }
 
-    private void MapIsTileSpace(EntityUid uid, MapAtmosphereComponent component, ref IsTileSpaceMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Result = component.Space;
-        args.Handled = true;
-    }
-
-    private void MapGetTileMixture(EntityUid uid, MapAtmosphereComponent component, ref GetTileMixtureMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Mixture = component.Mixture;
-        args.Handled = true;
-    }
-
-    private void MapGetTileMixtures(EntityUid uid, MapAtmosphereComponent component, ref GetTileMixturesMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-        args.Handled = true;
-        args.Mixtures ??= new GasMixture?[args.Tiles.Count];
-
-        for (var i = 0; i < args.Tiles.Count; i++)
-        {
-            args.Mixtures[i] ??= component.Mixture;
-        }
-    }
-
     private void OnMapGetState(EntityUid uid, MapAtmosphereComponent component, ref ComponentGetState args)
     {
         args.State = new MapAtmosphereComponentState(component.Overlay);
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
index dcbc1e86ee2..8bb34cc1c35 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
@@ -5,11 +5,13 @@
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Database;
+using Content.Shared.Maps;
+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.Atmos.EntitySystems
 {
     public sealed partial class AtmosphereSystem
@@ -137,7 +139,7 @@ private void EqualizePressureInZone(
             var logN = MathF.Log2(tileCount);
 
             // Optimization - try to spread gases using an O(n log n) algorithm that has a chance of not working first to avoid O(n^2)
-            if (giverTilesLength > logN && takerTilesLength > logN)
+            if (!MonstermosUseExpensiveAirflow && giverTilesLength > logN && takerTilesLength > logN)
             {
                 // Even if it fails, it will speed up the next part.
                 Array.Sort(_equalizeTiles, 0, tileCount, _monstermosComparer);
@@ -230,7 +232,7 @@ private void EqualizePressureInZone(
                             if (otherTile2.MonstermosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
                             _equalizeQueue[queueLength++] = otherTile2;
                             otherTile2.MonstermosInfo.LastSlowQueueCycle = queueCycleSlow;
-                            otherTile2.MonstermosInfo.CurrentTransferDirection = direction.GetOpposite();
+                            otherTile2.MonstermosInfo.CurrentTransferDirection = k.ToOppositeDir();
                             otherTile2.MonstermosInfo.CurrentTransferAmount = 0;
                             if (otherTile2.MonstermosInfo.MoleDelta < 0)
                             {
@@ -296,7 +298,7 @@ private void EqualizePressureInZone(
                             if (otherTile2.MonstermosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
                             _equalizeQueue[queueLength++] = otherTile2;
                             otherTile2.MonstermosInfo.LastSlowQueueCycle = queueCycleSlow;
-                            otherTile2.MonstermosInfo.CurrentTransferDirection = direction.GetOpposite();
+                            otherTile2.MonstermosInfo.CurrentTransferDirection = k.ToOppositeDir();
                             otherTile2.MonstermosInfo.CurrentTransferAmount = 0;
 
                             if (otherTile2.MonstermosInfo.MoleDelta > 0)
@@ -338,7 +340,7 @@ private void EqualizePressureInZone(
             for (var i = 0; i < tileCount; i++)
             {
                 var otherTile = _equalizeTiles[i]!;
-                FinalizeEq(gridAtmosphere, otherTile, ent);
+                FinalizeEq(ent, otherTile);
             }
 
             for (var i = 0; i < tileCount; i++)
@@ -473,7 +475,7 @@ private void ExplosivelyDepressurize(
                     if(tile2.Space)
                         continue;
 
-                    tile2.MonstermosInfo.CurrentTransferDirection = direction.GetOpposite();
+                    tile2.MonstermosInfo.CurrentTransferDirection = j.ToOppositeDir();
                     tile2.MonstermosInfo.CurrentTransferAmount = 0.0f;
                     tile2.PressureSpecificTarget = otherTile.PressureSpecificTarget;
                     tile2.MonstermosInfo.LastSlowQueueCycle = queueCycleSlow;
@@ -549,8 +551,9 @@ private void ExplosivelyDepressurize(
                     otherTile.Air.Temperature = Atmospherics.TCMB;
                 }
 
-                InvalidateVisuals(otherTile.GridIndex, otherTile.GridIndices, visuals);
-                HandleDecompressionFloorRip(mapGrid, otherTile, otherTile.MonstermosInfo.CurrentTransferAmount);
+                InvalidateVisuals(ent, otherTile);
+                if (MonstermosRipTiles && otherTile.PressureDifference > MonstermosRipTilesMinimumPressure)
+                    HandleDecompressionFloorRip(mapGrid, otherTile, otherTile.PressureDifference);
             }
 
             if (GridImpulse && tileCount > 0)
@@ -598,11 +601,13 @@ private void ConsiderFirelocks(
 
             UpdateAdjacentTiles(ent, tile);
             UpdateAdjacentTiles(ent, other);
-            InvalidateVisuals(tile.GridIndex, tile.GridIndices, ent);
-            InvalidateVisuals(other.GridIndex, other.GridIndices, ent);
+            InvalidateVisuals(ent, tile);
+            InvalidateVisuals(ent, other);
         }
 
-        private void FinalizeEq(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, GasTileOverlayComponent? visuals)
+        private void FinalizeEq(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+            TileAtmosphere tile)
         {
             Span<float> transferDirections = stackalloc float[Atmospherics.Directions];
             var hasTransferDirs = false;
@@ -629,17 +634,19 @@ private void FinalizeEq(GridAtmosphereComponent gridAtmosphere, TileAtmosphere t
 
                 // Everything that calls this method already ensures that Air will not be null.
                 if (tile.Air!.TotalMoles < amount)
-                    FinalizeEqNeighbors(gridAtmosphere, tile, transferDirections, visuals);
+                    FinalizeEqNeighbors(ent, tile, transferDirections);
 
-                otherTile.MonstermosInfo[direction.GetOpposite()] = 0;
+                otherTile.MonstermosInfo[i.ToOppositeDir()] = 0;
                 Merge(otherTile.Air, tile.Air.Remove(amount));
-                InvalidateVisuals(tile.GridIndex, tile.GridIndices, visuals);
-                InvalidateVisuals(otherTile.GridIndex, otherTile.GridIndices, visuals);
-                ConsiderPressureDifference(gridAtmosphere, tile, direction, amount);
+                InvalidateVisuals(ent, tile);
+                InvalidateVisuals(ent, otherTile);
+                ConsiderPressureDifference(ent, tile, direction, amount);
             }
         }
 
-        private void FinalizeEqNeighbors(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, ReadOnlySpan<float> transferDirs, GasTileOverlayComponent? visuals)
+        private void FinalizeEqNeighbors(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+            TileAtmosphere tile, ReadOnlySpan<float> transferDirs)
         {
             for (var i = 0; i < Atmospherics.Directions; i++)
             {
@@ -647,7 +654,7 @@ private void FinalizeEqNeighbors(GridAtmosphereComponent gridAtmosphere, TileAtm
                 var amount = transferDirs[i];
                 // Since AdjacentBits is set, AdjacentTiles[i] wouldn't be null, and neither would its air.
                 if(amount < 0 && tile.AdjacentBits.IsFlagSet(direction))
-                    FinalizeEq(gridAtmosphere, tile.AdjacentTiles[i]!, visuals);  // A bit of recursion if needed.
+                    FinalizeEq(ent, tile.AdjacentTiles[i]!);  // A bit of recursion if needed.
             }
         }
 
@@ -664,7 +671,9 @@ private void AdjustEqMovement(TileAtmosphere tile, AtmosDirection direction, flo
                 Log.Error($"Encountered null-tile in {nameof(AdjustEqMovement)}. Trace: {Environment.StackTrace}");
                 return;
             }
-            var adj = tile.AdjacentTiles[direction.ToIndex()];
+
+            var idx = direction.ToIndex();
+            var adj = tile.AdjacentTiles[idx];
             if (adj == null)
             {
                 var nonNull = tile.AdjacentTiles.Where(x => x != null).Count();
@@ -673,17 +682,17 @@ private void AdjustEqMovement(TileAtmosphere tile, AtmosDirection direction, flo
             }
 
             tile.MonstermosInfo[direction] += amount;
-            adj.MonstermosInfo[direction.GetOpposite()] -= amount;
+            adj.MonstermosInfo[idx.ToOppositeDir()] -= amount;
         }
 
-        private void HandleDecompressionFloorRip(MapGridComponent mapGrid, TileAtmosphere tile, float sum)
+        private void HandleDecompressionFloorRip(MapGridComponent mapGrid, TileAtmosphere tile, float delta)
         {
-            if (!MonstermosRipTiles)
+            if (!mapGrid.TryGetTileRef(tile.GridIndices, out var tileRef))
                 return;
+            var tileref = tileRef.Tile;
 
-            var chance = MathHelper.Clamp(0.01f + (sum / SpacingMaxWind) * 0.3f, 0.003f, 0.3f);
-
-            if (sum > 20 && _robustRandom.Prob(chance))
+            var tileDef = (ContentTileDefinition) _tileDefinitionManager[tileref.TypeId];
+            if (!tileDef.Reinforced && tileDef.TileRipResistance < delta * MonstermosRipTilesPressureOffset)
                 PryTile(mapGrid, tile.GridIndices);
         }
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
index eba398c1821..bd023e8574a 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
@@ -86,7 +86,7 @@ private bool ProcessRevalidate(Entity<GridAtmosphereComponent, GasTileOverlayCom
                 DebugTools.Assert(atmosphere.Tiles.GetValueOrDefault(tile.GridIndices) == tile);
                 UpdateAdjacentTiles(ent, tile, activate: true);
                 UpdateTileAir(ent, tile, volume);
-                InvalidateVisuals(uid, tile.GridIndices, visuals);
+                InvalidateVisuals(ent, tile);
 
                 if (number++ < InvalidCoordinatesLagCheckIterations)
                     continue;
@@ -313,15 +313,17 @@ private bool ProcessTileEqualize(Entity<GridAtmosphereComponent, GasTileOverlayC
             return true;
         }
 
-        private bool ProcessActiveTiles(GridAtmosphereComponent atmosphere, GasTileOverlayComponent visuals)
+        private bool ProcessActiveTiles(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent)
         {
+            var atmosphere = ent.Comp1;
             if(!atmosphere.ProcessingPaused)
                 QueueRunTiles(atmosphere.CurrentRunTiles, atmosphere.ActiveTiles);
 
             var number = 0;
             while (atmosphere.CurrentRunTiles.TryDequeue(out var tile))
             {
-                ProcessCell(atmosphere, tile, atmosphere.UpdateCounter, visuals);
+                ProcessCell(ent, tile, atmosphere.UpdateCounter);
 
                 if (number++ < LagCheckIterations)
                     continue;
@@ -337,8 +339,10 @@ private bool ProcessActiveTiles(GridAtmosphereComponent atmosphere, GasTileOverl
             return true;
         }
 
-        private bool ProcessExcitedGroups(GridAtmosphereComponent gridAtmosphere)
+        private bool ProcessExcitedGroups(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent)
         {
+            var gridAtmosphere = ent.Comp1;
             if (!gridAtmosphere.ProcessingPaused)
             {
                 gridAtmosphere.CurrentRunExcitedGroups.Clear();
@@ -356,7 +360,7 @@ private bool ProcessExcitedGroups(GridAtmosphereComponent gridAtmosphere)
                 excitedGroup.DismantleCooldown++;
 
                 if (excitedGroup.BreakdownCooldown > Atmospherics.ExcitedGroupBreakdownCycles)
-                    ExcitedGroupSelfBreakdown(gridAtmosphere, excitedGroup);
+                    ExcitedGroupSelfBreakdown(ent, excitedGroup);
                 else if (excitedGroup.DismantleCooldown > Atmospherics.ExcitedGroupsDismantleCycles)
                     DeactivateGroupTiles(gridAtmosphere, excitedGroup);
                 // TODO ATMOS. What is the point of this? why is this only de-exciting the group? Shouldn't it also dismantle it?
@@ -411,15 +415,17 @@ private bool ProcessHighPressureDelta(Entity<GridAtmosphereComponent> ent)
             return true;
         }
 
-        private bool ProcessHotspots(GridAtmosphereComponent atmosphere)
+        private bool ProcessHotspots(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent)
         {
+            var atmosphere = ent.Comp1;
             if(!atmosphere.ProcessingPaused)
                 QueueRunTiles(atmosphere.CurrentRunTiles, atmosphere.HotspotTiles);
 
             var number = 0;
             while (atmosphere.CurrentRunTiles.TryDequeue(out var hotspot))
             {
-                ProcessHotspot(atmosphere, hotspot);
+                ProcessHotspot(ent, hotspot);
 
                 if (number++ < LagCheckIterations)
                     continue;
@@ -507,8 +513,11 @@ public float RealAtmosTime()
             return num * AtmosTime;
         }
 
-        private bool ProcessAtmosDevices(GridAtmosphereComponent atmosphere)
+        private bool ProcessAtmosDevices(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+            Entity<MapAtmosphereComponent?> map)
         {
+            var atmosphere = ent.Comp1;
             if (!atmosphere.ProcessingPaused)
             {
                 atmosphere.CurrentRunAtmosDevices.Clear();
@@ -521,7 +530,7 @@ private bool ProcessAtmosDevices(GridAtmosphereComponent atmosphere)
 
             var time = _gameTiming.CurTime;
             var number = 0;
-            var ev = new AtmosDeviceUpdateEvent(RealAtmosTime());
+            var ev = new AtmosDeviceUpdateEvent(RealAtmosTime(), (ent, ent.Comp1, ent.Comp2), map);
             while (atmosphere.CurrentRunAtmosDevices.TryDequeue(out var device))
             {
                 RaiseLocalEvent(device, ref ev);
@@ -565,12 +574,11 @@ private void UpdateProcessing(float frameTime)
                 var ent = _currentRunAtmosphere[_currentRunAtmosphereIndex];
                 var (owner, atmosphere, visuals, grid, xform) = ent;
 
-                if (!TryComp(owner, out TransformComponent? x)
-                    || x.MapUid == null
-                    || TerminatingOrDeleted(x.MapUid.Value)
-                    || x.MapID == MapId.Nullspace)
+                if (xform.MapUid == null
+                    || TerminatingOrDeleted(xform.MapUid.Value)
+                    || xform.MapID == MapId.Nullspace)
                 {
-                    Log.Error($"Attempted to process atmos without a map? Entity: {ToPrettyString(owner)}. Map: {ToPrettyString(x?.MapUid)}. MapId: {x?.MapID}");
+                    Log.Error($"Attempted to process atmos without a map? Entity: {ToPrettyString(owner)}. Map: {ToPrettyString(xform?.MapUid)}. MapId: {xform?.MapID}");
                     continue;
                 }
 
@@ -585,6 +593,8 @@ private void UpdateProcessing(float frameTime)
                 // We subtract it so it takes lost time into account.
                 atmosphere.Timer -= AtmosTime;
 
+                var map = new Entity<MapAtmosphereComponent?>(xform.MapUid.Value, _mapAtmosQuery.CompOrNull(xform.MapUid.Value));
+
                 switch (atmosphere.State)
                 {
                     case AtmosphereProcessingState.Revalidate:
@@ -614,7 +624,7 @@ private void UpdateProcessing(float frameTime)
                         atmosphere.State = AtmosphereProcessingState.ActiveTiles;
                         continue;
                     case AtmosphereProcessingState.ActiveTiles:
-                        if (!ProcessActiveTiles(ent, ent))
+                        if (!ProcessActiveTiles(ent))
                         {
                             atmosphere.ProcessingPaused = true;
                             return;
@@ -625,7 +635,7 @@ private void UpdateProcessing(float frameTime)
                         atmosphere.State = ExcitedGroups ? AtmosphereProcessingState.ExcitedGroups : AtmosphereProcessingState.HighPressureDelta;
                         continue;
                     case AtmosphereProcessingState.ExcitedGroups:
-                        if (!ProcessExcitedGroups(atmosphere))
+                        if (!ProcessExcitedGroups(ent))
                         {
                             atmosphere.ProcessingPaused = true;
                             return;
@@ -645,7 +655,7 @@ private void UpdateProcessing(float frameTime)
                         atmosphere.State = AtmosphereProcessingState.Hotspots;
                         continue;
                     case AtmosphereProcessingState.Hotspots:
-                        if (!ProcessHotspots(atmosphere))
+                        if (!ProcessHotspots(ent))
                         {
                             atmosphere.ProcessingPaused = true;
                             return;
@@ -680,7 +690,7 @@ private void UpdateProcessing(float frameTime)
                         atmosphere.State = AtmosphereProcessingState.AtmosDevices;
                         continue;
                     case AtmosphereProcessingState.AtmosDevices:
-                        if (!ProcessAtmosDevices(atmosphere))
+                        if (!ProcessAtmosDevices(ent, map))
                         {
                             atmosphere.ProcessingPaused = true;
                             return;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs
index 5c73cf11246..8ed92a9d0eb 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs
@@ -16,7 +16,7 @@ private void Superconduct(GridAtmosphereComponent gridAtmosphere, TileAtmosphere
                 if (!directions.IsFlagSet(direction))
                     continue;
 
-                var adjacent = tile.AdjacentTiles[direction.ToIndex()];
+                var adjacent = tile.AdjacentTiles[i];
 
                 // TODO ATMOS handle adjacent being null.
                 if (adjacent == null || adjacent.ThermalConductivity == 0f)
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
index 67c6d5998dd..cf4c73aa2f4 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
@@ -36,9 +36,17 @@ public double GetPrice(GasMixture mixture)
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void InvalidateVisuals(EntityUid gridUid, Vector2i tile, GasTileOverlayComponent? comp = null)
+    public void InvalidateVisuals(Entity<GasTileOverlayComponent?> grid, Vector2i tile)
     {
-        _gasTileOverlaySystem.Invalidate(gridUid, tile, comp);
+        _gasTileOverlaySystem.Invalidate(grid, tile);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private void InvalidateVisuals(
+        Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+        TileAtmosphere tile)
+    {
+        _gasTileOverlaySystem.Invalidate((ent.Owner, ent.Comp2), tile.GridIndices);
     }
 
     /// <summary>
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
index d2f40e77169..dbbe769beaf 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Doors.Components;
 using Content.Shared.Maps;
+using Content.Shared.Throwing;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
@@ -37,11 +38,13 @@ public sealed partial class AtmosphereSystem : SharedAtmosphereSystem
     [Dependency] private readonly TileSystem _tile = default!;
     [Dependency] private readonly MapSystem _map = default!;
     [Dependency] public readonly PuddleSystem Puddle = default!;
+    [Dependency] private readonly ThrowingSystem _throwing = default!;
 
     private const float ExposedUpdateDelay = 1f;
     private float _exposedTimer = 0f;
 
     private EntityQuery<GridAtmosphereComponent> _atmosQuery;
+    private EntityQuery<MapAtmosphereComponent> _mapAtmosQuery;
     private EntityQuery<AirtightComponent> _airtightQuery;
     private EntityQuery<FirelockComponent> _firelockQuery;
     private HashSet<EntityUid> _entSet = new();
@@ -59,6 +62,7 @@ public override void Initialize()
         InitializeGridAtmosphere();
         InitializeMap();
 
+        _mapAtmosQuery = GetEntityQuery<MapAtmosphereComponent>();
         _atmosQuery = GetEntityQuery<GridAtmosphereComponent>();
         _airtightQuery = GetEntityQuery<AirtightComponent>();
         _firelockQuery = GetEntityQuery<FirelockComponent>();
@@ -94,7 +98,7 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<AtmosExposedComponent, TransformComponent>();
         while (query.MoveNext(out var uid, out _, out var transform))
         {
-            var air = GetContainingMixture(uid, transform:transform);
+            var air = GetContainingMixture((uid, transform));
 
             if (air == null)
                 continue;
diff --git a/Content.Server/Atmos/EntitySystems/GasTankSystem.cs b/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
index dfe84473402..80842416e8b 100644
--- a/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
@@ -1,4 +1,3 @@
-using System.Numerics;
 using Content.Server.Atmos.Components;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
@@ -17,8 +16,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 
 namespace Content.Server.Atmos.EntitySystems
@@ -33,7 +30,6 @@ public sealed class GasTankSystem : EntitySystem
         [Dependency] private readonly SharedContainerSystem _containers = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly UserInterfaceSystem _ui = default!;
-        [Dependency] private readonly SharedPhysicsSystem _physics = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly ThrowingSystem _throwing = default!;
 
@@ -172,7 +168,7 @@ public override void Update(float frameTime)
         private void ReleaseGas(Entity<GasTankComponent> gasTank)
         {
             var removed = RemoveAirVolume(gasTank, gasTank.Comp.ValveOutputRate * TimerDelay);
-            var environment = _atmosphereSystem.GetContainingMixture(gasTank, false, true);
+            var environment = _atmosphereSystem.GetContainingMixture(gasTank.Owner, false, true);
             if (environment != null)
             {
                 _atmosphereSystem.Merge(environment, removed);
diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
index 397f0167a9b..c46701a6a07 100644
--- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
@@ -52,12 +52,15 @@ public sealed class GasTileOverlaySystem : SharedGasTileOverlaySystem
             new DefaultObjectPool<Dictionary<NetEntity, HashSet<Vector2i>>>(
                 new DefaultPooledObjectPolicy<Dictionary<NetEntity, HashSet<Vector2i>>>(), 64);
 
+        private bool _doSessionUpdate;
+
         /// <summary>
         ///     Overlay update interval, in seconds.
         /// </summary>
         private float _updateInterval;
 
         private int _thresholds;
+        private EntityQuery<GasTileOverlayComponent> _query;
 
         public override void Initialize()
         {
@@ -82,6 +85,7 @@ public override void Initialize()
 
             SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
             SubscribeLocalEvent<GasTileOverlayComponent, ComponentStartup>(OnStartup);
+            _query = GetEntityQuery<GasTileOverlayComponent>();
         }
 
         private void OnStartup(EntityUid uid, GasTileOverlayComponent component, ComponentStartup args)
@@ -129,10 +133,10 @@ private void OnPvsToggle(bool value)
         private void UpdateThresholds(int value) => _thresholds = value;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Invalidate(EntityUid grid, Vector2i index, GasTileOverlayComponent? comp = null)
+        public void Invalidate(Entity<GasTileOverlayComponent?> grid, Vector2i index)
         {
-            if (Resolve(grid, ref comp))
-                comp.InvalidTiles.Add(index);
+            if (_query.Resolve(grid.Owner, ref grid.Comp))
+                grid.Comp.InvalidTiles.Add(index);
         }
 
         private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
@@ -191,7 +195,7 @@ public GasOverlayData GetOverlayData(GasMixture? mixture)
         /// <summary>
         ///     Updates the visuals for a tile on some grid chunk. Returns true if the visuals have changed.
         /// </summary>
-        private bool UpdateChunkTile(GridAtmosphereComponent gridAtmosphere, GasOverlayChunk chunk, Vector2i index, GameTick curTick)
+        private bool UpdateChunkTile(GridAtmosphereComponent gridAtmosphere, GasOverlayChunk chunk, Vector2i index)
         {
             ref var oldData = ref chunk.TileData[chunk.GetDataIndex(index)];
             if (!gridAtmosphere.Tiles.TryGetValue(index, out var tile))
@@ -199,7 +203,7 @@ private bool UpdateChunkTile(GridAtmosphereComponent gridAtmosphere, GasOverlayC
                 if (oldData.Equals(default))
                     return false;
 
-                chunk.LastUpdate = curTick;
+                chunk.LastUpdate = _gameTiming.CurTick;
                 oldData = default;
                 return true;
             }
@@ -257,11 +261,11 @@ private bool UpdateChunkTile(GridAtmosphereComponent gridAtmosphere, GasOverlayC
             if (!changed)
                 return false;
 
-            chunk.LastUpdate = curTick;
+            chunk.LastUpdate = _gameTiming.CurTick;
             return true;
         }
 
-        private void UpdateOverlayData(GameTick curTick)
+        private void UpdateOverlayData()
         {
             // TODO parallelize?
             foreach (var (overlay, gam, meta) in EntityQuery<GasTileOverlayComponent, GridAtmosphereComponent, MetaDataComponent>(true))
@@ -274,7 +278,7 @@ private void UpdateOverlayData(GameTick curTick)
                     if (!overlay.Chunks.TryGetValue(chunkIndex, out var chunk))
                         overlay.Chunks[chunkIndex] = chunk = new GasOverlayChunk(chunkIndex);
 
-                    changed |= UpdateChunkTile(gam, chunk, index, curTick);
+                    changed |= UpdateChunkTile(gam, chunk, index);
                 }
 
                 if (changed)
@@ -289,13 +293,28 @@ public override void Update(float frameTime)
             base.Update(frameTime);
             AccumulatedFrameTime += frameTime;
 
-            if (AccumulatedFrameTime < _updateInterval) return;
-            AccumulatedFrameTime -= _updateInterval;
+            if (_doSessionUpdate)
+            {
+                UpdateSessions();
+                return;
+            }
+
+            if (AccumulatedFrameTime < _updateInterval)
+                return;
 
-            var curTick = _gameTiming.CurTick;
+            AccumulatedFrameTime -= _updateInterval;
 
             // First, update per-chunk visual data for any invalidated tiles.
-            UpdateOverlayData(curTick);
+            UpdateOverlayData();
+
+            // Then, next tick we send the data to players.
+            // This is to avoid doing all the work in the same tick.
+            _doSessionUpdate = true;
+        }
+
+        public void UpdateSessions()
+        {
+            _doSessionUpdate = false;
 
             if (!PvsEnabled)
                 return;
@@ -313,11 +332,11 @@ public override void Update(float frameTime)
                 _sessions.Add(player);
             }
 
-            if (_sessions.Count > 0)
-            {
-                _updateJob.CurrentTick = curTick;
-                _parMan.ProcessNow(_updateJob, _sessions.Count);
-            }
+            if (_sessions.Count == 0)
+                return;
+
+            _parMan.ProcessNow(_updateJob, _sessions.Count);
+            _updateJob.LastSessionUpdate = _gameTiming.CurTick;
         }
 
         public void Reset(RoundRestartCleanupEvent ev)
@@ -350,7 +369,7 @@ private record struct UpdatePlayerJob : IParallelRobustJob
             public ObjectPool<HashSet<Vector2i>> ChunkIndexPool;
             public ObjectPool<Dictionary<NetEntity, HashSet<Vector2i>>> ChunkViewerPool;
 
-            public GameTick CurrentTick;
+            public GameTick LastSessionUpdate;
             public Dictionary<ICommonSession, Dictionary<NetEntity, HashSet<Vector2i>>> LastSentChunks;
             public List<ICommonSession> Sessions;
 
@@ -411,14 +430,16 @@ public void Execute(int index)
                         if (!overlay.Chunks.TryGetValue(gIndex, out var value))
                             continue;
 
-                        if (previousChunks != null &&
-                            previousChunks.Contains(gIndex) &&
-                            value.LastUpdate != CurrentTick)
+                        // If the chunk was updated since we last sent it, send it again
+                        if (value.LastUpdate > LastSessionUpdate)
                         {
+                            dataToSend.Add(value);
                             continue;
                         }
 
-                        dataToSend.Add(value);
+                        // Always send it if we didn't previously send it
+                        if (previousChunks == null || !previousChunks.Contains(gIndex))
+                            dataToSend.Add(value);
                     }
 
                     previouslySent[netGrid] = gridChunks;
diff --git a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
index 286b154e96f..b3644e88b73 100644
--- a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
@@ -40,24 +40,16 @@ private void CacheTileLoss(float val)
 
     private void OnAtmosUpdate(EntityUid uid, HeatExchangerComponent comp, ref AtmosDeviceUpdateEvent args)
     {
-        if (!TryComp(uid, out NodeContainerComponent? nodeContainer)
-                || !TryComp(uid, out AtmosDeviceComponent? device)
-                || !_nodeContainer.TryGetNode(nodeContainer, comp.InletName, out PipeNode? inlet)
-                || !_nodeContainer.TryGetNode(nodeContainer, comp.OutletName, out PipeNode? outlet))
+        // make sure that the tile the device is on isn't blocked by a wall or something similar.
+        if (args.Grid is {} grid
+            && _transform.TryGetGridTilePosition(uid, out var tile)
+            && _atmosphereSystem.IsTileAirBlocked(grid, tile))
         {
             return;
         }
 
-        // make sure that the tile the device is on isn't blocked by a wall or something similar.
-        var xform = Transform(uid);
-        if (_transform.TryGetGridTilePosition(uid, out var tile))
-        {
-            // TryGetGridTilePosition() already returns false if GridUid is null, but the null checker isn't smart enough yet
-            if (xform.GridUid != null && _atmosphereSystem.IsTileAirBlocked(xform.GridUid.Value, tile))
-            {
-                return;
-            }
-        }
+        if (!_nodeContainer.TryGetNodes(uid, comp.InletName, comp.OutletName, out PipeNode? inlet, out PipeNode? outlet))
+            return;
 
         var dt = args.dt;
 
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 28a0a01c99a..c1a5256fdd5 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -204,11 +204,7 @@ private void OnAtmosUpdate(EntityUid uid, AtmosMonitorComponent component, ref A
         if (!this.IsPowered(uid, EntityManager))
             return;
 
-        // can't hurt
-        // (in case something is making AtmosDeviceUpdateEvents
-        // outside the typical device loop)
-        if (!TryComp<AtmosDeviceComponent>(uid, out var atmosDeviceComponent)
-            || atmosDeviceComponent.JoinedGrid == null)
+        if (args.Grid  == null)
             return;
 
         // if we're not monitoring atmos, don't bother
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs
index 77bab4775ce..fced4d79884 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs
@@ -26,11 +26,7 @@ public override void Initialize()
 
         private void OnPassiveGateUpdated(EntityUid uid, GasPassiveGateComponent gate, ref AtmosDeviceUpdateEvent args)
         {
-            if (!EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
-                return;
-
-            if (!_nodeContainer.TryGetNode(nodeContainer, gate.InletName, out PipeNode? inlet)
-                || !_nodeContainer.TryGetNode(nodeContainer, gate.OutletName, out PipeNode? outlet))
+            if (!_nodeContainer.TryGetNodes(uid, gate.InletName, gate.OutletName, out PipeNode? inlet, out PipeNode? outlet))
                 return;
 
             var n1 = inlet.Air.TotalMoles;
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
index 49b69fc6739..af25d04df92 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
@@ -66,9 +66,7 @@ private void OnExamined(EntityUid uid, GasPressurePumpComponent pump, ExaminedEv
         private void OnPumpUpdated(EntityUid uid, GasPressurePumpComponent pump, ref AtmosDeviceUpdateEvent args)
         {
             if (!pump.Enabled
-                || !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
-                || !_nodeContainer.TryGetNode(nodeContainer, pump.InletName, out PipeNode? inlet)
-                || !_nodeContainer.TryGetNode(nodeContainer, pump.OutletName, out PipeNode? outlet))
+                || !_nodeContainer.TryGetNodes(uid, pump.InletName, pump.OutletName, out PipeNode? inlet, out PipeNode? outlet))
             {
                 _ambientSoundSystem.SetAmbience(uid, false);
                 return;
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
index e14069b8a76..3ebc5094926 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
@@ -41,12 +41,8 @@ private void OnExamined(Entity<GasRecyclerComponent> ent, ref ExaminedEvent args
             if (!EntityManager.GetComponent<TransformComponent>(ent).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
                 return;
 
-            if (!EntityManager.TryGetComponent(ent, out NodeContainerComponent? nodeContainer)
-                || !_nodeContainer.TryGetNode(nodeContainer, comp.InletName, out PipeNode? inlet)
-                || !_nodeContainer.TryGetNode(nodeContainer, comp.OutletName, out PipeNode? _))
-            {
+            if (!_nodeContainer.TryGetNode(ent.Owner, comp.InletName, out PipeNode? inlet))
                 return;
-            }
 
             using (args.PushGroup(nameof(GasRecyclerComponent)))
             {
@@ -72,9 +68,7 @@ private void OnExamined(Entity<GasRecyclerComponent> ent, ref ExaminedEvent args
         private void OnUpdate(Entity<GasRecyclerComponent> ent, ref AtmosDeviceUpdateEvent args)
         {
             var comp = ent.Comp;
-            if (!EntityManager.TryGetComponent(ent, out NodeContainerComponent? nodeContainer)
-                || !_nodeContainer.TryGetNode(nodeContainer, comp.InletName, out PipeNode? inlet)
-                || !_nodeContainer.TryGetNode(nodeContainer, comp.OutletName, out PipeNode? outlet))
+            if (!_nodeContainer.TryGetNodes(ent.Owner, comp.InletName, comp.OutletName, out PipeNode? inlet, out PipeNode? outlet))
             {
                 _ambientSoundSystem.SetAmbience(ent, false);
                 return;
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
index 934ce8a7a47..ed7567428e1 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
@@ -59,9 +59,8 @@ private void OnActivate(EntityUid uid, GasValveComponent component, ActivateInWo
         public void Set(EntityUid uid, GasValveComponent component, bool value)
         {
             component.Open = value;
-            if (TryComp(uid, out NodeContainerComponent? nodeContainer)
-                && _nodeContainer.TryGetNode(nodeContainer, component.InletName, out PipeNode? inlet)
-                && _nodeContainer.TryGetNode(nodeContainer, component.OutletName, out PipeNode? outlet))
+
+            if (_nodeContainer.TryGetNodes(uid, component.InletName, component.OutletName, out PipeNode? inlet, out PipeNode? outlet))
             {
                 if (TryComp<AppearanceComponent>(uid, out var appearance))
                 {
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index 10b9cccc099..e4767c4061a 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -27,7 +27,6 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
     public sealed class GasVolumePumpSystem : EntitySystem
     {
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly TransformSystem _transformSystem = default!;
         [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
         [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
         [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!;
@@ -72,11 +71,8 @@ private void OnExamined(EntityUid uid, GasVolumePumpComponent pump, ExaminedEven
 
         private void OnVolumePumpUpdated(EntityUid uid, GasVolumePumpComponent pump, ref AtmosDeviceUpdateEvent args)
         {
-            if (!pump.Enabled
-                || !TryComp(uid, out NodeContainerComponent? nodeContainer)
-                || !TryComp(uid, out AtmosDeviceComponent? device)
-                || !_nodeContainer.TryGetNode(nodeContainer, pump.InletName, out PipeNode? inlet)
-                || !_nodeContainer.TryGetNode(nodeContainer, pump.OutletName, out PipeNode? outlet))
+            if (!pump.Enabled ||
+                !_nodeContainer.TryGetNodes(uid, pump.InletName, pump.OutletName, out PipeNode? inlet, out PipeNode? outlet))
             {
                 _ambientSoundSystem.SetAmbience(uid, false);
                 return;
diff --git a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
index 361e3cbbeb2..b70262e857b 100644
--- a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
+++ b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
@@ -1,4 +1,5 @@
 using Content.Server.Atmos.Components;
+using Content.Shared.Atmos.Components;
 
 namespace Content.Server.Atmos.Piping.Components;
 
@@ -28,7 +29,7 @@ public sealed partial class AtmosDeviceComponent : Component
     /// <summary>
     ///     If non-null, the grid that this device is part of.
     /// </summary>
-    [DataField]
+    [ViewVariables]
     public EntityUid? JoinedGrid = null;
 
     /// <summary>
@@ -46,18 +47,25 @@ public sealed partial class AtmosDeviceComponent : Component
 /// Use this for atmos devices instead of <see cref="EntitySystem.Update"/>.
 /// </summary>
 [ByRefEvent]
-public readonly struct AtmosDeviceUpdateEvent
+public readonly struct AtmosDeviceUpdateEvent(float dt, Entity<GridAtmosphereComponent, GasTileOverlayComponent>? grid, Entity<MapAtmosphereComponent?>? map)
 {
     /// <summary>
     /// Time elapsed since last update, in seconds. Multiply values used in the update handler
     /// by this number to make them tickrate-invariant. Use this number instead of AtmosphereSystem.AtmosTime.
     /// </summary>
-    public readonly float dt;
+    public readonly float dt = dt;
 
-    public AtmosDeviceUpdateEvent(float dt)
-    {
-        this.dt = dt;
-    }
+    /// <summary>
+    /// The grid that this device is currently on.
+    /// </summary>
+    public readonly Entity<GridAtmosphereComponent?, GasTileOverlayComponent?>? Grid = grid == null
+        ? null
+        : (grid.Value, grid.Value, grid.Value);
+
+    /// <summary>
+    /// The map that the device & grid is on.
+    /// </summary>
+    public readonly Entity<MapAtmosphereComponent?>? Map = map;
 }
 
 /// <summary>
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
index f4da68ab531..3c73a8f64ee 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
@@ -1,7 +1,9 @@
+using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Atmos.Piping.EntitySystems
 {
@@ -32,6 +34,14 @@ public override void Initialize()
 
         public void JoinAtmosphere(Entity<AtmosDeviceComponent> ent)
         {
+            if (ent.Comp.JoinedGrid != null)
+            {
+                DebugTools.Assert(HasComp<GridAtmosphereComponent>(ent.Comp.JoinedGrid));
+                DebugTools.Assert(Transform(ent).GridUid == ent.Comp.JoinedGrid);
+                DebugTools.Assert(ent.Comp.RequireAnchored == Transform(ent).Anchored);
+                return;
+            }
+
             var component = ent.Comp;
             var transform = Transform(ent);
 
@@ -39,7 +49,7 @@ public void JoinAtmosphere(Entity<AtmosDeviceComponent> ent)
                 return;
 
             // Attempt to add device to a grid atmosphere.
-            bool onGrid = (transform.GridUid != null) && _atmosphereSystem.AddAtmosDevice(transform.GridUid!.Value, component);
+            bool onGrid = (transform.GridUid != null) && _atmosphereSystem.AddAtmosDevice(transform.GridUid!.Value, ent);
 
             if (!onGrid && component.JoinSystem)
             {
@@ -55,7 +65,7 @@ public void LeaveAtmosphere(Entity<AtmosDeviceComponent> ent)
         {
             var component = ent.Comp;
             // Try to remove the component from an atmosphere, and if not
-            if (component.JoinedGrid != null && !_atmosphereSystem.RemoveAtmosDevice(component.JoinedGrid.Value, component))
+            if (component.JoinedGrid != null && !_atmosphereSystem.RemoveAtmosDevice(component.JoinedGrid.Value, ent))
             {
                 // The grid might have been removed but not us... This usually shouldn't happen.
                 component.JoinedGrid = null;
@@ -119,9 +129,10 @@ public override void Update(float frameTime)
             _timer -= _atmosphereSystem.AtmosTime;
 
             var time = _gameTiming.CurTime;
-            var ev = new AtmosDeviceUpdateEvent(_atmosphereSystem.AtmosTime);
+            var ev = new AtmosDeviceUpdateEvent(_atmosphereSystem.AtmosTime, null, null);
             foreach (var device in _joinedDevices)
             {
+                DebugTools.Assert(!HasComp<GridAtmosphereComponent>(Transform(device).GridUid));
                 RaiseLocalEvent(device, ref ev);
                 device.Comp.LastProcess = time;
             }
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs
index 6fbf60f403d..10049e273bc 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs
@@ -3,14 +3,12 @@
 using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
-using Robust.Server.GameObjects;
-using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Atmos.Piping.EntitySystems;
 
 public sealed class AtmosPipeAppearanceSystem : EntitySystem
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
     public override void Initialize()
@@ -31,7 +29,7 @@ private void UpdateAppearance(EntityUid uid, AppearanceComponent? appearance = n
         if (!Resolve(uid, ref appearance, ref container, ref xform, false))
             return;
 
-        if (!_mapManager.TryGetGrid(xform.GridUid, out var grid))
+        if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
             return;
 
         // get connected entities
diff --git a/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs b/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
index 9853a17f829..aa206dbc686 100644
--- a/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
+++ b/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
@@ -38,9 +38,9 @@ private void OnMinerUpdated(Entity<GasMinerComponent> ent, ref AtmosDeviceUpdate
         private bool CheckMinerOperation(Entity<GasMinerComponent> ent, [NotNullWhen(true)] out GasMixture? environment)
         {
             var (uid, miner) = ent;
-            environment = _atmosphereSystem.GetContainingMixture(uid, true, true);
-
             var transform = Transform(uid);
+            environment = _atmosphereSystem.GetContainingMixture((uid, transform), true, true);
+
             var position = _transformSystem.GetGridOrMapTilePosition(uid, transform);
 
             // Space.
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
index faf06a60793..fbd42604694 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
@@ -53,11 +53,7 @@ private void OnInit(EntityUid uid, GasFilterComponent filter, ComponentInit args
         private void OnFilterUpdated(EntityUid uid, GasFilterComponent filter, ref AtmosDeviceUpdateEvent args)
         {
             if (!filter.Enabled
-                || !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
-                || !EntityManager.TryGetComponent(uid, out AtmosDeviceComponent? device)
-                || !_nodeContainer.TryGetNode(nodeContainer, filter.InletName, out PipeNode? inletNode)
-                || !_nodeContainer.TryGetNode(nodeContainer, filter.FilterName, out PipeNode? filterNode)
-                || !_nodeContainer.TryGetNode(nodeContainer, filter.OutletName, out PipeNode? outletNode)
+                || !_nodeContainer.TryGetNodes(uid, filter.InletName, filter.FilterName, filter.OutletName, out PipeNode? inletNode, out PipeNode? filterNode, out PipeNode? outletNode)
                 || outletNode.Air.Pressure >= Atmospherics.MaxOutputPressure) // No need to transfer if target is full.
             {
                 _ambientSoundSystem.SetAmbience(uid, false);
@@ -187,16 +183,15 @@ private void OnFilterAnalyzed(EntityUid uid, GasFilterComponent component, GasAn
             if (!EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
                 return;
 
-            var gasMixDict = new Dictionary<string, GasMixture?>();
+            args.GasMixtures ??= new Dictionary<string, GasMixture?>();
 
             if(_nodeContainer.TryGetNode(nodeContainer, component.InletName, out PipeNode? inlet))
-                gasMixDict.Add(Loc.GetString("gas-analyzer-window-text-inlet"), inlet.Air);
+                args.GasMixtures.Add(Loc.GetString("gas-analyzer-window-text-inlet"), inlet.Air);
             if(_nodeContainer.TryGetNode(nodeContainer, component.FilterName, out PipeNode? filterNode))
-                gasMixDict.Add(Loc.GetString("gas-analyzer-window-text-filter"), filterNode.Air);
+                args.GasMixtures.Add(Loc.GetString("gas-analyzer-window-text-filter"), filterNode.Air);
             if(_nodeContainer.TryGetNode(nodeContainer, component.OutletName, out PipeNode? outlet))
-                gasMixDict.Add(Loc.GetString("gas-analyzer-window-text-outlet"), outlet.Air);
+                args.GasMixtures.Add(Loc.GetString("gas-analyzer-window-text-outlet"), outlet.Air);
 
-            args.GasMixtures = gasMixDict;
             args.DeviceFlipped = inlet != null && filterNode != null && inlet.CurrentPipeDirection.ToDirection() == filterNode.CurrentPipeDirection.ToDirection().GetClockwise90Degrees();
         }
     }
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
index fb65c17f610..ba8ebf3c9ae 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
@@ -54,18 +54,8 @@ private void OnMixerUpdated(EntityUid uid, GasMixerComponent mixer, ref AtmosDev
         {
             // TODO ATMOS: Cache total moles since it's expensive.
 
-            if (!mixer.Enabled)
-            {
-                _ambientSoundSystem.SetAmbience(uid, false);
-                return;
-            }
-
-            if (!EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
-                return;
-
-            if (!_nodeContainer.TryGetNode(nodeContainer, mixer.InletOneName, out PipeNode? inletOne)
-                || !_nodeContainer.TryGetNode(nodeContainer, mixer.InletTwoName, out PipeNode? inletTwo)
-                || !_nodeContainer.TryGetNode(nodeContainer, mixer.OutletName, out PipeNode? outlet))
+            if (!mixer.Enabled
+                || !_nodeContainer.TryGetNodes(uid, mixer.InletOneName, mixer.InletTwoName, mixer.OutletName, out PipeNode? inletOne, out PipeNode? inletTwo, out PipeNode? outlet))
             {
                 _ambientSoundSystem.SetAmbience(uid, false);
                 return;
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs
index 2c2f1584a53..1bab2abd8e9 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs
@@ -33,11 +33,7 @@ private void OnInit(EntityUid uid, PressureControlledValveComponent comp, Compon
 
         private void OnUpdate(EntityUid uid, PressureControlledValveComponent comp, ref AtmosDeviceUpdateEvent args)
         {
-            if (!EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
-                || !EntityManager.TryGetComponent(uid, out AtmosDeviceComponent? device)
-                || !_nodeContainer.TryGetNode(nodeContainer, comp.InletName, out PipeNode? inletNode)
-                || !_nodeContainer.TryGetNode(nodeContainer, comp.ControlName, out PipeNode? controlNode)
-                || !_nodeContainer.TryGetNode(nodeContainer, comp.OutletName, out PipeNode? outletNode))
+            if (!_nodeContainer.TryGetNodes(uid, comp.InletName, comp.ControlName, comp.OutletName, out PipeNode? inletNode, out PipeNode? controlNode, out PipeNode? outletNode))
             {
                 _ambientSoundSystem.SetAmbience(uid, false);
                 comp.Enabled = false;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index ad647fad1b8..3e4340bf1db 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -13,7 +13,6 @@
 using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
-using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Lock;
 using Robust.Server.GameObjects;
@@ -29,8 +28,6 @@ public sealed class GasCanisterSystem : EntitySystem
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
@@ -63,7 +60,7 @@ public void PurgeContents(EntityUid uid, GasCanisterComponent? canister = null,
         if (!Resolve(uid, ref canister, ref transform))
             return;
 
-        var environment = _atmos.GetContainingMixture(uid, false, true);
+        var environment = _atmos.GetContainingMixture((uid, transform), false, true);
 
         if (environment is not null)
             _atmos.Merge(environment, canister.Air);
@@ -171,7 +168,7 @@ private void OnCanisterUpdated(EntityUid uid, GasCanisterComponent canister, ref
             }
             else
             {
-                var environment = _atmos.GetContainingMixture(uid, false, true);
+                var environment = _atmos.GetContainingMixture(uid, args.Grid, args.Map, false, true);
                 _atmos.ReleaseGasTo(canister.Air, environment, canister.ReleasePressure);
             }
         }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs
index 852542ec6cd..e903ceedafa 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs
@@ -30,9 +30,8 @@ public override void Initialize()
 
     private void OnCondenserUpdated(Entity<GasCondenserComponent> entity, ref AtmosDeviceUpdateEvent args)
     {
-        if (!(_power.IsPowered(entity) && TryComp<ApcPowerReceiverComponent>(entity, out var receiver))
-            || !TryComp<NodeContainerComponent>(entity, out var nodeContainer)
-            || !_nodeContainer.TryGetNode(nodeContainer, entity.Comp.Inlet, out PipeNode? inlet)
+        if (!(TryComp<ApcPowerReceiverComponent>(entity, out var receiver) && _power.IsPowered(entity, receiver))
+            || !_nodeContainer.TryGetNode(entity.Owner, entity.Comp.Inlet, out PipeNode? inlet)
             || !_solution.ResolveSolution(entity.Owner, entity.Comp.SolutionId, ref entity.Comp.Solution, out var solution))
         {
             return;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
index 8029a095565..834a1dfb0b7 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
@@ -50,16 +50,10 @@ private void OnOutletInjectorUpdated(EntityUid uid, GasOutletInjectorComponent i
             if (!injector.Enabled)
                 return;
 
-            if (!EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
+            if (!_nodeContainer.TryGetNode(uid, injector.InletName, out PipeNode? inlet))
                 return;
 
-            if (!TryComp(uid, out AtmosDeviceComponent? device))
-                return;
-
-            if (!_nodeContainer.TryGetNode(nodeContainer, injector.InletName, out PipeNode? inlet))
-                return;
-
-            var environment = _atmosphereSystem.GetContainingMixture(uid, true, true);
+            var environment = _atmosphereSystem.GetContainingMixture(uid, args.Grid, args.Map, true, true);
 
             if (environment == null)
                 return;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs
index c8fd23d466a..72812cb5237 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs
@@ -24,15 +24,12 @@ public override void Initialize()
 
         private void OnPassiveVentUpdated(EntityUid uid, GasPassiveVentComponent vent, ref AtmosDeviceUpdateEvent args)
         {
-            var environment = _atmosphereSystem.GetContainingMixture(uid, true, true);
+            var environment = _atmosphereSystem.GetContainingMixture(uid, args.Grid, args.Map, true, true);
 
             if (environment == null)
                 return;
 
-            if (!EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
-                return;
-
-            if (!_nodeContainer.TryGetNode(nodeContainer, vent.InletName, out PipeNode? inlet))
+            if (!_nodeContainer.TryGetNode(uid, vent.InletName, out PipeNode? inlet))
                 return;
 
             var inletAir = inlet.Air.RemoveRatio(1f);
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs
index b1caa6c197e..7cb8102a388 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs
@@ -7,15 +7,14 @@
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Construction.Components;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 {
     [UsedImplicitly]
     public sealed class GasPortableSystem : EntitySystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
 
@@ -40,10 +39,7 @@ private void OnPortableAnchorAttempt(EntityUid uid, GasPortableComponent compone
 
         private void OnAnchorChanged(EntityUid uid, GasPortableComponent portable, ref AnchorStateChangedEvent args)
         {
-            if (!EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
-                return;
-
-            if (!_nodeContainer.TryGetNode(nodeContainer, portable.PortName, out PipeNode? portableNode))
+            if (!_nodeContainer.TryGetNode(uid, portable.PortName, out PipeNode? portableNode))
                 return;
 
             portableNode.ConnectionsEnabled = args.Anchored;
@@ -58,7 +54,7 @@ public bool FindGasPortIn(EntityUid? gridId, EntityCoordinates coordinates, [Not
         {
             port = null;
 
-            if (!_mapManager.TryGetGrid(gridId, out var grid))
+            if (!TryComp<MapGridComponent>(gridId, out var grid))
                 return false;
 
             foreach (var entityUid in grid.GetLocal(coordinates))
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
index d4ddd65a8ec..9b61044f03e 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
@@ -110,7 +110,7 @@ private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent the
                 _atmosphereSystem.AddHeat(heatExchangeGasMixture, dQPipe);
                 thermoMachine.LastEnergyDelta = dQPipe;
 
-                if (dQLeak != 0f && _atmosphereSystem.GetContainingMixture(uid, excite: true) is { } containingMixture)
+                if (dQLeak != 0f && _atmosphereSystem.GetContainingMixture(uid, args.Grid, args.Map, excite: true) is { } containingMixture)
                     _atmosphereSystem.AddHeat(containingMixture, dQLeak);
             }
 
@@ -130,8 +130,7 @@ private void GetHeatExchangeGasMixture(EntityUid uid, GasThermoMachineComponent
             }
             else
             {
-                if (!TryComp<NodeContainerComponent>(uid, out var nodeContainer)
-                    || !_nodeContainer.TryGetNode(nodeContainer, thermoMachine.InletName, out PipeNode? inlet))
+                if (!_nodeContainer.TryGetNode(uid, thermoMachine.InletName, out PipeNode? inlet))
                     return;
                 heatExchangeGasMixture = inlet.Air;
             }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index 3a3ccf75234..a986385f5e9 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -67,15 +67,12 @@ private void OnGasVentPumpUpdated(EntityUid uid, GasVentPumpComponent vent, ref
                 _ => throw new ArgumentOutOfRangeException()
             };
 
-            if (!vent.Enabled
-                || !TryComp(uid, out AtmosDeviceComponent? device)
-                || !TryComp(uid, out NodeContainerComponent? nodeContainer)
-                || !_nodeContainer.TryGetNode(nodeContainer, nodeName, out PipeNode? pipe))
+            if (!vent.Enabled || !_nodeContainer.TryGetNode(uid, nodeName, out PipeNode? pipe))
             {
                 return;
             }
 
-            var environment = _atmosphereSystem.GetContainingMixture(uid, true, true);
+            var environment = _atmosphereSystem.GetContainingMixture(uid, args.Grid, args.Map, true, true);
 
             // We're in an air-blocked tile... Do nothing.
             if (environment == null)
@@ -295,9 +292,6 @@ private void OnExamine(EntityUid uid, GasVentPumpComponent component, ExaminedEv
         /// </summary>
         private void OnAnalyzed(EntityUid uid, GasVentPumpComponent component, GasAnalyzerScanEvent args)
         {
-            if (!EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer))
-                return;
-
             var gasMixDict = new Dictionary<string, GasMixture?>();
 
             // these are both called pipe, above it switches using this so I duplicated that...?
@@ -307,7 +301,7 @@ private void OnAnalyzed(EntityUid uid, GasVentPumpComponent component, GasAnalyz
                 VentPumpDirection.Siphoning => component.Outlet,
                 _ => throw new ArgumentOutOfRangeException()
             };
-            if (_nodeContainer.TryGetNode(nodeContainer, nodeName, out PipeNode? pipe))
+            if (_nodeContainer.TryGetNode(uid, nodeName, out PipeNode? pipe))
                 gasMixDict.Add(nodeName, pipe.Air);
 
             args.GasMixtures = gasMixDict;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
index 32591e9c540..b27689ed586 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
@@ -49,27 +49,18 @@ public override void Initialize()
         private void OnVentScrubberUpdated(EntityUid uid, GasVentScrubberComponent scrubber, ref AtmosDeviceUpdateEvent args)
         {
             if (_weldable.IsWelded(uid))
-            {
-                return;
-            }
-
-            if (!TryComp(uid, out AtmosDeviceComponent? device))
                 return;
 
             var timeDelta = args.dt;
 
-            if (!scrubber.Enabled
-            || !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)
-            || !_nodeContainer.TryGetNode(nodeContainer, scrubber.OutletName, out PipeNode? outlet))
+            if (!scrubber.Enabled || !_nodeContainer.TryGetNode(uid, scrubber.OutletName, out PipeNode? outlet))
                 return;
 
-            var xform = Transform(uid);
-
-            if (xform.GridUid == null)
+            if (args.Grid is not {} grid)
                 return;
 
-            var position = _transformSystem.GetGridTilePositionOrDefault((uid,xform));
-            var environment = _atmosphereSystem.GetTileMixture(xform.GridUid, xform.MapUid, position, true);
+            var position = _transformSystem.GetGridTilePositionOrDefault(uid);
+            var environment = _atmosphereSystem.GetTileMixture(grid, args.Map, position, true);
 
             Scrub(timeDelta, scrubber, environment, outlet);
 
@@ -77,7 +68,8 @@ private void OnVentScrubberUpdated(EntityUid uid, GasVentScrubberComponent scrub
                 return;
 
             // Scrub adjacent tiles too.
-            foreach (var adjacent in _atmosphereSystem.GetAdjacentTileMixtures(xform.GridUid.Value, position, false, true))
+            var enumerator = _atmosphereSystem.GetAdjacentTileMixtures(grid, position, false, true);
+            while (enumerator.MoveNext(out var adjacent))
             {
                 Scrub(timeDelta, scrubber, adjacent, outlet);
             }
diff --git a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs
index f1be5ac5150..f9043c091a8 100644
--- a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs
+++ b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs
@@ -47,17 +47,13 @@ private bool IsFull(PortableScrubberComponent component)
 
         private void OnDeviceUpdated(EntityUid uid, PortableScrubberComponent component, ref AtmosDeviceUpdateEvent args)
         {
-            if (!TryComp(uid, out AtmosDeviceComponent? device))
-                return;
-
             var timeDelta = args.dt;
 
             if (!component.Enabled)
                 return;
 
             // If we are on top of a connector port, empty into it.
-            if (TryComp<NodeContainerComponent>(uid, out var nodeContainer)
-                && _nodeContainer.TryGetNode(nodeContainer, component.PortName, out PortablePipeNode? portableNode)
+            if (_nodeContainer.TryGetNode(uid, component.PortName, out PortablePipeNode? portableNode)
                 && portableNode.ConnectionsEnabled)
             {
                 _atmosphereSystem.React(component.Air, portableNode);
@@ -71,13 +67,11 @@ private void OnDeviceUpdated(EntityUid uid, PortableScrubberComponent component,
                 return;
             }
 
-            var xform = Transform(uid);
-
-            if (xform.GridUid == null)
+            if (args.Grid is not {} grid)
                 return;
 
-            var position = _transformSystem.GetGridTilePositionOrDefault((uid,xform));
-            var environment = _atmosphereSystem.GetTileMixture(xform.GridUid, xform.MapUid, position, true);
+            var position = _transformSystem.GetGridTilePositionOrDefault(uid);
+            var environment = _atmosphereSystem.GetTileMixture(grid, args.Map, position, true);
 
             var running = Scrub(timeDelta, component, environment);
 
@@ -85,8 +79,10 @@ private void OnDeviceUpdated(EntityUid uid, PortableScrubberComponent component,
             // We scrub once to see if we can and set the animation
             if (!running)
                 return;
+
             // widenet
-            foreach (var adjacent in _atmosphereSystem.GetAdjacentTileMixtures(xform.GridUid.Value, position, false, true))
+            var enumerator = _atmosphereSystem.GetAdjacentTileMixtures(grid, position, false, true);
+            while (enumerator.MoveNext(out var adjacent))
             {
                 Scrub(timeDelta, component, adjacent);
             }
@@ -97,10 +93,7 @@ private void OnDeviceUpdated(EntityUid uid, PortableScrubberComponent component,
         /// </summary>
         private void OnAnchorChanged(EntityUid uid, PortableScrubberComponent component, ref AnchorStateChangedEvent args)
         {
-            if (!TryComp(uid, out NodeContainerComponent? nodeContainer))
-                return;
-
-            if (!_nodeContainer.TryGetNode(nodeContainer, component.PortName, out PipeNode? portableNode))
+            if (!_nodeContainer.TryGetNode(uid, component.PortName, out PipeNode? portableNode))
                 return;
 
             portableNode.ConnectionsEnabled = (args.Anchored && _gasPortableSystem.FindGasPortIn(Transform(uid).GridUid, Transform(uid).Coordinates, out _));
@@ -158,14 +151,10 @@ private void UpdateAppearance(EntityUid uid, bool isFull, bool isRunning)
         /// </summary>
         private void OnScrubberAnalyzed(EntityUid uid, PortableScrubberComponent component, GasAnalyzerScanEvent args)
         {
-            var gasMixDict = new Dictionary<string, GasMixture?> { { Name(uid), component.Air } };
+            args.GasMixtures ??= new Dictionary<string, GasMixture?> { { Name(uid), component.Air } };
             // If it's connected to a port, include the port side
-            if (TryComp(uid, out NodeContainerComponent? nodeContainer))
-            {
-                if (_nodeContainer.TryGetNode(nodeContainer, component.PortName, out PipeNode? port))
-                    gasMixDict.Add(component.PortName, port.Air);
-            }
-            args.GasMixtures = gasMixDict;
+            if (_nodeContainer.TryGetNode(uid, component.PortName, out PipeNode? port))
+                args.GasMixtures.Add(component.PortName, port.Air);
         }
     }
 }
diff --git a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
index 16311328218..fff15f696c4 100644
--- a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
+++ b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
@@ -71,7 +71,7 @@ private void OnDeviceUpdated(EntityUid uid, SpaceHeaterComponent spaceHeater, re
         // If in automatic temperature mode, check if we need to adjust the heat exchange direction
         if (spaceHeater.Mode == SpaceHeaterMode.Auto)
         {
-            var environment = _atmosphereSystem.GetContainingMixture(uid);
+            var environment = _atmosphereSystem.GetContainingMixture(uid, args.Grid, args.Map);
             if (environment == null)
                 return;
 
diff --git a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
index 9adda3089cc..e7ab7835fd9 100644
--- a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
+++ b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
@@ -75,7 +75,7 @@ public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, Atmos
                 var mixTemperature = mixture.Temperature;
                 if (mixTemperature > Atmospherics.FireMinimumTemperatureToExist)
                 {
-                    atmosphereSystem.HotspotExpose(location.GridIndex, location.GridIndices, mixTemperature, mixture.Volume);
+                    atmosphereSystem.HotspotExpose(location, mixTemperature, mixture.Volume);
                 }
             }
 
diff --git a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
index 37c9741e86f..7103859a90f 100644
--- a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
+++ b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
@@ -60,7 +60,7 @@ public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, Atmos
                 temperature = mixture.Temperature;
                 if (temperature > Atmospherics.FireMinimumTemperatureToExist)
                 {
-                    atmosphereSystem.HotspotExpose(location.GridIndex, location.GridIndices, temperature, mixture.Volume);
+                    atmosphereSystem.HotspotExpose(location, temperature, mixture.Volume);
                 }
             }
 
diff --git a/Content.Server/Atmos/TileMixtureEnumerator.cs b/Content.Server/Atmos/TileMixtureEnumerator.cs
new file mode 100644
index 00000000000..20440032dab
--- /dev/null
+++ b/Content.Server/Atmos/TileMixtureEnumerator.cs
@@ -0,0 +1,29 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace Content.Server.Atmos;
+
+public struct TileMixtureEnumerator
+{
+    public readonly TileAtmosphere?[] Tiles;
+    public int Index = 0;
+
+    public static readonly TileMixtureEnumerator Empty = new(Array.Empty<TileAtmosphere>());
+
+    internal TileMixtureEnumerator(TileAtmosphere?[] tiles)
+    {
+        Tiles = tiles;
+    }
+
+    public bool MoveNext([NotNullWhen(true)] out GasMixture? mix)
+    {
+        while (Index < Tiles.Length)
+        {
+            mix = Tiles[Index++]?.Air;
+            if (mix != null)
+                return true;
+        }
+
+        mix = null;
+        return false;
+    }
+}
diff --git a/Content.Server/Audio/AmbientSoundSystem.cs b/Content.Server/Audio/AmbientSoundSystem.cs
index 53a03be2aa2..e78970d1243 100644
--- a/Content.Server/Audio/AmbientSoundSystem.cs
+++ b/Content.Server/Audio/AmbientSoundSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Audio;
+using Content.Shared.Mobs;
 
 namespace Content.Server.Audio;
 
diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs
index 131bd4b1829..49021c142f4 100644
--- a/Content.Server/Bed/BedSystem.cs
+++ b/Content.Server/Bed/BedSystem.cs
@@ -93,9 +93,8 @@ private void OnBuckleChange(EntityUid uid, StasisBedComponent component, ref Buc
             if (!this.IsPowered(uid, EntityManager))
                 return;
 
-            var metabolicEvent = new ApplyMetabolicMultiplierEvent
-                {Uid = args.BuckledEntity, Multiplier = component.Multiplier, Apply = args.Buckling};
-            RaiseLocalEvent(args.BuckledEntity, metabolicEvent);
+            var metabolicEvent = new ApplyMetabolicMultiplierEvent(args.BuckledEntity, component.Multiplier, args.Buckling);
+            RaiseLocalEvent(args.BuckledEntity, ref metabolicEvent);
         }
 
         private void OnPowerChanged(EntityUid uid, StasisBedComponent component, ref PowerChangedEvent args)
@@ -121,9 +120,8 @@ private void UpdateMetabolisms(EntityUid uid, StasisBedComponent component, bool
 
             foreach (var buckledEntity in strap.BuckledEntities)
             {
-                var metabolicEvent = new ApplyMetabolicMultiplierEvent
-                    {Uid = buckledEntity, Multiplier = component.Multiplier, Apply = shouldApply};
-                RaiseLocalEvent(buckledEntity, metabolicEvent);
+                var metabolicEvent = new ApplyMetabolicMultiplierEvent(buckledEntity, component.Multiplier, shouldApply);
+                RaiseLocalEvent(buckledEntity, ref metabolicEvent);
             }
         }
     }
diff --git a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
index a3b7fb8d67b..2e7f8c4235a 100644
--- a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
+++ b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
@@ -1,11 +1,16 @@
+using System.Globalization;
 using System.Linq;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
 using Content.Server.Hands.Systems;
 using Content.Server.Inventory;
 using Content.Server.Popups;
+using Content.Server.Chat.Systems;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
+using Content.Server.StationRecords;
+using Content.Server.StationRecords.Systems;
+using Content.Shared.StationRecords;
 using Content.Shared.UserInterface;
 using Content.Shared.Access.Systems;
 using Content.Shared.Bed.Cryostorage;
@@ -32,6 +37,7 @@ public sealed class CryostorageSystem : SharedCryostorageSystem
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+    [Dependency] private readonly ChatSystem _chatSystem = default!;
     [Dependency] private readonly ClimbSystem _climb = default!;
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly GameTicker _gameTicker = default!;
@@ -40,6 +46,7 @@ public sealed class CryostorageSystem : SharedCryostorageSystem
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly StationJobsSystem _stationJobs = default!;
+    [Dependency] private readonly StationRecordsSystem _stationRecords = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
 
@@ -163,26 +170,30 @@ public void HandleEnterCryostorage(Entity<CryostorageContainedComponent> ent, Ne
     {
         var comp = ent.Comp;
         var cryostorageEnt = ent.Comp.Cryostorage;
+
+        var station = _station.GetOwningStation(ent);
+        var name = Name(ent.Owner);
+
         if (!TryComp<CryostorageComponent>(cryostorageEnt, out var cryostorageComponent))
             return;
 
         // if we have a session, we use that to add back in all the job slots the player had.
         if (userId != null)
         {
-            foreach (var station in _station.GetStationsSet())
+            foreach (var uniqueStation in _station.GetStationsSet())
             {
-                if (!TryComp<StationJobsComponent>(station, out var stationJobs))
+                if (!TryComp<StationJobsComponent>(uniqueStation, out var stationJobs))
                     continue;
 
-                if (!_stationJobs.TryGetPlayerJobs(station, userId.Value, out var jobs, stationJobs))
+                if (!_stationJobs.TryGetPlayerJobs(uniqueStation, userId.Value, out var jobs, stationJobs))
                     continue;
 
                 foreach (var job in jobs)
                 {
-                    _stationJobs.TryAdjustJobSlot(station, job, 1, clamp: true);
+                    _stationJobs.TryAdjustJobSlot(uniqueStation, job, 1, clamp: true);
                 }
 
-                _stationJobs.TryRemovePlayerJobs(station, userId.Value, stationJobs);
+                _stationJobs.TryRemovePlayerJobs(uniqueStation, userId.Value, stationJobs);
             }
         }
 
@@ -203,12 +214,36 @@ public void HandleEnterCryostorage(Entity<CryostorageContainedComponent> ent, Ne
                 _gameTicker.OnGhostAttempt(mind.Value, false);
             }
         }
+
         comp.AllowReEnteringBody = false;
         _transform.SetParent(ent, PausedMap.Value);
         cryostorageComponent.StoredPlayers.Add(ent);
         Dirty(ent, comp);
         UpdateCryostorageUIState((cryostorageEnt.Value, cryostorageComponent));
         AdminLog.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(ent):player} was entered into cryostorage inside of {ToPrettyString(cryostorageEnt.Value)}");
+
+        if (!TryComp<StationRecordsComponent>(station, out var stationRecords))
+            return;
+
+        var jobName = Loc.GetString("earlyleave-cryo-job-unknown");
+        var recordId = _stationRecords.GetRecordByName(station.Value, name);
+        if (recordId != null)
+        {
+            var key = new StationRecordKey(recordId.Value, station.Value);
+            if (_stationRecords.TryGetRecord<GeneralStationRecord>(key, out var entry, stationRecords))
+                jobName = entry.JobTitle;
+
+            _stationRecords.RemoveRecord(key, stationRecords);
+        }
+
+        _chatSystem.DispatchStationAnnouncement(station.Value,
+            Loc.GetString(
+                "earlyleave-cryo-announcement",
+                ("character", name),
+                ("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(jobName))
+            ), Loc.GetString("earlyleave-cryo-sender"),
+            playDefaultSound: false
+        );
     }
 
     private void HandleCryostorageReconnection(Entity<CryostorageContainedComponent> entity)
diff --git a/Content.Server/Bed/Sleep/SleepingSystem.cs b/Content.Server/Bed/Sleep/SleepingSystem.cs
index b4972544338..5e4f0eddb52 100644
--- a/Content.Server/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Server/Bed/Sleep/SleepingSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Popups;
-using Content.Server.Sound.Components;
+using Content.Server.Sound;
+using Content.Shared.Sound.Components;
 using Content.Shared.Actions;
 using Content.Shared.Audio;
 using Content.Shared.Bed.Sleep;
@@ -30,6 +31,7 @@ public sealed class SleepingSystem : SharedSleepingSystem
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
+        [Dependency] private readonly EmitSoundSystem _emitSound = default!;
 
         [ValidatePrototypeId<EntityPrototype>] public const string SleepActionId = "ActionSleep";
 
@@ -71,8 +73,8 @@ private void OnSleepStateChanged(EntityUid uid, MobStateComponent component, Sle
                     {
                         emitSound.Sound = sleepSound.Snore;
                     }
-                    emitSound.PlayChance = sleepSound.Chance;
-                    emitSound.RollInterval = sleepSound.Interval;
+                    emitSound.MinInterval = sleepSound.Interval;
+                    emitSound.MaxInterval = sleepSound.MaxInterval;
                     emitSound.PopUp = sleepSound.PopUp;
                 }
 
@@ -128,7 +130,7 @@ private void OnMobStateChanged(EntityUid uid, SleepingComponent component, MobSt
                 return;
             }
             if (TryComp<SpamEmitSoundComponent>(uid, out var spam))
-                spam.Enabled = args.NewMobState == MobState.Alive;
+                _emitSound.SetEnabled((uid, spam), args.NewMobState == MobState.Alive);
         }
 
         private void AddWakeVerb(EntityUid uid, SleepingComponent component, GetVerbsEvent<AlternativeVerb> args)
diff --git a/Content.Server/Body/Commands/AddHandCommand.cs b/Content.Server/Body/Commands/AddHandCommand.cs
index 655d0c88f9b..3e006c539c7 100644
--- a/Content.Server/Body/Commands/AddHandCommand.cs
+++ b/Content.Server/Body/Commands/AddHandCommand.cs
@@ -34,7 +34,6 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             switch (args.Length)
             {
                 case 0:
-                {
                     if (player == null)
                     {
                         shell.WriteLine("Only a player can run this command without arguments.");
@@ -50,71 +49,68 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                     entity = player.AttachedEntity.Value;
                     hand = _entManager.SpawnEntity(DefaultHandPrototype, _entManager.GetComponent<TransformComponent>(entity).Coordinates);
                     break;
-                }
                 case 1:
-                {
-                    if (NetEntity.TryParse(args[0], out var uidNet) && _entManager.TryGetEntity(uidNet, out var uid))
                     {
-                        if (!_entManager.EntityExists(uid))
+                        if (NetEntity.TryParse(args[0], out var uidNet) && _entManager.TryGetEntity(uidNet, out var uid))
                         {
-                            shell.WriteLine($"No entity found with uid {uid}");
-                            return;
+                            if (!_entManager.EntityExists(uid))
+                            {
+                                shell.WriteLine($"No entity found with uid {uid}");
+                                return;
+                            }
+
+                            entity = uid.Value;
+                            hand = _entManager.SpawnEntity(DefaultHandPrototype, _entManager.GetComponent<TransformComponent>(entity).Coordinates);
+                        }
+                        else
+                        {
+                            if (player == null)
+                            {
+                                shell.WriteLine("You must specify an entity to add a hand to when using this command from the server terminal.");
+                                return;
+                            }
+
+                            if (player.AttachedEntity == null)
+                            {
+                                shell.WriteLine("You don't have an entity to add a hand to.");
+                                return;
+                            }
+
+                            entity = player.AttachedEntity.Value;
+                            hand = _entManager.SpawnEntity(args[0], _entManager.GetComponent<TransformComponent>(entity).Coordinates);
                         }
 
-                        entity = uid.Value;
-                        hand = _entManager.SpawnEntity(DefaultHandPrototype, _entManager.GetComponent<TransformComponent>(entity).Coordinates);
+                        break;
                     }
-                    else
+                case 2:
                     {
-                        if (player == null)
+                        if (!NetEntity.TryParse(args[0], out var netEnt) || !_entManager.TryGetEntity(netEnt, out var uid))
                         {
-                            shell.WriteLine("You must specify an entity to add a hand to when using this command from the server terminal.");
+                            shell.WriteLine($"{args[0]} is not a valid entity uid.");
                             return;
                         }
 
-                        if (player.AttachedEntity == null)
+                        if (!_entManager.EntityExists(uid))
                         {
-                            shell.WriteLine("You don't have an entity to add a hand to.");
+                            shell.WriteLine($"No entity exists with uid {uid}.");
                             return;
                         }
 
-                        entity = player.AttachedEntity.Value;
-                        hand = _entManager.SpawnEntity(args[0], _entManager.GetComponent<TransformComponent>(entity).Coordinates);
-                    }
-
-                    break;
-                }
-                case 2:
-                {
-                    if (!NetEntity.TryParse(args[0], out var netEnt) || !_entManager.TryGetEntity(netEnt, out var uid))
-                    {
-                        shell.WriteLine($"{args[0]} is not a valid entity uid.");
-                        return;
-                    }
+                        entity = uid.Value;
 
-                    if (!_entManager.EntityExists(uid))
-                    {
-                        shell.WriteLine($"No entity exists with uid {uid}.");
-                        return;
-                    }
+                        if (!_protoManager.HasIndex<EntityPrototype>(args[1]))
+                        {
+                            shell.WriteLine($"No hand entity exists with id {args[1]}.");
+                            return;
+                        }
 
-                    entity = uid.Value;
+                        hand = _entManager.SpawnEntity(args[1], _entManager.GetComponent<TransformComponent>(entity).Coordinates);
 
-                    if (!_protoManager.HasIndex<EntityPrototype>(args[1]))
-                    {
-                        shell.WriteLine($"No hand entity exists with id {args[1]}.");
-                        return;
+                        break;
                     }
-
-                    hand = _entManager.SpawnEntity(args[1], _entManager.GetComponent<TransformComponent>(entity).Coordinates);
-
-                    break;
-                }
                 default:
-                {
                     shell.WriteLine(Help);
                     return;
-                }
             }
 
             if (!_entManager.TryGetComponent(entity, out BodyComponent? body) || body.RootContainer.ContainedEntity == null)
@@ -139,7 +135,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
 
             var slotId = part.GetHashCode().ToString();
 
-            if (!bodySystem.TryCreatePartSlotAndAttach(attachAt.Id, slotId, hand, BodyPartType.Hand,attachAt.Component, part))
+            if (!bodySystem.TryCreatePartSlotAndAttach(attachAt.Id, slotId, hand, BodyPartType.Hand, attachAt.Component, part))
             {
                 shell.WriteError($"Couldn't create a slot with id {slotId} on entity {_entManager.ToPrettyString(entity)}");
                 return;
diff --git a/Content.Server/Body/Commands/AttachBodyPartCommand.cs b/Content.Server/Body/Commands/AttachBodyPartCommand.cs
index 24604b88b7a..82f71619370 100644
--- a/Content.Server/Body/Commands/AttachBodyPartCommand.cs
+++ b/Content.Server/Body/Commands/AttachBodyPartCommand.cs
@@ -103,11 +103,11 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
             if (body.RootContainer.ContainedEntity != null)
             {
-                bodySystem.AttachPartToRoot(bodyId,partUid.Value, body ,part);
+                bodySystem.AttachPartToRoot(bodyId, partUid.Value, body, part);
             }
             else
             {
-                var (rootPartId,rootPart) = bodySystem.GetRootPartOrNull(bodyId, body)!.Value;
+                var (rootPartId, rootPart) = bodySystem.GetRootPartOrNull(bodyId, body)!.Value;
                 if (!bodySystem.TryCreatePartSlotAndAttach(rootPartId, slotId, partUid.Value, part.PartType, rootPart, part))
                 {
                     shell.WriteError($"Could not create slot {slotId} on entity {_entManager.ToPrettyString(bodyId)}");
diff --git a/Content.Server/Body/Components/BeingGibbedEvent.cs b/Content.Server/Body/Components/BeingGibbedEvent.cs
index 66b52af47bd..a010855f784 100644
--- a/Content.Server/Body/Components/BeingGibbedEvent.cs
+++ b/Content.Server/Body/Components/BeingGibbedEvent.cs
@@ -1,11 +1,7 @@
 namespace Content.Server.Body.Components;
 
-public sealed class BeingGibbedEvent : EntityEventArgs
-{
-    public readonly HashSet<EntityUid> GibbedParts;
-
-    public BeingGibbedEvent(HashSet<EntityUid> gibbedParts)
-    {
-        GibbedParts = gibbedParts;
-    }
-}
+/// <summary>
+/// Raised when a body gets gibbed, before it is deleted.
+/// </summary>
+[ByRefEvent]
+public readonly record struct BeingGibbedEvent(HashSet<EntityUid> GibbedParts);
diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs
index 7041df44481..1d8aa9ffd3d 100644
--- a/Content.Server/Body/Components/BloodstreamComponent.cs
+++ b/Content.Server/Body/Components/BloodstreamComponent.cs
@@ -1,22 +1,34 @@
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(BloodstreamSystem), (typeof(ChemistrySystem)))]
+    [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem))]
     public sealed partial class BloodstreamComponent : Component
     {
         public static string DefaultChemicalsSolutionName = "chemicals";
         public static string DefaultBloodSolutionName = "bloodstream";
         public static string DefaultBloodTemporarySolutionName = "bloodstreamTemporary";
 
-        public float AccumulatedFrametime = 0.0f;
+        /// <summary>
+        /// The next time that blood level will be updated and bloodloss damage dealt.
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+        public TimeSpan NextUpdate;
+
+        /// <summary>
+        /// The interval at which this component updates.
+        /// </summary>
+        [DataField]
+        public TimeSpan UpdateInterval = TimeSpan.FromSeconds(3);
 
         /// <summary>
         ///     How much is this entity currently bleeding?
@@ -32,7 +44,7 @@ public sealed partial class BloodstreamComponent : Component
         public float BleedAmount;
 
         /// <summary>
-        ///     How much should bleeding should be reduced every update interval?
+        ///     How much should bleeding be reduced every update interval?
         /// </summary>
         [DataField]
         public float BleedReductionAmount = 0.33f;
@@ -63,18 +75,12 @@ public sealed partial class BloodstreamComponent : Component
         [DataField(required: true)]
         public DamageSpecifier BloodlossHealDamage = new();
 
-        /// <summary>
-        ///     How frequently should this bloodstream update, in seconds?
-        /// </summary>
-        [DataField]
-        public float UpdateInterval = 3.0f;
-
         // TODO shouldn't be hardcoded, should just use some organ simulation like bone marrow or smth.
         /// <summary>
         ///     How much reagent of blood should be restored each update interval?
         /// </summary>
         [DataField]
-        public float BloodRefreshAmount = 1.0f;
+        public FixedPoint2 BloodRefreshAmount = 1.0f;
 
         /// <summary>
         ///     How much blood needs to be in the temporary solution in order to create a puddle?
@@ -89,8 +95,8 @@ public sealed partial class BloodstreamComponent : Component
         /// <remarks>
         ///     For example, piercing damage is increased while poison damage is nullified entirely.
         /// </remarks>
-        [DataField(customTypeSerializer:typeof(PrototypeIdSerializer<DamageModifierSetPrototype>))]
-        public string DamageBleedModifiers = "BloodlossHuman";
+        [DataField]
+        public ProtoId<DamageModifierSetPrototype> DamageBleedModifiers = "BloodlossHuman";
 
         /// <summary>
         ///     The sound to be played when a weapon instantly deals blood loss damage.
@@ -126,7 +132,7 @@ public sealed partial class BloodstreamComponent : Component
         ///     Slime-people might use slime as their blood or something like that.
         /// </remarks>
         [DataField]
-        public string BloodReagent = "Blood";
+        public ProtoId<ReagentPrototype> BloodReagent = "Blood";
 
         /// <summary>Name/Key that <see cref="BloodSolution"/> is indexed by.</summary>
         [DataField]
@@ -164,6 +170,6 @@ public sealed partial class BloodstreamComponent : Component
         /// Variable that stores the amount of status time added by having a low blood level.
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
-        public float StatusTime;
+        public TimeSpan StatusTime;
     }
 }
diff --git a/Content.Server/Body/Components/InternalsComponent.cs b/Content.Server/Body/Components/InternalsComponent.cs
index 4eda008b0f9..18caab8dcf0 100644
--- a/Content.Server/Body/Components/InternalsComponent.cs
+++ b/Content.Server/Body/Components/InternalsComponent.cs
@@ -1,4 +1,3 @@
-using System.Threading;
 namespace Content.Server.Body.Components
 {
     /// <summary>
@@ -7,14 +6,17 @@ namespace Content.Server.Body.Components
     [RegisterComponent]
     public sealed partial class InternalsComponent : Component
     {
-        [ViewVariables] public EntityUid? GasTankEntity { get; set; }
-        [ViewVariables] public EntityUid? BreathToolEntity { get; set; }
+        [ViewVariables]
+        public EntityUid? GasTankEntity;
+
+        [ViewVariables]
+        public EntityUid? BreathToolEntity;
 
         /// <summary>
-        /// Toggle Internals delay (seconds) when the target is not you.
+        /// Toggle Internals delay when the target is not you.
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("delay")]
-        public float Delay = 3;
+        [DataField]
+        public TimeSpan Delay = TimeSpan.FromSeconds(3);
     }
 }
diff --git a/Content.Server/Body/Components/LungComponent.cs b/Content.Server/Body/Components/LungComponent.cs
index 0656ef8fad3..46600b30207 100644
--- a/Content.Server/Body/Components/LungComponent.cs
+++ b/Content.Server/Body/Components/LungComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos;
+using Content.Server.Atmos;
 using Content.Server.Body.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -11,7 +11,7 @@ public sealed partial class LungComponent : Component
 {
     [DataField]
     [Access(typeof(LungSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
-    public GasMixture Air { get; set; } = new()
+    public GasMixture Air = new()
     {
         Volume = 6,
         Temperature = Atmospherics.NormalBodyTemperature
diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs
index a8c82f3d369..90c99df7db2 100644
--- a/Content.Server/Body/Components/MetabolizerComponent.cs
+++ b/Content.Server/Body/Components/MetabolizerComponent.cs
@@ -1,8 +1,8 @@
-using Content.Server.Body.Systems;
+using Content.Server.Body.Systems;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.FixedPoint;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Body.Components
 {
@@ -12,20 +12,24 @@ namespace Content.Server.Body.Components
     [RegisterComponent, Access(typeof(MetabolizerSystem))]
     public sealed partial class MetabolizerComponent : Component
     {
-        public float AccumulatedFrametime = 0.0f;
+        /// <summary>
+        ///     The next time that reagents will be metabolized.
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+        public TimeSpan NextUpdate;
 
         /// <summary>
-        ///     How often to metabolize reagents, in seconds.
+        ///     How often to metabolize reagents.
         /// </summary>
         /// <returns></returns>
         [DataField]
-        public float UpdateFrequency = 1.0f;
+        public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
 
         /// <summary>
         ///     From which solution will this metabolizer attempt to metabolize chemicals
         /// </summary>
         [DataField("solution")]
-        public string SolutionName { get; set; } = BloodstreamComponent.DefaultChemicalsSolutionName;
+        public string SolutionName = BloodstreamComponent.DefaultChemicalsSolutionName;
 
         /// <summary>
         ///     Does this component use a solution on it's parent entity (the body) or itself
@@ -39,9 +43,9 @@ public sealed partial class MetabolizerComponent : Component
         /// <summary>
         ///     List of metabolizer types that this organ is. ex. Human, Slime, Felinid, w/e.
         /// </summary>
-        [DataField(customTypeSerializer:typeof(PrototypeIdHashSetSerializer<MetabolizerTypePrototype>))]
+        [DataField]
         [Access(typeof(MetabolizerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
-        public HashSet<string>? MetabolizerTypes = null;
+        public HashSet<ProtoId<MetabolizerTypePrototype>>? MetabolizerTypes = null;
 
         /// <summary>
         ///     Should this metabolizer remove chemicals that have no metabolisms defined?
@@ -72,8 +76,8 @@ public sealed partial class MetabolizerComponent : Component
     [DataDefinition]
     public sealed partial class MetabolismGroupEntry
     {
-        [DataField(required: true, customTypeSerializer:typeof(PrototypeIdSerializer<MetabolismGroupPrototype>))]
-        public string Id = default!;
+        [DataField(required: true)]
+        public ProtoId<MetabolismGroupPrototype> Id = default!;
 
         [DataField("rateModifier")]
         public FixedPoint2 MetabolismRateModifier = 1.0;
diff --git a/Content.Server/Body/Components/RespiratorComponent.cs b/Content.Server/Body/Components/RespiratorComponent.cs
index 9f080a3dd9d..4045e21e26a 100644
--- a/Content.Server/Body/Components/RespiratorComponent.cs
+++ b/Content.Server/Body/Components/RespiratorComponent.cs
@@ -1,5 +1,6 @@
 using Content.Server.Body.Systems;
 using Content.Shared.Damage;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Body.Components
 {
@@ -7,36 +8,49 @@ namespace Content.Server.Body.Components
     public sealed partial class RespiratorComponent : Component
     {
         /// <summary>
-        ///     Saturation level. Reduced by CycleDelay each tick.
+        ///     The next time that this body will inhale or exhale.
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+        public TimeSpan NextUpdate;
+
+        /// <summary>
+        ///     The interval between updates. Each update is either inhale or exhale,
+        ///     so a full cycle takes twice as long.
+        /// </summary>
+        [DataField]
+        public TimeSpan UpdateInterval = TimeSpan.FromSeconds(2);
+
+        /// <summary>
+        ///     Saturation level. Reduced by UpdateInterval each tick.
         ///     Can be thought of as 'how many seconds you have until you start suffocating' in this configuration.
         /// </summary>
-        [DataField("saturation")]
+        [DataField]
         public float Saturation = 5.0f;
 
         /// <summary>
         ///     At what level of saturation will you begin to suffocate?
         /// </summary>
-        [DataField("suffocationThreshold")]
+        [DataField]
         public float SuffocationThreshold;
 
-        [DataField("maxSaturation")]
+        [DataField]
         public float MaxSaturation = 5.0f;
 
-        [DataField("minSaturation")]
+        [DataField]
         public float MinSaturation = -2.0f;
 
         // TODO HYPEROXIA?
 
-        [DataField("damage", required: true)]
+        [DataField(required: true)]
         [ViewVariables(VVAccess.ReadWrite)]
         public DamageSpecifier Damage = default!;
 
-        [DataField("damageRecovery", required: true)]
+        [DataField(required: true)]
         [ViewVariables(VVAccess.ReadWrite)]
         public DamageSpecifier DamageRecovery = default!;
 
-        [DataField("gaspPopupCooldown")]
-        public TimeSpan GaspPopupCooldown { get; private set; } = TimeSpan.FromSeconds(8);
+        [DataField]
+        public TimeSpan GaspPopupCooldown = TimeSpan.FromSeconds(8);
 
         [ViewVariables]
         public TimeSpan LastGaspPopupTime;
@@ -55,11 +69,6 @@ public sealed partial class RespiratorComponent : Component
 
         [ViewVariables]
         public RespiratorStatus Status = RespiratorStatus.Inhaling;
-
-        [DataField("cycleDelay")]
-        public float CycleDelay = 2.0f;
-
-        public float AccumulatedFrametime;
     }
 }
 
diff --git a/Content.Server/Body/Components/StomachComponent.cs b/Content.Server/Body/Components/StomachComponent.cs
index fe93468f74e..d541ca4d7c4 100644
--- a/Content.Server/Body/Components/StomachComponent.cs
+++ b/Content.Server/Body/Components/StomachComponent.cs
@@ -1,21 +1,26 @@
-using Content.Server.Body.Systems;
+using Content.Server.Body.Systems;
 using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Whitelist;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Body.Components
 {
     [RegisterComponent, Access(typeof(StomachSystem), typeof(FoodSystem))]
     public sealed partial class StomachComponent : Component
     {
-        public float AccumulatedFrameTime;
+        /// <summary>
+        ///     The next time that the stomach will try to digest its contents.
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+        public TimeSpan NextUpdate;
 
         /// <summary>
-        ///     How fast should this component update, in seconds?
+        ///     The interval at which this stomach digests its contents.
         /// </summary>
         [DataField]
-        public float UpdateInterval = 1.0f;
+        public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
 
         /// <summary>
         ///     The solution inside of this stomach this transfers reagents to the body.
@@ -30,11 +35,11 @@ public sealed partial class StomachComponent : Component
         public string BodySolutionName = BloodstreamComponent.DefaultChemicalsSolutionName;
 
         /// <summary>
-        ///     Time in seconds between reagents being ingested and them being
+        ///     Time between reagents being ingested and them being
         ///     transferred to <see cref="BloodstreamComponent"/>
         /// </summary>
         [DataField]
-        public float DigestionDelay = 20;
+        public TimeSpan DigestionDelay = TimeSpan.FromSeconds(20);
 
         /// <summary>
         ///     A whitelist for what special-digestible-required foods this stomach is capable of eating.
@@ -54,15 +59,15 @@ public sealed partial class StomachComponent : Component
         public sealed class ReagentDelta
         {
             public readonly ReagentQuantity ReagentQuantity;
-            public float Lifetime { get; private set; }
+            public TimeSpan Lifetime { get; private set; }
 
             public ReagentDelta(ReagentQuantity reagentQuantity)
             {
                 ReagentQuantity = reagentQuantity;
-                Lifetime = 0.0f;
+                Lifetime = TimeSpan.Zero;
             }
 
-            public void Increment(float delta) => Lifetime += delta;
+            public void Increment(TimeSpan delta) => Lifetime += delta;
         }
     }
 }
diff --git a/Content.Server/Body/Components/ThermalRegulatorComponent.cs b/Content.Server/Body/Components/ThermalRegulatorComponent.cs
index 4acdccf1ba7..19b76189e09 100644
--- a/Content.Server/Body/Components/ThermalRegulatorComponent.cs
+++ b/Content.Server/Body/Components/ThermalRegulatorComponent.cs
@@ -1,4 +1,5 @@
 using Content.Server.Body.Systems;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Body.Components;
 
@@ -6,48 +7,58 @@ namespace Content.Server.Body.Components;
 [Access(typeof(ThermalRegulatorSystem))]
 public sealed partial class ThermalRegulatorComponent : Component
 {
+    /// <summary>
+    /// The next time that the body will regulate its heat.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextUpdate;
+
+    /// <summary>
+    /// The interval at which thermal regulation is processed.
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
+
     /// <summary>
     /// Heat generated due to metabolism. It's generated via metabolism
     /// </summary>
-    [DataField("metabolismHeat")]
-    public float MetabolismHeat { get; private set; }
+    [DataField]
+    public float MetabolismHeat;
 
     /// <summary>
     /// Heat output via radiation.
     /// </summary>
-    [DataField("radiatedHeat")]
-    public float RadiatedHeat { get; private set; }
+    [DataField]
+    public float RadiatedHeat;
 
     /// <summary>
     /// Maximum heat regulated via sweat
     /// </summary>
-    [DataField("sweatHeatRegulation")]
-    public float SweatHeatRegulation { get; private set; }
+    [DataField]
+    public float SweatHeatRegulation;
 
     /// <summary>
     /// Maximum heat regulated via shivering
     /// </summary>
-    [DataField("shiveringHeatRegulation")]
-    public float ShiveringHeatRegulation { get; private set; }
+    [DataField]
+    public float ShiveringHeatRegulation;
 
     /// <summary>
     /// Amount of heat regulation that represents thermal regulation processes not
     /// explicitly coded.
     /// </summary>
-    [DataField("implicitHeatRegulation")]
-    public float ImplicitHeatRegulation { get; private set; }
+    [DataField]
+    public float ImplicitHeatRegulation;
 
     /// <summary>
     /// Normal body temperature
     /// </summary>
-    [DataField("normalBodyTemperature")]
-    public float NormalBodyTemperature { get; private set; }
+    [DataField]
+    public float NormalBodyTemperature;
 
     /// <summary>
     /// Deviation from normal temperature for body to start thermal regulation
     /// </summary>
-    [DataField("thermalRegulationTemperatureThreshold")]
-    public float ThermalRegulationTemperatureThreshold { get; private set; }
-
-    public float AccumulatedFrametime;
+    [DataField]
+    public float ThermalRegulationTemperatureThreshold;
 }
diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index f6fdcfedff4..9e29fdf7568 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -13,7 +13,6 @@
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Drunk;
 using Content.Shared.FixedPoint;
-using Content.Shared.IdentityManagement;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Rejuvenate;
@@ -21,11 +20,13 @@
 using Robust.Server.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems;
 
 public sealed class BloodstreamSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
@@ -44,6 +45,8 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<BloodstreamComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<BloodstreamComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<BloodstreamComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<BloodstreamComponent, DamageChangedEvent>(OnDamageChanged);
         SubscribeLocalEvent<BloodstreamComponent, HealthBeingExaminedEvent>(OnHealthBeingExamined);
         SubscribeLocalEvent<BloodstreamComponent, BeingGibbedEvent>(OnBeingGibbed);
@@ -53,6 +56,16 @@ public override void Initialize()
         SubscribeLocalEvent<BloodstreamComponent, RejuvenateEvent>(OnRejuvenate);
     }
 
+    private void OnMapInit(Entity<BloodstreamComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
+    }
+
+    private void OnUnpaused(Entity<BloodstreamComponent> ent, ref EntityUnpausedEvent args)
+    {
+        ent.Comp.NextUpdate += args.PausedTime;
+    }
+
     private void OnReactionAttempt(Entity<BloodstreamComponent> entity, ref ReactionAttemptEvent args)
     {
         if (args.Cancelled)
@@ -83,7 +96,9 @@ private void OnReactionAttempt(Entity<BloodstreamComponent> entity, ref Solution
         if (args.Name != entity.Comp.BloodSolutionName
             && args.Name != entity.Comp.ChemicalSolutionName
             && args.Name != entity.Comp.BloodTemporarySolutionName)
+        {
             return;
+        }
 
         OnReactionAttempt(entity, ref args.Event);
     }
@@ -95,12 +110,10 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<BloodstreamComponent>();
         while (query.MoveNext(out var uid, out var bloodstream))
         {
-            bloodstream.AccumulatedFrametime += frameTime;
-
-            if (bloodstream.AccumulatedFrametime < bloodstream.UpdateInterval)
+            if (_gameTiming.CurTime < bloodstream.NextUpdate)
                 continue;
 
-            bloodstream.AccumulatedFrametime -= bloodstream.UpdateInterval;
+            bloodstream.NextUpdate += bloodstream.UpdateInterval;
 
             if (!_solutionContainerSystem.ResolveSolution(uid, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
                 continue;
@@ -128,13 +141,17 @@ public override void Update(float frameTime)
                 // bloodloss damage is based on the base value, and modified by how low your blood level is.
                 var amt = bloodstream.BloodlossDamage / (0.1f + bloodPercentage);
 
-                _damageableSystem.TryChangeDamage(uid, amt, false, false);
+                _damageableSystem.TryChangeDamage(uid, amt,
+                    ignoreResistances: false, interruptsDoAfters: false);
 
                 // Apply dizziness as a symptom of bloodloss.
                 // The effect is applied in a way that it will never be cleared without being healthy.
                 // Multiplying by 2 is arbitrary but works for this case, it just prevents the time from running out
-                _drunkSystem.TryApplyDrunkenness(uid, bloodstream.UpdateInterval*2, false);
-                _stutteringSystem.DoStutter(uid, TimeSpan.FromSeconds(bloodstream.UpdateInterval*2), false);
+                _drunkSystem.TryApplyDrunkenness(
+                    uid,
+                    (float) bloodstream.UpdateInterval.TotalSeconds * 2,
+                    applySlur: false);
+                _stutteringSystem.DoStutter(uid, bloodstream.UpdateInterval * 2, refresh: false);
 
                 // storing the drunk and stutter time so we can remove it independently from other effects additions
                 bloodstream.StatusTime += bloodstream.UpdateInterval * 2;
@@ -142,13 +159,16 @@ public override void Update(float frameTime)
             else if (!_mobStateSystem.IsDead(uid))
             {
                 // If they're healthy, we'll try and heal some bloodloss instead.
-                _damageableSystem.TryChangeDamage(uid, bloodstream.BloodlossHealDamage * bloodPercentage, true, false);
+                _damageableSystem.TryChangeDamage(
+                    uid,
+                    bloodstream.BloodlossHealDamage * bloodPercentage,
+                    ignoreResistances: true, interruptsDoAfters: false);
 
                 // Remove the drunk effect when healthy. Should only remove the amount of drunk and stutter added by low blood level
-                _drunkSystem.TryRemoveDrunkenessTime(uid, bloodstream.StatusTime);
-                _stutteringSystem.DoRemoveStutterTime(uid, bloodstream.StatusTime);
+                _drunkSystem.TryRemoveDrunkenessTime(uid, bloodstream.StatusTime.TotalSeconds);
+                _stutteringSystem.DoRemoveStutterTime(uid, bloodstream.StatusTime.TotalSeconds);
                 // Reset the drunk and stutter time to zero
-                bloodstream.StatusTime = 0;
+                bloodstream.StatusTime = TimeSpan.Zero;
             }
         }
     }
@@ -167,17 +187,15 @@ private void OnComponentInit(Entity<BloodstreamComponent> entity, ref ComponentI
         bloodSolution.AddReagent(entity.Comp.BloodReagent, entity.Comp.BloodMaxVolume - bloodSolution.Volume);
     }
 
-    private void OnDamageChanged(EntityUid uid, BloodstreamComponent component, DamageChangedEvent args)
+    private void OnDamageChanged(Entity<BloodstreamComponent> ent, ref DamageChangedEvent args)
     {
-        if (args.DamageDelta is null)
-            return;
-
-        // definitely don't make them bleed if they got healed
-        if (!args.DamageIncreased)
+        if (args.DamageDelta is null || !args.DamageIncreased)
+        {
             return;
+        }
 
         // TODO probably cache this or something. humans get hurt a lot
-        if (!_prototypeManager.TryIndex<DamageModifierSetPrototype>(component.DamageBleedModifiers, out var modifiers))
+        if (!_prototypeManager.TryIndex<DamageModifierSetPrototype>(ent.Comp.DamageBleedModifiers, out var modifiers))
             return;
 
         var bloodloss = DamageSpecifier.ApplyModifierSet(args.DamageDelta, modifiers);
@@ -186,10 +204,10 @@ private void OnDamageChanged(EntityUid uid, BloodstreamComponent component, Dama
             return;
 
         // Does the calculation of how much bleed rate should be added/removed, then applies it
-        var oldBleedAmount = component.BleedAmount;
+        var oldBleedAmount = ent.Comp.BleedAmount;
         var total = bloodloss.GetTotal();
         var totalFloat = total.Float();
-        TryModifyBleedAmount(uid, totalFloat, component);
+        TryModifyBleedAmount(ent, totalFloat, ent);
 
         /// <summary>
         ///     Critical hit. Causes target to lose blood, using the bleed rate modifier of the weapon, currently divided by 5
@@ -199,8 +217,8 @@ private void OnDamageChanged(EntityUid uid, BloodstreamComponent component, Dama
         var prob = Math.Clamp(totalFloat / 25, 0, 1);
         if (totalFloat > 0 && _robustRandom.Prob(prob))
         {
-            TryModifyBloodLevel(uid, (-total) / 5, component);
-            _audio.PlayPvs(component.InstantBloodSound, uid);
+            TryModifyBloodLevel(ent, (-total) / 5, ent);
+            _audio.PlayPvs(ent.Comp.InstantBloodSound, ent);
         }
 
         // Heat damage will cauterize, causing the bleed rate to be reduced.
@@ -210,53 +228,52 @@ private void OnDamageChanged(EntityUid uid, BloodstreamComponent component, Dama
             // because it's burn damage that cauterized their wounds.
 
             // We'll play a special sound and popup for feedback.
-            _audio.PlayPvs(component.BloodHealedSound, uid);
-            _popupSystem.PopupEntity(Loc.GetString("bloodstream-component-wounds-cauterized"), uid,
-                uid, PopupType.Medium);
+            _audio.PlayPvs(ent.Comp.BloodHealedSound, ent);
+            _popupSystem.PopupEntity(Loc.GetString("bloodstream-component-wounds-cauterized"), ent,
+                ent, PopupType.Medium);
         }
     }
     /// <summary>
     ///     Shows text on health examine, based on bleed rate and blood level.
     /// </summary>
-    private void OnHealthBeingExamined(EntityUid uid, BloodstreamComponent component, HealthBeingExaminedEvent args)
+    private void OnHealthBeingExamined(Entity<BloodstreamComponent> ent, ref HealthBeingExaminedEvent args)
     {
         // Shows profusely bleeding at half the max bleed rate.
-        if (component.BleedAmount > component.MaxBleedAmount / 2)
+        if (ent.Comp.BleedAmount > ent.Comp.MaxBleedAmount / 2)
         {
             args.Message.PushNewline();
-            args.Message.AddMarkup(Loc.GetString("bloodstream-component-profusely-bleeding", ("target", Identity.Entity(uid, EntityManager))));
+            args.Message.AddMarkup(Loc.GetString("bloodstream-component-profusely-bleeding", ("target", ent.Owner)));
         }
         // Shows bleeding message when bleeding, but less than profusely.
-        else if (component.BleedAmount > 0)
+        else if (ent.Comp.BleedAmount > 0)
         {
             args.Message.PushNewline();
-            args.Message.AddMarkup(Loc.GetString("bloodstream-component-bleeding", ("target", Identity.Entity(uid, EntityManager))));
+            args.Message.AddMarkup(Loc.GetString("bloodstream-component-bleeding", ("target", ent.Owner)));
         }
 
         // If the mob's blood level is below the damage threshhold, the pale message is added.
-        if (GetBloodLevelPercentage(uid, component) < component.BloodlossThreshold)
+        if (GetBloodLevelPercentage(ent, ent) < ent.Comp.BloodlossThreshold)
         {
             args.Message.PushNewline();
-            args.Message.AddMarkup(Loc.GetString("bloodstream-component-looks-pale", ("target", Identity.Entity(uid, EntityManager))));
+            args.Message.AddMarkup(Loc.GetString("bloodstream-component-looks-pale", ("target", ent.Owner)));
         }
     }
 
-    private void OnBeingGibbed(EntityUid uid, BloodstreamComponent component, BeingGibbedEvent args)
+    private void OnBeingGibbed(Entity<BloodstreamComponent> ent, ref BeingGibbedEvent args)
     {
-        SpillAllSolutions(uid, component);
+        SpillAllSolutions(ent, ent);
     }
 
-    private void OnApplyMetabolicMultiplier(EntityUid uid, BloodstreamComponent component, ApplyMetabolicMultiplierEvent args)
+    private void OnApplyMetabolicMultiplier(
+        Entity<BloodstreamComponent> ent,
+        ref ApplyMetabolicMultiplierEvent args)
     {
         if (args.Apply)
         {
-            component.UpdateInterval *= args.Multiplier;
+            ent.Comp.UpdateInterval *= args.Multiplier;
             return;
         }
-        component.UpdateInterval /= args.Multiplier;
-        // Reset the accumulator properly
-        if (component.AccumulatedFrametime >= component.UpdateInterval)
-            component.AccumulatedFrametime = component.UpdateInterval;
+        ent.Comp.UpdateInterval /= args.Multiplier;
     }
 
     private void OnRejuvenate(Entity<BloodstreamComponent> entity, ref RejuvenateEvent args)
@@ -275,21 +292,15 @@ private void OnRejuvenate(Entity<BloodstreamComponent> entity, ref RejuvenateEve
     /// </summary>
     public bool TryAddToChemicals(EntityUid uid, Solution solution, BloodstreamComponent? component = null)
     {
-        if (!Resolve(uid, ref component, false))
-            return false;
-
-        if (!_solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution))
-            return false;
-
-        return _solutionContainerSystem.TryAddSolution(component.ChemicalSolution.Value, solution);
+        return Resolve(uid, ref component, logMissing: false)
+            && _solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution)
+            && _solutionContainerSystem.TryAddSolution(component.ChemicalSolution.Value, solution);
     }
 
     public bool FlushChemicals(EntityUid uid, string excludedReagentID, FixedPoint2 quantity, BloodstreamComponent? component = null)
     {
-        if (!Resolve(uid, ref component, false))
-            return false;
-
-        if (!_solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution, out var chemSolution))
+        if (!Resolve(uid, ref component, logMissing: false)
+            || !_solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution, out var chemSolution))
             return false;
 
         for (var i = chemSolution.Contents.Count - 1; i >= 0; i--)
@@ -306,11 +317,11 @@ public bool FlushChemicals(EntityUid uid, string excludedReagentID, FixedPoint2
 
     public float GetBloodLevelPercentage(EntityUid uid, BloodstreamComponent? component = null)
     {
-        if (!Resolve(uid, ref component))
-            return 0.0f;
-
-        if (!_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution, out var bloodSolution))
+        if (!Resolve(uid, ref component)
+            || !_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution, out var bloodSolution))
+        {
             return 0.0f;
+        }
 
         return bloodSolution.FillFraction;
     }
@@ -328,11 +339,11 @@ public void SetBloodLossThreshold(EntityUid uid, float threshold, BloodstreamCom
     /// </summary>
     public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamComponent? component = null)
     {
-        if (!Resolve(uid, ref component, false))
-            return false;
-
-        if (!_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution))
+        if (!Resolve(uid, ref component, logMissing: false)
+            || !_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution))
+        {
             return false;
+        }
 
         if (amount >= 0)
             return _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, amount, out _);
@@ -356,9 +367,9 @@ public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamCo
                 tempSolution.AddSolution(temp, _prototypeManager);
             }
 
-            if (_puddleSystem.TrySpillAt(uid, tempSolution, out var puddleUid, false))
+            if (_puddleSystem.TrySpillAt(uid, tempSolution, out var puddleUid, sound: false))
             {
-                _forensicsSystem.TransferDna(puddleUid, uid, false);
+                _forensicsSystem.TransferDna(puddleUid, uid, canDnaBeCleaned: false);
             }
 
             tempSolution.RemoveAllSolution();
@@ -374,7 +385,7 @@ public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamCo
     /// </summary>
     public bool TryModifyBleedAmount(EntityUid uid, float amount, BloodstreamComponent? component = null)
     {
-        if (!Resolve(uid, ref component, false))
+        if (!Resolve(uid, ref component, logMissing: false))
             return false;
 
         component.BleedAmount += amount;
@@ -424,7 +435,7 @@ public void SpillAllSolutions(EntityUid uid, BloodstreamComponent? component = n
 
         if (_puddleSystem.TrySpillAt(uid, tempSol, out var puddleUid))
         {
-            _forensicsSystem.TransferDna(puddleUid, uid, false);
+            _forensicsSystem.TransferDna(puddleUid, uid, canDnaBeCleaned: false);
         }
     }
 
@@ -433,11 +444,11 @@ public void SpillAllSolutions(EntityUid uid, BloodstreamComponent? component = n
     /// </summary>
     public void ChangeBloodReagent(EntityUid uid, string reagent, BloodstreamComponent? component = null)
     {
-        if (!Resolve(uid, ref component, false))
-            return;
-
-        if (reagent == component.BloodReagent)
+        if (!Resolve(uid, ref component, logMissing: false)
+            || reagent == component.BloodReagent)
+        {
             return;
+        }
 
         if (!_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution, out var bloodSolution))
         {
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index 18119909abc..37f78ed81a0 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -1,23 +1,19 @@
 using Content.Server.Body.Components;
 using Content.Server.GameTicking;
 using Content.Server.Humanoid;
-using Content.Server.Kitchen.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Systems;
 using Content.Shared.Humanoid;
-using Content.Shared.Kitchen.Components;
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
 using Robust.Shared.Audio;
-using Robust.Shared.Player;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using System.Numerics;
-using Content.Shared.Gibbing.Components;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Body.Systems;
 
@@ -28,9 +24,7 @@ public sealed class BodySystem : SharedBodySystem
     [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
     {
@@ -40,7 +34,7 @@ public override void Initialize()
         SubscribeLocalEvent<BodyComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
     }
 
-    private void OnRelayMoveInput(EntityUid uid, BodyComponent component, ref MoveInputEvent args)
+    private void OnRelayMoveInput(Entity<BodyComponent> ent, ref MoveInputEvent args)
     {
         // If they haven't actually moved then ignore it.
         if ((args.Component.HeldMoveButtons &
@@ -49,68 +43,67 @@ private void OnRelayMoveInput(EntityUid uid, BodyComponent component, ref MoveIn
             return;
         }
 
-        if (_mobState.IsDead(uid) && _mindSystem.TryGetMind(uid, out var mindId, out var mind))
+        if (_mobState.IsDead(ent) && _mindSystem.TryGetMind(ent, out var mindId, out var mind))
         {
             mind.TimeOfDeath ??= _gameTiming.RealTime;
-            _ticker.OnGhostAttempt(mindId, true, mind: mind);
+            _ticker.OnGhostAttempt(mindId, canReturnGlobal: true, mind: mind);
         }
     }
 
-    private void OnApplyMetabolicMultiplier(EntityUid uid, BodyComponent component,
-        ApplyMetabolicMultiplierEvent args)
+    private void OnApplyMetabolicMultiplier(
+        Entity<BodyComponent> ent,
+        ref ApplyMetabolicMultiplierEvent args)
     {
-        foreach (var organ in GetBodyOrgans(uid, component))
+        foreach (var organ in GetBodyOrgans(ent, ent))
         {
-            RaiseLocalEvent(organ.Id, args);
+            RaiseLocalEvent(organ.Id, ref args);
         }
     }
 
     protected override void AddPart(
-        EntityUid bodyUid,
-        EntityUid partUid,
-        string slotId,
-        BodyPartComponent component,
-        BodyComponent? bodyComp = null)
+        Entity<BodyComponent?> bodyEnt,
+        Entity<BodyPartComponent> partEnt,
+        string slotId)
     {
         // TODO: Predict this probably.
-        base.AddPart(bodyUid, partUid, slotId, component, bodyComp);
+        base.AddPart(bodyEnt, partEnt, slotId);
 
-        if (TryComp<HumanoidAppearanceComponent>(bodyUid, out var humanoid))
+        if (TryComp<HumanoidAppearanceComponent>(bodyEnt, out var humanoid))
         {
-            var layer = component.ToHumanoidLayers();
+            var layer = partEnt.Comp.ToHumanoidLayers();
             if (layer != null)
             {
                 var layers = HumanoidVisualLayersExtension.Sublayers(layer.Value);
-                _humanoidSystem.SetLayersVisibility(bodyUid, layers, true, true, humanoid);
+                _humanoidSystem.SetLayersVisibility(
+                    bodyEnt, layers, visible: true, permanent: true, humanoid);
             }
         }
     }
 
     protected override void RemovePart(
-        EntityUid bodyUid,
-        EntityUid partUid,
-        string slotId,
-        BodyPartComponent component,
-        BodyComponent? bodyComp = null)
+        Entity<BodyComponent?> bodyEnt,
+        Entity<BodyPartComponent> partEnt,
+        string slotId)
     {
-        base.RemovePart(bodyUid, partUid, slotId, component, bodyComp);
+        base.RemovePart(bodyEnt, partEnt, slotId);
 
-        if (!TryComp<HumanoidAppearanceComponent>(bodyUid, out var humanoid))
+        if (!TryComp<HumanoidAppearanceComponent>(bodyEnt, out var humanoid))
             return;
 
-        var layer = component.ToHumanoidLayers();
+        var layer = partEnt.Comp.ToHumanoidLayers();
 
-        if (layer == null)
+        if (layer is null)
             return;
 
         var layers = HumanoidVisualLayersExtension.Sublayers(layer.Value);
-        _humanoidSystem.SetLayersVisibility(bodyUid, layers, false, true, humanoid);
+        _humanoidSystem.SetLayersVisibility(
+            bodyEnt, layers, visible: false, permanent: true, humanoid);
     }
 
     public override HashSet<EntityUid> GibBody(
         EntityUid bodyId,
         bool gibOrgans = false,
-        BodyComponent? body = null ,
+        BodyComponent? body = null,
         bool launchGibs = true,
         Vector2? splatDirection = null,
         float splatModifier = 1,
@@ -118,19 +111,23 @@ public override HashSet<EntityUid> GibBody(
         SoundSpecifier? gibSoundOverride = null
     )
     {
-        if (!Resolve(bodyId, ref body, false))
-            return new HashSet<EntityUid>();
-
-        if (TerminatingOrDeleted(bodyId) || EntityManager.IsQueuedForDeletion(bodyId))
+        if (!Resolve(bodyId, ref body, logMissing: false)
+            || TerminatingOrDeleted(bodyId)
+            || EntityManager.IsQueuedForDeletion(bodyId))
+        {
             return new HashSet<EntityUid>();
+        }
 
         var xform = Transform(bodyId);
-        if (xform.MapUid == null)
+        if (xform.MapUid is null)
             return new HashSet<EntityUid>();
 
         var gibs = base.GibBody(bodyId, gibOrgans, body, launchGibs: launchGibs,
             splatDirection: splatDirection, splatModifier: splatModifier, splatCone:splatCone);
-        RaiseLocalEvent(bodyId, new BeingGibbedEvent(gibs));
+
+        var ev = new BeingGibbedEvent(gibs);
+        RaiseLocalEvent(bodyId, ref ev);
+
         QueueDel(bodyId);
 
         return gibs;
diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs
index abb54971209..86d2cb61ffe 100644
--- a/Content.Server/Body/Systems/BrainSystem.cs
+++ b/Content.Server/Body/Systems/BrainSystem.cs
@@ -16,8 +16,8 @@ public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<BrainComponent, AddedToPartInBodyEvent>((uid, _, args) => HandleMind(args.Body, uid));
-            SubscribeLocalEvent<BrainComponent, RemovedFromPartInBodyEvent>((uid, _, args) => HandleMind(uid, args.OldBody));
+            SubscribeLocalEvent<BrainComponent, OrganAddedToBodyEvent>((uid, _, args) => HandleMind(args.Body, uid));
+            SubscribeLocalEvent<BrainComponent, OrganRemovedFromBodyEvent>((uid, _, args) => HandleMind(uid, args.OldBody));
             SubscribeLocalEvent<BrainComponent, PointAttemptEvent>(OnPointAttempt);
         }
 
@@ -39,7 +39,7 @@ private void HandleMind(EntityUid newEntity, EntityUid oldEntity)
             _mindSystem.TransferTo(mindId, newEntity, mind: mind);
         }
 
-        private void OnPointAttempt(EntityUid uid, BrainComponent component, PointAttemptEvent args)
+        private void OnPointAttempt(Entity<BrainComponent> ent, ref PointAttemptEvent args)
         {
             args.Cancel();
         }
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index 007cbdf0848..9607a808f65 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
-using Content.Server.Hands.Systems;
 using Content.Server.Popups;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -11,19 +10,16 @@
 using Content.Shared.Inventory;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Body.Systems;
 
 public sealed class InternalsSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly AtmosphereSystem _atmos = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly GasTankSystem _gasTank = default!;
-    [Dependency] private readonly HandsSystem _hands = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
 
@@ -40,28 +36,36 @@ public override void Initialize()
         SubscribeLocalEvent<InternalsComponent, InternalsDoAfterEvent>(OnDoAfter);
     }
 
-    private void OnGetInteractionVerbs(EntityUid uid, InternalsComponent component, GetVerbsEvent<InteractionVerb> args)
+    private void OnGetInteractionVerbs(
+        Entity<InternalsComponent> ent,
+        ref GetVerbsEvent<InteractionVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
+        if (!args.CanAccess || !args.CanInteract || args.Hands is null)
             return;
 
+        var user = args.User;
+
         InteractionVerb verb = new()
         {
             Act = () =>
             {
-                ToggleInternals(uid, args.User, false, component);
+                ToggleInternals(ent, user, force: false, ent);
             },
             Message = Loc.GetString("action-description-internals-toggle"),
-            Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/dot.svg.192dpi.png")),
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/dot.svg.192dpi.png")),
             Text = Loc.GetString("action-name-internals-toggle"),
         };
 
         args.Verbs.Add(verb);
     }
 
-    public void ToggleInternals(EntityUid uid, EntityUid user, bool force, InternalsComponent? internals = null)
+    public void ToggleInternals(
+        EntityUid uid,
+        EntityUid user,
+        bool force,
+        InternalsComponent? internals = null)
     {
-        if (!Resolve(uid, ref internals, false))
+        if (!Resolve(uid, ref internals, logMissing: false))
             return;
 
         // Toggle off if they're on
@@ -73,12 +77,12 @@ public void ToggleInternals(EntityUid uid, EntityUid user, bool force, Internals
                 return;
             }
 
-            StartToggleInternalsDoAfter(user, uid, internals);
+            StartToggleInternalsDoAfter(user, (uid, internals));
             return;
         }
 
         // If they're not on then check if we have a mask to use
-        if (internals.BreathToolEntity == null)
+        if (internals.BreathToolEntity is null)
         {
             _popupSystem.PopupEntity(Loc.GetString("internals-no-breath-tool"), uid, user);
             return;
@@ -86,7 +90,7 @@ public void ToggleInternals(EntityUid uid, EntityUid user, bool force, Internals
 
         var tank = FindBestGasTank(uid);
 
-        if (tank == null)
+        if (tank is null)
         {
             _popupSystem.PopupEntity(Loc.GetString("internals-no-tank"), uid, user);
             return;
@@ -94,20 +98,20 @@ public void ToggleInternals(EntityUid uid, EntityUid user, bool force, Internals
 
         if (!force)
         {
-            StartToggleInternalsDoAfter(user, uid, internals);
+            StartToggleInternalsDoAfter(user, (uid, internals));
             return;
         }
 
         _gasTank.ConnectToInternals(tank.Value);
     }
 
-    private void StartToggleInternalsDoAfter(EntityUid user, EntityUid target, InternalsComponent internals)
+    private void StartToggleInternalsDoAfter(EntityUid user, Entity<InternalsComponent> targetEnt)
     {
         // Is the target not you? If yes, use a do-after to give them time to respond.
-        var isUser = user == target;
-        var delay = !isUser ? internals.Delay : 0f;
+        var isUser = user == targetEnt.Owner;
+        var delay = !isUser ? targetEnt.Comp.Delay : TimeSpan.Zero;
 
-        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new InternalsDoAfterEvent(), target, target: target)
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new InternalsDoAfterEvent(), targetEnt, target: targetEnt)
         {
             BreakOnUserMove = true,
             BreakOnDamage = true,
@@ -116,66 +120,64 @@ private void StartToggleInternalsDoAfter(EntityUid user, EntityUid target, Inter
         });
     }
 
-    private void OnDoAfter(EntityUid uid, InternalsComponent component, InternalsDoAfterEvent args)
+    private void OnDoAfter(Entity<InternalsComponent> ent, ref InternalsDoAfterEvent args)
     {
         if (args.Cancelled || args.Handled)
             return;
 
-        ToggleInternals(uid, args.User, true, component);
+        ToggleInternals(ent, args.User, force: true, ent);
 
         args.Handled = true;
     }
 
-    private void OnInternalsStartup(EntityUid uid, InternalsComponent component, ComponentStartup args)
+    private void OnInternalsStartup(Entity<InternalsComponent> ent, ref ComponentStartup args)
     {
-        _alerts.ShowAlert(uid, AlertType.Internals, GetSeverity(component));
+        _alerts.ShowAlert(ent, AlertType.Internals, GetSeverity(ent));
     }
 
-    private void OnInternalsShutdown(EntityUid uid, InternalsComponent component, ComponentShutdown args)
+    private void OnInternalsShutdown(Entity<InternalsComponent> ent, ref ComponentShutdown args)
     {
-        _alerts.ClearAlert(uid, AlertType.Internals);
+        _alerts.ClearAlert(ent, AlertType.Internals);
     }
 
-    private void OnInhaleLocation(EntityUid uid, InternalsComponent component, InhaleLocationEvent args)
+    private void OnInhaleLocation(Entity<InternalsComponent> ent, ref InhaleLocationEvent args)
     {
-        if (AreInternalsWorking(component))
+        if (AreInternalsWorking(ent))
         {
-            var gasTank = Comp<GasTankComponent>(component.GasTankEntity!.Value);
-            args.Gas = _gasTank.RemoveAirVolume((component.GasTankEntity.Value, gasTank), Atmospherics.BreathVolume);
+            var gasTank = Comp<GasTankComponent>(ent.Comp.GasTankEntity!.Value);
+            args.Gas = _gasTank.RemoveAirVolume((ent.Comp.GasTankEntity.Value, gasTank), Atmospherics.BreathVolume);
             // TODO: Should listen to gas tank updates instead I guess?
-            _alerts.ShowAlert(uid, AlertType.Internals, GetSeverity(component));
+            _alerts.ShowAlert(ent, AlertType.Internals, GetSeverity(ent));
         }
     }
     public void DisconnectBreathTool(Entity<InternalsComponent> ent)
     {
-        var (owner, component) = ent;
-        var old = component.BreathToolEntity;
-        component.BreathToolEntity = null;
+        var old = ent.Comp.BreathToolEntity;
+        ent.Comp.BreathToolEntity = null;
 
-        if (TryComp(old, out BreathToolComponent? breathTool) )
+        if (TryComp(old, out BreathToolComponent? breathTool))
         {
             _atmos.DisconnectInternals(breathTool);
             DisconnectTank(ent);
         }
 
-        _alerts.ShowAlert(owner, AlertType.Internals, GetSeverity(component));
+        _alerts.ShowAlert(ent, AlertType.Internals, GetSeverity(ent));
     }
 
     public void ConnectBreathTool(Entity<InternalsComponent> ent, EntityUid toolEntity)
     {
-        var (owner, component) = ent;
-        if (TryComp(component.BreathToolEntity, out BreathToolComponent? tool))
+        if (TryComp(ent.Comp.BreathToolEntity, out BreathToolComponent? tool))
         {
             _atmos.DisconnectInternals(tool);
         }
 
-        component.BreathToolEntity = toolEntity;
-        _alerts.ShowAlert(owner, AlertType.Internals, GetSeverity(component));
+        ent.Comp.BreathToolEntity = toolEntity;
+        _alerts.ShowAlert(ent, AlertType.Internals, GetSeverity(ent));
     }
 
     public void DisconnectTank(InternalsComponent? component)
     {
-        if (component == null)
+        if (component is null)
             return;
 
         if (TryComp(component.GasTankEntity, out GasTankComponent? tank))
@@ -187,46 +189,47 @@ public void DisconnectTank(InternalsComponent? component)
 
     public bool TryConnectTank(Entity<InternalsComponent> ent, EntityUid tankEntity)
     {
-        var component = ent.Comp;
-        if (component.BreathToolEntity == null)
+        if (ent.Comp.BreathToolEntity is null)
             return false;
 
-        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 = tankEntity;
-        _alerts.ShowAlert(ent, AlertType.Internals, GetSeverity(component));
+        ent.Comp.GasTankEntity = tankEntity;
+        _alerts.ShowAlert(ent, AlertType.Internals, GetSeverity(ent));
         return true;
     }
 
     public bool AreInternalsWorking(EntityUid uid, InternalsComponent? component = null)
     {
-        if (!Resolve(uid, ref component, false))
-            return false;
-
-        return AreInternalsWorking(component);
+        return Resolve(uid, ref component, logMissing: false)
+            && AreInternalsWorking(component);
     }
 
     public bool AreInternalsWorking(InternalsComponent component)
     {
-        return TryComp(component.BreathToolEntity, out BreathToolComponent? breathTool) &&
-               breathTool.IsFunctional &&
-               TryComp(component.GasTankEntity, out GasTankComponent? _);
+        return TryComp(component.BreathToolEntity, out BreathToolComponent? breathTool)
+            && breathTool.IsFunctional
+            && HasComp<GasTankComponent>(component.GasTankEntity);
     }
 
     private short GetSeverity(InternalsComponent component)
     {
-        if (component.BreathToolEntity == null || !AreInternalsWorking(component))
+        if (component.BreathToolEntity is null || !AreInternalsWorking(component))
             return 2;
 
         // If pressure in the tank is below low pressure threshhold, flash warning on internals UI
-        if (TryComp<GasTankComponent>(component.GasTankEntity, out var gasTank) && gasTank.IsLowPressure)
+        if (TryComp<GasTankComponent>(component.GasTankEntity, out var gasTank)
+            && gasTank.IsLowPressure)
+        {
             return 0;
+        }
 
         return 1;
     }
 
-    public Entity<GasTankComponent>? FindBestGasTank(Entity<HandsComponent?, InventoryComponent?, ContainerManagerComponent?> user)
+    public Entity<GasTankComponent>? FindBestGasTank(
+        Entity<HandsComponent?, InventoryComponent?, ContainerManagerComponent?> user)
     {
         // Prioritise
         // 1. back equipped tanks
@@ -234,17 +237,17 @@ private short GetSeverity(InternalsComponent component)
         // 3. in-hand tanks
         // 4. pocket/belt tanks
 
-        if (!Resolve(user.Owner, ref user.Comp1, ref user.Comp2, ref user.Comp3))
+        if (!Resolve(user, ref user.Comp1, ref user.Comp2, ref user.Comp3))
             return null;
 
-        if (_inventory.TryGetSlotEntity(user.Owner, "back", out var backEntity, user.Comp2, user.Comp3) &&
+        if (_inventory.TryGetSlotEntity(user, "back", out var backEntity, user.Comp2, user.Comp3) &&
             TryComp<GasTankComponent>(backEntity, out var backGasTank) &&
             _gasTank.CanConnectToInternals(backGasTank))
         {
             return (backEntity.Value, backGasTank);
         }
 
-        if (_inventory.TryGetSlotEntity(user.Owner, "suitstorage", out var entity, user.Comp2, user.Comp3) &&
+        if (_inventory.TryGetSlotEntity(user, "suitstorage", out var entity, user.Comp2, user.Comp3) &&
             TryComp<GasTankComponent>(entity, out var gasTank) &&
             _gasTank.CanConnectToInternals(gasTank))
         {
diff --git a/Content.Server/Body/Systems/LungSystem.cs b/Content.Server/Body/Systems/LungSystem.cs
index 4b60f8814b5..e83d3c32a25 100644
--- a/Content.Server/Body/Systems/LungSystem.cs
+++ b/Content.Server/Body/Systems/LungSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Atmos.Components;
+using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
@@ -26,21 +26,24 @@ public override void Initialize()
         SubscribeLocalEvent<BreathToolComponent, ItemMaskToggledEvent>(OnMaskToggled);
     }
 
-    private void OnGotUnequipped(EntityUid uid, BreathToolComponent component, GotUnequippedEvent args)
+    private void OnGotUnequipped(Entity<BreathToolComponent> ent, ref GotUnequippedEvent args)
     {
-        _atmosphereSystem.DisconnectInternals(component);
+        _atmosphereSystem.DisconnectInternals(ent);
     }
 
-    private void OnGotEquipped(EntityUid uid, BreathToolComponent component, GotEquippedEvent args)
+    private void OnGotEquipped(Entity<BreathToolComponent> ent, ref GotEquippedEvent args)
     {
+        if ((args.SlotFlags & ent.Comp.AllowedSlots) == 0)
+        {
+            return;
+        }
 
-        if ((args.SlotFlags & component.AllowedSlots) == 0) return;
-        component.IsFunctional = true;
+        ent.Comp.IsFunctional = true;
 
         if (TryComp(args.Equipee, out InternalsComponent? internals))
         {
-            component.ConnectedInternalsEntity = args.Equipee;
-            _internals.ConnectBreathTool((args.Equipee, internals), uid);
+            ent.Comp.ConnectedInternalsEntity = args.Equipee;
+            _internals.ConnectBreathTool((args.Equipee, internals), ent);
         }
     }
 
@@ -81,7 +84,7 @@ public void GasToReagent(EntityUid uid, LungComponent lung)
             if (moles <= 0)
                 continue;
             var reagent = _atmosphereSystem.GasReagents[i];
-            if (reagent == null) continue;
+            if (reagent is null) continue;
 
             var amount = moles * Atmospherics.BreathMolesToReagentMultiplier;
             solution.AddReagent(reagent, amount);
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index e5f604f70df..066bf0a1c5b 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -12,11 +12,13 @@
 using Robust.Shared.Collections;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems
 {
     public sealed class MetabolizerSystem : EntitySystem
     {
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
@@ -34,9 +36,21 @@ public override void Initialize()
             _solutionQuery = GetEntityQuery<SolutionContainerManagerComponent>();
 
             SubscribeLocalEvent<MetabolizerComponent, ComponentInit>(OnMetabolizerInit);
+            SubscribeLocalEvent<MetabolizerComponent, MapInitEvent>(OnMapInit);
+            SubscribeLocalEvent<MetabolizerComponent, EntityUnpausedEvent>(OnUnpaused);
             SubscribeLocalEvent<MetabolizerComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
         }
 
+        private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
+        {
+            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
+        }
+
+        private void OnUnpaused(Entity<MetabolizerComponent> ent, ref EntityUnpausedEvent args)
+        {
+            ent.Comp.NextUpdate += args.PausedTime;
+        }
+
         private void OnMetabolizerInit(Entity<MetabolizerComponent> entity, ref ComponentInit args)
         {
             if (!entity.Comp.SolutionOnBody)
@@ -49,19 +63,17 @@ private void OnMetabolizerInit(Entity<MetabolizerComponent> entity, ref Componen
             }
         }
 
-        private void OnApplyMetabolicMultiplier(EntityUid uid, MetabolizerComponent component,
-            ApplyMetabolicMultiplierEvent args)
+        private void OnApplyMetabolicMultiplier(
+            Entity<MetabolizerComponent> ent,
+            ref ApplyMetabolicMultiplierEvent args)
         {
             if (args.Apply)
             {
-                component.UpdateFrequency *= args.Multiplier;
+                ent.Comp.UpdateInterval *= args.Multiplier;
                 return;
             }
 
-            component.UpdateFrequency /= args.Multiplier;
-            // Reset the accumulator properly
-            if (component.AccumulatedFrametime >= component.UpdateFrequency)
-                component.AccumulatedFrametime = component.UpdateFrequency;
+            ent.Comp.UpdateInterval /= args.Multiplier;
         }
 
         public override void Update(float frameTime)
@@ -78,50 +90,52 @@ public override void Update(float frameTime)
 
             foreach (var (uid, metab) in metabolizers)
             {
-                metab.AccumulatedFrametime += frameTime;
-
                 // Only update as frequently as it should
-                if (metab.AccumulatedFrametime < metab.UpdateFrequency)
+                if (_gameTiming.CurTime < metab.NextUpdate)
                     continue;
 
-                metab.AccumulatedFrametime -= metab.UpdateFrequency;
-                TryMetabolize(uid, metab);
+                metab.NextUpdate += metab.UpdateInterval;
+                TryMetabolize((uid, metab));
             }
         }
 
-        private void TryMetabolize(EntityUid uid, MetabolizerComponent meta, OrganComponent? organ = null)
+        private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, SolutionContainerManagerComponent?> ent)
         {
-            _organQuery.Resolve(uid, ref organ, false);
+            _organQuery.Resolve(ent, ref ent.Comp2, logMissing: false);
 
             // First step is get the solution we actually care about
+            var solutionName = ent.Comp1.SolutionName;
             Solution? solution = null;
             Entity<SolutionComponent>? soln = default!;
             EntityUid? solutionEntityUid = null;
 
-            SolutionContainerManagerComponent? manager = null;
-
-            if (meta.SolutionOnBody)
+            if (ent.Comp1.SolutionOnBody)
             {
-                if (organ?.Body is { } body)
+                if (ent.Comp2?.Body is { } body)
                 {
-                    if (!_solutionQuery.Resolve(body, ref manager, false))
+                    if (!_solutionQuery.Resolve(body, ref ent.Comp3, logMissing: false))
                         return;
 
-                    _solutionContainerSystem.TryGetSolution((body, manager), meta.SolutionName, out soln, out solution);
+                    _solutionContainerSystem.TryGetSolution((body, ent.Comp3), solutionName, out soln, out solution);
                     solutionEntityUid = body;
                 }
             }
             else
             {
-                if (!_solutionQuery.Resolve(uid, ref manager, false))
+                if (!_solutionQuery.Resolve(ent, ref ent.Comp3, logMissing: false))
                     return;
 
-                _solutionContainerSystem.TryGetSolution((uid, manager), meta.SolutionName, out soln, out solution);
-                solutionEntityUid = uid;
+                _solutionContainerSystem.TryGetSolution((ent, ent), solutionName, out soln, out solution);
+                solutionEntityUid = ent;
             }
 
-            if (solutionEntityUid == null || soln is null || solution is null || solution.Contents.Count == 0)
+            if (solutionEntityUid is null
+                || soln is null
+                || solution is null
+                || solution.Contents.Count == 0)
+            {
                 return;
+            }
 
             // randomize the reagent list so we don't have any weird quirks
             // like alphabetical order or insertion order mattering for processing
@@ -135,9 +149,9 @@ private void TryMetabolize(EntityUid uid, MetabolizerComponent meta, OrganCompon
                     continue;
 
                 var mostToRemove = FixedPoint2.Zero;
-                if (proto.Metabolisms == null)
+                if (proto.Metabolisms is null)
                 {
-                    if (meta.RemoveEmpty)
+                    if (ent.Comp1.RemoveEmpty)
                     {
                         solution.RemoveReagent(reagent, FixedPoint2.New(1));
                     }
@@ -146,15 +160,15 @@ private void TryMetabolize(EntityUid uid, MetabolizerComponent meta, OrganCompon
                 }
 
                 // we're done here entirely if this is true
-                if (reagents >= meta.MaxReagentsProcessable)
+                if (reagents >= ent.Comp1.MaxReagentsProcessable)
                     return;
 
 
                 // loop over all our groups and see which ones apply
-                if (meta.MetabolismGroups == null)
+                if (ent.Comp1.MetabolismGroups is null)
                     continue;
 
-                foreach (var group in meta.MetabolismGroups)
+                foreach (var group in ent.Comp1.MetabolismGroups)
                 {
                     if (!proto.Metabolisms.TryGetValue(group.Id, out var entry))
                         continue;
@@ -169,15 +183,18 @@ private void TryMetabolize(EntityUid uid, MetabolizerComponent meta, OrganCompon
                     // if it's possible for them to be dead, and they are,
                     // then we shouldn't process any effects, but should probably
                     // still remove reagents
-                    if (EntityManager.TryGetComponent<MobStateComponent>(solutionEntityUid.Value, out var state))
+                    if (TryComp<MobStateComponent>(solutionEntityUid.Value, out var state))
                     {
                         if (!proto.WorksOnTheDead && _mobStateSystem.IsDead(solutionEntityUid.Value, state))
                             continue;
                     }
 
-                    var actualEntity = organ?.Body ?? solutionEntityUid.Value;
-                    var args = new ReagentEffectArgs(actualEntity, uid, solution, proto, mostToRemove,
-                        EntityManager, null, scale);
+                    var actualEntity = ent.Comp2?.Body ?? solutionEntityUid.Value;
+                    var ev = new TryMetabolizeReagent(reagent, proto, quantity);
+                    RaiseLocalEvent(actualEntity, ref ev);
+
+                    var args = new ReagentEffectArgs(actualEntity, ent, solution, proto, mostToRemove,
+                        EntityManager, null, scale * ev.Scale, ev.QuantityMultiplier);
 
                     // do all effects, if conditions apply
                     foreach (var effect in entry.Effects)
@@ -187,8 +204,14 @@ private void TryMetabolize(EntityUid uid, MetabolizerComponent meta, OrganCompon
 
                         if (effect.ShouldLog)
                         {
-                            _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                                $"Metabolism effect {effect.GetType().Name:effect} of reagent {proto.LocalizedName:reagent} applied on entity {actualEntity:entity} at {Transform(actualEntity).Coordinates:coordinates}");
+                            _adminLogger.Add(
+                                LogType.ReagentEffect,
+                                effect.LogImpact,
+                                $"Metabolism effect {effect.GetType().Name:effect}"
+                                + $" of reagent {proto.LocalizedName:reagent}"
+                                + $" applied on entity {actualEntity:entity}"
+                                + $" at {Transform(actualEntity).Coordinates:coordinates}"
+                            );
                         }
 
                         effect.Effect(args);
@@ -209,15 +232,28 @@ private void TryMetabolize(EntityUid uid, MetabolizerComponent meta, OrganCompon
         }
     }
 
-    public sealed class ApplyMetabolicMultiplierEvent : EntityEventArgs
+    [ByRefEvent]
+    public readonly record struct ApplyMetabolicMultiplierEvent(
+        EntityUid Uid,
+        float Multiplier,
+        bool Apply)
     {
-        // The entity whose metabolism is being modified
-        public EntityUid Uid;
-
-        // What the metabolism's update rate will be multiplied by
-        public float Multiplier;
-
-        // Apply this multiplier or ignore / reset it?
-        public bool Apply;
+        /// <summary>
+        /// The entity whose metabolism is being modified.
+        /// </summary>
+        public readonly EntityUid Uid = Uid;
+
+        /// <summary>
+        /// What the metabolism's update rate will be multiplied by.
+        /// </summary>
+        public readonly float Multiplier = Multiplier;
+
+        /// <summary>
+        /// If true, apply the multiplier. If false, revert it.
+        /// </summary>
+        public readonly bool Apply = Apply;
     }
 }
+
+[ByRefEvent]
+public record struct TryMetabolizeReagent(ReagentId Reagent, ReagentPrototype Prototype, FixedPoint2 Quantity, float Scale = 1f, float QuantityMultiplier = 1f);
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 0fd61a9cb7b..c7266e2c463 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -35,9 +35,21 @@ public override void Initialize()
 
         // We want to process lung reagents before we inhale new reagents.
         UpdatesAfter.Add(typeof(MetabolizerSystem));
+        SubscribeLocalEvent<RespiratorComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<RespiratorComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<RespiratorComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
     }
 
+    private void OnMapInit(Entity<RespiratorComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
+    }
+
+    private void OnUnpaused(Entity<RespiratorComponent> ent, ref EntityUnpausedEvent args)
+    {
+        ent.Comp.NextUpdate += args.PausedTime;
+    }
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -45,17 +57,15 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<RespiratorComponent, BodyComponent>();
         while (query.MoveNext(out var uid, out var respirator, out var body))
         {
-            if (_mobState.IsDead(uid))
-            {
+            if (_gameTiming.CurTime < respirator.NextUpdate)
                 continue;
-            }
 
-            respirator.AccumulatedFrametime += frameTime;
+            respirator.NextUpdate += respirator.UpdateInterval;
 
-            if (respirator.AccumulatedFrametime < respirator.CycleDelay)
+            if (_mobState.IsDead(uid))
                 continue;
-            respirator.AccumulatedFrametime -= respirator.CycleDelay;
-            UpdateSaturation(uid, -respirator.CycleDelay, respirator);
+
+            UpdateSaturation(uid, -(float) respirator.UpdateInterval.TotalSeconds, respirator);
 
             if (!_mobState.IsIncapacitated(uid)) // cannot breathe in crit.
             {
@@ -80,30 +90,30 @@ public override void Update(float frameTime)
                     _popupSystem.PopupEntity(Loc.GetString("lung-behavior-gasp"), uid);
                 }
 
-                TakeSuffocationDamage(uid, respirator);
+                TakeSuffocationDamage((uid, respirator));
                 respirator.SuffocationCycles += 1;
                 continue;
             }
 
-            StopSuffocation(uid, respirator);
+            StopSuffocation((uid, respirator));
             respirator.SuffocationCycles = 0;
         }
     }
 
     public void Inhale(EntityUid uid, BodyComponent? body = null)
     {
-        if (!Resolve(uid, ref body, false))
+        if (!Resolve(uid, ref body, logMissing: false))
             return;
 
         var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(uid, body);
 
         // Inhale gas
         var ev = new InhaleLocationEvent();
-        RaiseLocalEvent(uid, ev);
+        RaiseLocalEvent(uid, ref ev, broadcast: false);
 
-        ev.Gas ??= _atmosSys.GetContainingMixture(uid, false, true);
+        ev.Gas ??= _atmosSys.GetContainingMixture(uid, excite: true);
 
-        if (ev.Gas == null)
+        if (ev.Gas is null)
         {
             return;
         }
@@ -122,7 +132,7 @@ public void Inhale(EntityUid uid, BodyComponent? body = null)
 
     public void Exhale(EntityUid uid, BodyComponent? body = null)
     {
-        if (!Resolve(uid, ref body, false))
+        if (!Resolve(uid, ref body, logMissing: false))
             return;
 
         var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(uid, body);
@@ -130,11 +140,11 @@ public void Exhale(EntityUid uid, BodyComponent? body = null)
         // exhale gas
 
         var ev = new ExhaleLocationEvent();
-        RaiseLocalEvent(uid, ev, false);
+        RaiseLocalEvent(uid, ref ev, broadcast: false);
 
-        if (ev.Gas == null)
+        if (ev.Gas is null)
         {
-            ev.Gas = _atmosSys.GetContainingMixture(uid, false, true);
+            ev.Gas = _atmosSys.GetContainingMixture(uid, excite: true);
 
             // Walls and grids without atmos comp return null. I guess it makes sense to not be able to exhale in walls,
             // but this also means you cannot exhale on some grids.
@@ -154,37 +164,37 @@ public void Exhale(EntityUid uid, BodyComponent? body = null)
         _atmosSys.Merge(ev.Gas, outGas);
     }
 
-    private void TakeSuffocationDamage(EntityUid uid, RespiratorComponent respirator)
+    private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
     {
-        if (respirator.SuffocationCycles == 2)
-            _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(uid):entity} started suffocating");
+        if (ent.Comp.SuffocationCycles == 2)
+            _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} started suffocating");
 
-        if (respirator.SuffocationCycles >= respirator.SuffocationCycleThreshold)
+        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>(uid);
+            var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(ent);
             foreach (var (comp, _) in organs)
             {
-                _alertsSystem.ShowAlert(uid, comp.Alert);
+                _alertsSystem.ShowAlert(ent, comp.Alert);
             }
         }
 
-        _damageableSys.TryChangeDamage(uid, respirator.Damage, false, false);
+        _damageableSys.TryChangeDamage(ent, ent.Comp.Damage, interruptsDoAfters: false);
     }
 
-    private void StopSuffocation(EntityUid uid, RespiratorComponent respirator)
+    private void StopSuffocation(Entity<RespiratorComponent> ent)
     {
-        if (respirator.SuffocationCycles >= 2)
-            _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(uid):entity} stopped suffocating");
+        if (ent.Comp.SuffocationCycles >= 2)
+            _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>(uid);
+        var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(ent);
         foreach (var (comp, _) in organs)
         {
-            _alertsSystem.ClearAlert(uid, comp.Alert);
+            _alertsSystem.ClearAlert(ent, comp.Alert);
         }
 
-        _damageableSys.TryChangeDamage(uid, respirator.DamageRecovery);
+        _damageableSys.TryChangeDamage(ent, ent.Comp.DamageRecovery);
     }
 
     public void UpdateSaturation(EntityUid uid, float amount,
@@ -198,35 +208,29 @@ public void UpdateSaturation(EntityUid uid, float amount,
             Math.Clamp(respirator.Saturation, respirator.MinSaturation, respirator.MaxSaturation);
     }
 
-    private void OnApplyMetabolicMultiplier(EntityUid uid, RespiratorComponent component,
-            ApplyMetabolicMultiplierEvent args)
+    private void OnApplyMetabolicMultiplier(
+        Entity<RespiratorComponent> ent,
+        ref ApplyMetabolicMultiplierEvent args)
     {
         if (args.Apply)
         {
-            component.CycleDelay *= args.Multiplier;
-            component.Saturation *= args.Multiplier;
-            component.MaxSaturation *= args.Multiplier;
-            component.MinSaturation *= args.Multiplier;
+            ent.Comp.UpdateInterval *= args.Multiplier;
+            ent.Comp.Saturation *= args.Multiplier;
+            ent.Comp.MaxSaturation *= args.Multiplier;
+            ent.Comp.MinSaturation *= args.Multiplier;
             return;
         }
 
         // This way we don't have to worry about it breaking if the stasis bed component is destroyed
-        component.CycleDelay /= args.Multiplier;
-        component.Saturation /= args.Multiplier;
-        component.MaxSaturation /= args.Multiplier;
-        component.MinSaturation /= args.Multiplier;
-        // Reset the accumulator properly
-        if (component.AccumulatedFrametime >= component.CycleDelay)
-            component.AccumulatedFrametime = component.CycleDelay;
+        ent.Comp.UpdateInterval /= args.Multiplier;
+        ent.Comp.Saturation /= args.Multiplier;
+        ent.Comp.MaxSaturation /= args.Multiplier;
+        ent.Comp.MinSaturation /= args.Multiplier;
     }
 }
 
-public sealed class InhaleLocationEvent : EntityEventArgs
-{
-    public GasMixture? Gas;
-}
+[ByRefEvent]
+public record struct InhaleLocationEvent(GasMixture? Gas);
 
-public sealed class ExhaleLocationEvent : EntityEventArgs
-{
-    public GasMixture? Gas;
-}
+[ByRefEvent]
+public record struct ExhaleLocationEvent(GasMixture? Gas);
diff --git a/Content.Server/Body/Systems/StomachSystem.cs b/Content.Server/Body/Systems/StomachSystem.cs
index 4c11244c379..a4c2e8292dd 100644
--- a/Content.Server/Body/Systems/StomachSystem.cs
+++ b/Content.Server/Body/Systems/StomachSystem.cs
@@ -3,32 +3,44 @@
 using Content.Shared.Body.Organ;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Body.Systems
 {
     public sealed class StomachSystem : EntitySystem
     {
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
 
         public const string DefaultSolutionName = "stomach";
 
         public override void Initialize()
         {
+            SubscribeLocalEvent<StomachComponent, MapInitEvent>(OnMapInit);
+            SubscribeLocalEvent<StomachComponent, EntityUnpausedEvent>(OnUnpaused);
             SubscribeLocalEvent<StomachComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
         }
 
+        private void OnMapInit(Entity<StomachComponent> ent, ref MapInitEvent args)
+        {
+            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
+        }
+
+        private void OnUnpaused(Entity<StomachComponent> ent, ref EntityUnpausedEvent args)
+        {
+            ent.Comp.NextUpdate += args.PausedTime;
+        }
+
         public override void Update(float frameTime)
         {
             var query = EntityQueryEnumerator<StomachComponent, OrganComponent, SolutionContainerManagerComponent>();
             while (query.MoveNext(out var uid, out var stomach, out var organ, out var sol))
             {
-                stomach.AccumulatedFrameTime += frameTime;
-
-                if (stomach.AccumulatedFrameTime < stomach.UpdateInterval)
+                if (_gameTiming.CurTime < stomach.NextUpdate)
                     continue;
 
-                stomach.AccumulatedFrameTime -= stomach.UpdateInterval;
+                stomach.NextUpdate += stomach.UpdateInterval;
 
                 // Get our solutions
                 if (!_solutionContainerSystem.ResolveSolution((uid, sol), DefaultSolutionName, ref stomach.Solution, out var stomachSolution))
@@ -70,49 +82,44 @@ public override void Update(float frameTime)
             }
         }
 
-        private void OnApplyMetabolicMultiplier(EntityUid uid, StomachComponent component,
-            ApplyMetabolicMultiplierEvent args)
+        private void OnApplyMetabolicMultiplier(
+            Entity<StomachComponent> ent,
+            ref ApplyMetabolicMultiplierEvent args)
         {
             if (args.Apply)
             {
-                component.UpdateInterval *= args.Multiplier;
+                ent.Comp.UpdateInterval *= args.Multiplier;
                 return;
             }
 
             // This way we don't have to worry about it breaking if the stasis bed component is destroyed
-            component.UpdateInterval /= args.Multiplier;
-            // Reset the accumulator properly
-            if (component.AccumulatedFrameTime >= component.UpdateInterval)
-                component.AccumulatedFrameTime = component.UpdateInterval;
+            ent.Comp.UpdateInterval /= args.Multiplier;
         }
 
-        public bool CanTransferSolution(EntityUid uid, Solution solution,
+        public bool CanTransferSolution(
+            EntityUid uid,
+            Solution solution,
             StomachComponent? stomach = null,
             SolutionContainerManagerComponent? solutions = null)
         {
-            if (!Resolve(uid, ref stomach, ref solutions, false))
-                return false;
-
-            if (!_solutionContainerSystem.ResolveSolution((uid, solutions), DefaultSolutionName, ref stomach.Solution, out var stomachSolution))
-                return false;
-
-            // TODO: For now no partial transfers. Potentially change by design
-            if (!stomachSolution.CanAddSolution(solution))
-                return false;
-
-            return true;
+            return Resolve(uid, ref stomach, ref solutions, logMissing: false)
+                && _solutionContainerSystem.ResolveSolution((uid, solutions), DefaultSolutionName, ref stomach.Solution, out var stomachSolution)
+                // TODO: For now no partial transfers. Potentially change by design
+                && stomachSolution.CanAddSolution(solution);
         }
 
-        public bool TryTransferSolution(EntityUid uid, Solution solution,
+        public bool TryTransferSolution(
+            EntityUid uid,
+            Solution solution,
             StomachComponent? stomach = null,
             SolutionContainerManagerComponent? solutions = null)
         {
-            if (!Resolve(uid, ref stomach, ref solutions, false))
-                return false;
-
-            if (!_solutionContainerSystem.ResolveSolution((uid, solutions), DefaultSolutionName, ref stomach.Solution)
+            if (!Resolve(uid, ref stomach, ref solutions, logMissing: false)
+                || !_solutionContainerSystem.ResolveSolution((uid, solutions), DefaultSolutionName, ref stomach.Solution)
                 || !CanTransferSolution(uid, solution, stomach, solutions))
+            {
                 return false;
+            }
 
             _solutionContainerSystem.TryAddSolution(stomach.Solution.Value, solution);
             // Add each reagent to ReagentDeltas. Used to track how long each reagent has been in the stomach
diff --git a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
index a9556be7738..a8bf4184ac8 100644
--- a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
+++ b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
@@ -1,73 +1,95 @@
-using Content.Server.Body.Components;
+using Content.Server.Body.Components;
 using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
 using Content.Shared.ActionBlocker;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems;
 
 public sealed class ThermalRegulatorSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly TemperatureSystem _tempSys = default!;
     [Dependency] private readonly ActionBlockerSystem _actionBlockerSys = default!;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ThermalRegulatorComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ThermalRegulatorComponent, EntityUnpausedEvent>(OnUnpaused);
+    }
+
+    private void OnMapInit(Entity<ThermalRegulatorComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
+    }
+
+    private void OnUnpaused(Entity<ThermalRegulatorComponent> ent, ref EntityUnpausedEvent args)
+    {
+        ent.Comp.NextUpdate += args.PausedTime;
+    }
+
     public override void Update(float frameTime)
     {
         var query = EntityQueryEnumerator<ThermalRegulatorComponent>();
         while (query.MoveNext(out var uid, out var regulator))
         {
-            regulator.AccumulatedFrametime += frameTime;
-            if (regulator.AccumulatedFrametime < 1)
+            if (_gameTiming.CurTime < regulator.NextUpdate)
                 continue;
 
-            regulator.AccumulatedFrametime -= 1;
-            ProcessThermalRegulation(uid, regulator);
+            regulator.NextUpdate += regulator.UpdateInterval;
+            ProcessThermalRegulation((uid, regulator));
         }
     }
 
     /// <summary>
     /// Processes thermal regulation for a mob
     /// </summary>
-    private void ProcessThermalRegulation(EntityUid uid, ThermalRegulatorComponent comp)
+    private void ProcessThermalRegulation(Entity<ThermalRegulatorComponent, TemperatureComponent?> ent)
     {
-        if (!EntityManager.TryGetComponent(uid, out TemperatureComponent? temperatureComponent)) return;
+        if (!Resolve(ent, ref ent.Comp2, logMissing: false))
+            return;
 
-        var totalMetabolismTempChange = comp.MetabolismHeat - comp.RadiatedHeat;
+        var totalMetabolismTempChange = ent.Comp1.MetabolismHeat - ent.Comp1.RadiatedHeat;
 
         // implicit heat regulation
-        var tempDiff = Math.Abs(temperatureComponent.CurrentTemperature - comp.NormalBodyTemperature);
-        var heatCapacity = _tempSys.GetHeatCapacity(uid, temperatureComponent);
+        var tempDiff = Math.Abs(ent.Comp2.CurrentTemperature - ent.Comp1.NormalBodyTemperature);
+        var heatCapacity = _tempSys.GetHeatCapacity(ent, ent);
         var targetHeat = tempDiff * heatCapacity;
-        if (temperatureComponent.CurrentTemperature > comp.NormalBodyTemperature)
+        if (ent.Comp2.CurrentTemperature > ent.Comp1.NormalBodyTemperature)
         {
-            totalMetabolismTempChange -= Math.Min(targetHeat, comp.ImplicitHeatRegulation);
+            totalMetabolismTempChange -= Math.Min(targetHeat, ent.Comp1.ImplicitHeatRegulation);
         }
         else
         {
-            totalMetabolismTempChange += Math.Min(targetHeat, comp.ImplicitHeatRegulation);
+            totalMetabolismTempChange += Math.Min(targetHeat, ent.Comp1.ImplicitHeatRegulation);
         }
 
-        _tempSys.ChangeHeat(uid, totalMetabolismTempChange, true, temperatureComponent);
+        _tempSys.ChangeHeat(ent, totalMetabolismTempChange, ignoreHeatResistance: true, ent);
 
         // recalc difference and target heat
-        tempDiff = Math.Abs(temperatureComponent.CurrentTemperature - comp.NormalBodyTemperature);
+        tempDiff = Math.Abs(ent.Comp2.CurrentTemperature - ent.Comp1.NormalBodyTemperature);
         targetHeat = tempDiff * heatCapacity;
 
         // if body temperature is not within comfortable, thermal regulation
         // processes starts
-        if (tempDiff > comp.ThermalRegulationTemperatureThreshold)
+        if (tempDiff > ent.Comp1.ThermalRegulationTemperatureThreshold)
             return;
 
-        if (temperatureComponent.CurrentTemperature > comp.NormalBodyTemperature)
+        if (ent.Comp2.CurrentTemperature > ent.Comp1.NormalBodyTemperature)
         {
-            if (!_actionBlockerSys.CanSweat(uid)) return;
-            _tempSys.ChangeHeat(uid, -Math.Min(targetHeat, comp.SweatHeatRegulation), true,
-                temperatureComponent);
+            if (!_actionBlockerSys.CanSweat(ent))
+                return;
+
+            _tempSys.ChangeHeat(ent, -Math.Min(targetHeat, ent.Comp1.SweatHeatRegulation), ignoreHeatResistance: true, ent);
         }
         else
         {
-            if (!_actionBlockerSys.CanShiver(uid)) return;
-            _tempSys.ChangeHeat(uid, Math.Min(targetHeat, comp.ShiveringHeatRegulation), true,
-                temperatureComponent);
+            if (!_actionBlockerSys.CanShiver(ent))
+                return;
+
+            _tempSys.ChangeHeat(ent, Math.Min(targetHeat, ent.Comp1.ShiveringHeatRegulation), ignoreHeatResistance: true, ent);
         }
     }
 }
diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index 0f54fd0da50..721536a7c07 100644
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -159,7 +159,6 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
                 if (!_botany.TryGetSeed(seeds, out var seed))
                     return;
 
-                float? seedHealth = seeds.HealthOverride;
                 var name = Loc.GetString(seed.Name);
                 var noun = Loc.GetString(seed.Noun);
                 _popup.PopupCursor(Loc.GetString("plant-holder-component-plant-success-message",
@@ -169,9 +168,9 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
                 component.Seed = seed;
                 component.Dead = false;
                 component.Age = 1;
-                if (seedHealth is float realSeedHealth)
+                if (seeds.HealthOverride != null)
                 {
-                    component.Health = realSeedHealth;
+                    component.Health = seeds.HealthOverride.Value;
                 }
                 else
                 {
@@ -288,8 +287,18 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
             }
 
             component.Health -= (_random.Next(3, 5) * 10);
+
+            float? healthOverride;
+            if (component.Harvest)
+            {
+                healthOverride = null;
+            }
+            else
+            {
+                healthOverride = component.Health;
+            }
             component.Seed.Unique = false;
-            var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User, component.Health);
+            var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User, healthOverride);
             _randomHelper.RandomOffset(seed, 0.25f);
             var displayName = Loc.GetString(component.Seed.DisplayName);
             _popup.PopupCursor(Loc.GetString("plant-holder-component-take-sample-message",
diff --git a/Content.Server/Cargo/Components/CargoBountyLabelComponent.cs b/Content.Server/Cargo/Components/CargoBountyLabelComponent.cs
index 8eea00e0993..2b9898be021 100644
--- a/Content.Server/Cargo/Components/CargoBountyLabelComponent.cs
+++ b/Content.Server/Cargo/Components/CargoBountyLabelComponent.cs
@@ -1,4 +1,6 @@
-namespace Content.Server.Cargo.Components;
+using Content.Server.Station.Systems;
+
+namespace Content.Server.Cargo.Components;
 
 /// <summary>
 /// This is used for marking containers as
@@ -17,4 +19,10 @@ public sealed partial class CargoBountyLabelComponent : Component
     /// Used to prevent recursion in calculating the price.
     /// </summary>
     public bool Calculating;
+
+    /// <summary>
+    /// The Station System to check and remove bounties from
+    /// </summary>
+    [DataField]
+    public EntityUid? AssociatedStationId;
 }
diff --git a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
index 48c58321b38..a7735787cbb 100644
--- a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
+++ b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Cargo;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Cargo.Components;
 
@@ -12,7 +13,7 @@ public sealed partial class StationCargoBountyDatabaseComponent : Component
     /// Maximum amount of bounties a station can have.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public int MaxBounties = 5;
+    public int MaxBounties = 6;
 
     /// <summary>
     /// A list of all the bounties currently active for a station.
@@ -32,4 +33,16 @@ public sealed partial class StationCargoBountyDatabaseComponent : Component
     /// </summary>
     [DataField]
     public HashSet<string> CheckedBounties = new();
+
+    /// <summary>
+    /// The time at which players will be able to skip the next bounty.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextSkipTime = TimeSpan.Zero;
+
+    /// <summary>
+    /// The time between skipping bounties.
+    /// </summary>
+    [DataField]
+    public TimeSpan SkipDelay = TimeSpan.FromMinutes(15);
 }
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index ce15542ec53..22e5c67e175 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -4,6 +4,7 @@
 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;
@@ -34,6 +35,7 @@ private void InitializeBounty()
     {
         SubscribeLocalEvent<CargoBountyConsoleComponent, BoundUIOpenedEvent>(OnBountyConsoleOpened);
         SubscribeLocalEvent<CargoBountyConsoleComponent, BountyPrintLabelMessage>(OnPrintLabelMessage);
+        SubscribeLocalEvent<CargoBountyConsoleComponent, BountySkipMessage>(OnSkipBountyMessage);
         SubscribeLocalEvent<CargoBountyLabelComponent, PriceCalculationEvent>(OnGetBountyPrice);
         SubscribeLocalEvent<EntitySoldEvent>(OnSold);
         SubscribeLocalEvent<StationCargoBountyDatabaseComponent, MapInitEvent>(OnMapInit);
@@ -49,7 +51,8 @@ private void OnBountyConsoleOpened(EntityUid uid, CargoBountyConsoleComponent co
             !TryComp<StationCargoBountyDatabaseComponent>(station, out var bountyDb))
             return;
 
-        _uiSystem.TrySetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(bountyDb.Bounties));
+        var untilNextSkip = bountyDb.NextSkipTime - _timing.CurTime;
+        _uiSystem.TrySetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(bountyDb.Bounties, untilNextSkip));
     }
 
     private void OnPrintLabelMessage(EntityUid uid, CargoBountyConsoleComponent component, BountyPrintLabelMessage args)
@@ -65,16 +68,48 @@ private void OnPrintLabelMessage(EntityUid uid, CargoBountyConsoleComponent comp
 
         var label = Spawn(component.BountyLabelId, Transform(uid).Coordinates);
         component.NextPrintTime = _timing.CurTime + component.PrintDelay;
-        SetupBountyLabel(label, bounty.Value);
+        SetupBountyLabel(label, station, bounty.Value);
         _audio.PlayPvs(component.PrintSound, uid);
     }
 
-    public void SetupBountyLabel(EntityUid uid, CargoBountyData bounty, PaperComponent? paper = null, CargoBountyLabelComponent? label = null)
+    private void OnSkipBountyMessage(EntityUid uid, CargoBountyConsoleComponent component, BountySkipMessage args)
+    {
+        if (_station.GetOwningStation(uid) is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var db))
+            return;
+
+        if (_timing.CurTime < db.NextSkipTime)
+            return;
+
+        if (!TryGetBountyFromId(station, args.BountyId, out var bounty))
+            return;
+
+        if (args.Session.AttachedEntity is not { Valid: true } mob)
+            return;
+
+        if (TryComp<AccessReaderComponent>(uid, out var accessReaderComponent) &&
+            !_accessReaderSystem.IsAllowed(mob, uid, accessReaderComponent))
+        {
+            _audio.PlayPvs(component.DenySound, uid);
+            return;
+        }
+
+        if (!TryRemoveBounty(station, bounty.Value))
+            return;
+
+        FillBountyDatabase(station);
+        db.NextSkipTime = _timing.CurTime + db.SkipDelay;
+        var untilNextSkip = db.NextSkipTime - _timing.CurTime;
+        _uiSystem.TrySetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties, untilNextSkip));
+        _audio.PlayPvs(component.SkipSound, uid);
+    }
+
+    public void SetupBountyLabel(EntityUid uid, EntityUid stationId, CargoBountyData bounty, PaperComponent? paper = null, CargoBountyLabelComponent? label = null)
     {
         if (!Resolve(uid, ref paper, ref label) || !_protoMan.TryIndex<CargoBountyPrototype>(bounty.Bounty, out var prototype))
             return;
 
         label.Id = bounty.Id;
+        label.AssociatedStationId = stationId;
         var msg = new FormattedMessage();
         msg.AddText(Loc.GetString("bounty-manifest-header", ("id", bounty.Id)));
         msg.PushNewline();
@@ -103,7 +138,7 @@ private void OnGetBountyPrice(EntityUid uid, CargoBountyLabelComponent component
         if (!_container.TryGetContainingContainer(uid, out var container) || container.ID != LabelSystem.ContainerName)
             return;
 
-        if (_station.GetOwningStation(uid) is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var database))
+        if (component.AssociatedStationId is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var database))
             return;
 
         if (database.CheckedBounties.Contains(component.Id))
@@ -131,14 +166,18 @@ private void OnSold(ref EntitySoldEvent args)
             if (!TryGetBountyLabel(sold, out _, out var component))
                 continue;
 
-            if (!TryGetBountyFromId(args.Station, component.Id, out var bounty))
+            if (component.AssociatedStationId is not { } station || !TryGetBountyFromId(station, component.Id, out var bounty))
+            {
                 continue;
+            }
 
             if (!IsBountyComplete(sold, bounty.Value))
+            {
                 continue;
+            }
 
-            TryRemoveBounty(args.Station, bounty.Value);
-            FillBountyDatabase(args.Station);
+            TryRemoveBounty(station, bounty.Value);
+            FillBountyDatabase(station);
             _adminLogger.Add(LogType.Action, LogImpact.Low, $"Bounty \"{bounty.Value.Bounty}\" (id:{bounty.Value.Id}) was fulfilled");
         }
     }
@@ -196,7 +235,7 @@ public void RerollBountyDatabase(Entity<StationCargoBountyDatabaseComponent?> en
         FillBountyDatabase(entity);
     }
 
-    public bool IsBountyComplete(EntityUid container, EntityUid? station, out HashSet<EntityUid> bountyEntities)
+    public bool IsBountyComplete(EntityUid container, out HashSet<EntityUid> bountyEntities)
     {
         if (!TryGetBountyLabel(container, out _, out var component))
         {
@@ -204,7 +243,7 @@ public bool IsBountyComplete(EntityUid container, EntityUid? station, out HashSe
             return false;
         }
 
-        station ??= _station.GetOwningStation(container);
+        var station = component.AssociatedStationId;
         if (station == null)
         {
             bountyEntities = new();
@@ -225,7 +264,7 @@ public bool IsBountyComplete(EntityUid container, CargoBountyData data)
         return IsBountyComplete(container, data, out _);
     }
 
-    public bool IsBountyComplete(EntityUid container, CargoBountyData data,  out HashSet<EntityUid> bountyEntities)
+    public bool IsBountyComplete(EntityUid container, CargoBountyData data, out HashSet<EntityUid> bountyEntities)
     {
         if (!_protoMan.TryIndex(data.Bounty, out var proto))
         {
@@ -314,7 +353,7 @@ private HashSet<EntityUid> GetBountyEntities(EntityUid uid)
                 var children = GetBountyEntities(ent);
                 foreach (var child in children)
                 {
-                 entities.Add(child);
+                    entities.Add(child);
                 }
             }
         }
@@ -425,7 +464,8 @@ public void UpdateBountyConsoles()
                 !TryComp<StationCargoBountyDatabaseComponent>(station, out var db))
                 continue;
 
-            _uiSystem.TrySetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties), ui: ui);
+            var untilNextSkip = db.NextSkipTime - _timing.CurTime;
+            _uiSystem.TrySetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties, untilNextSkip), ui: ui);
         }
     }
 
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index b8a491f4e89..0484e05ced1 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -255,9 +255,8 @@ private int GetCargoSpace(EntityUid gridUid)
 
     #region Station
 
-    private bool SellPallets(EntityUid gridUid, EntityUid? station, out double amount)
+    private bool SellPallets(EntityUid gridUid, out double amount)
     {
-        station ??= _station.GetOwningStation(gridUid);
         GetPalletGoods(gridUid, out var toSell, out amount);
 
         Log.Debug($"Cargo sold {toSell.Count} entities for {amount}");
@@ -265,11 +264,9 @@ private bool SellPallets(EntityUid gridUid, EntityUid? station, out double amoun
         if (toSell.Count == 0)
             return false;
 
-        if (station != null)
-        {
-            var ev = new EntitySoldEvent(station.Value, toSell);
-            RaiseLocalEvent(ref ev);
-        }
+
+        var ev = new EntitySoldEvent(toSell);
+        RaiseLocalEvent(ref ev);
 
         foreach (var ent in toSell)
         {
@@ -324,7 +321,7 @@ private bool CanSell(EntityUid uid, TransformComponent xform)
             return false;
         }
 
-        var complete = IsBountyComplete(uid, (EntityUid?) null, out var bountyEntities);
+        var complete = IsBountyComplete(uid, out var bountyEntities);
 
         // Recursively check for mobs at any point.
         var children = xform.ChildEnumerator;
@@ -357,7 +354,7 @@ private void OnPalletSale(EntityUid uid, CargoPalletConsoleComponent component,
             return;
         }
 
-        if (!SellPallets(gridUid, null, out var price))
+        if (!SellPallets(gridUid, out var price))
             return;
 
         var stackPrototype = _protoMan.Index<StackPrototype>(component.CashType);
@@ -449,4 +446,4 @@ private void SetupTradePost()
 /// deleted but after the price has been calculated.
 /// </summary>
 [ByRefEvent]
-public readonly record struct EntitySoldEvent(EntityUid Station, HashSet<EntityUid> Sold);
+public readonly record struct EntitySoldEvent(HashSet<EntityUid> Sold);
diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs
index 2609d06b55d..3d6fc964725 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -39,7 +39,6 @@ public sealed partial class CargoSystem : SharedCargoSystem
     [Dependency] private readonly PricingSystem _pricing = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
     [Dependency] private readonly ShuttleConsoleSystem _console = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly StationSystem _station = default!;
diff --git a/Content.Server/Cargo/Systems/PriceGunSystem.cs b/Content.Server/Cargo/Systems/PriceGunSystem.cs
index 7bd49b857ae..19fe07bd253 100644
--- a/Content.Server/Cargo/Systems/PriceGunSystem.cs
+++ b/Content.Server/Cargo/Systems/PriceGunSystem.cs
@@ -57,7 +57,7 @@ private void OnAfterInteract(EntityUid uid, PriceGunComponent component, AfterIn
             return;
 
         // Check if we're scanning a bounty crate
-        if (_bountySystem.IsBountyComplete(args.Target.Value, (EntityUid?) null, out _))
+        if (_bountySystem.IsBountyComplete(args.Target.Value, out _))
         {
             _popupSystem.PopupEntity(Loc.GetString("price-gun-bounty-complete"), args.User, args.User);
         }
diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index 6fb36c96083..9e1970d63c9 100644
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -12,7 +12,6 @@
 using Content.Shared.Stacks;
 using Robust.Shared.Console;
 using Robust.Shared.Containers;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -27,7 +26,6 @@ public sealed class PricingSystem : EntitySystem
 {
     [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly IConsoleHost _consoleHost = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly BodySystem _bodySystem = default!;
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index 6d54bedf86c..812aed80bd7 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -125,9 +125,23 @@ public void DispatchServerMessage(ICommonSession player, string message, bool su
                 _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Server message to {player:Player}: {message}");
         }
 
-        public void SendAdminAnnouncement(string message)
+        public void SendAdminAnnouncement(string message, AdminFlags? flagBlacklist, AdminFlags? flagWhitelist)
         {
-            var clients = _adminManager.ActiveAdmins.Select(p => p.Channel);
+            var clients = _adminManager.ActiveAdmins.Where(p =>
+            {
+                var adminData = _adminManager.GetAdminData(p);
+
+                DebugTools.AssertNotNull(adminData);
+
+                if (adminData == null)
+                    return false;
+
+                if (flagBlacklist != null && adminData.HasFlag(flagBlacklist.Value))
+                    return false;
+
+                return flagWhitelist == null || adminData.HasFlag(flagWhitelist.Value);
+
+            }).Select(p => p.Channel);
 
             var wrappedMessage = Loc.GetString("chat-manager-send-admin-announcement-wrap-message",
                 ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")), ("message", FormattedMessage.EscapeText(message)));
@@ -230,8 +244,7 @@ private void SendOOC(ICommonSession player, string message)
                 var prefs = _preferencesManager.GetPreferences(player.UserId);
                 colorOverride = prefs.AdminOOCColor;
             }
-            if (player.Channel.UserData.PatronTier is { } patron &&
-                     PatronOocColors.TryGetValue(patron, out var patronColor))
+            if (  _netConfigManager.GetClientCVar(player.Channel, CCVars.ShowOocPatronColor) && player.Channel.UserData.PatronTier is { } patron && PatronOocColors.TryGetValue(patron, out var patronColor))
             {
                 wrappedMessage = Loc.GetString("chat-manager-send-ooc-patron-wrap-message", ("patronColor", patronColor),("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
             }
diff --git a/Content.Server/Chat/Managers/IChatManager.cs b/Content.Server/Chat/Managers/IChatManager.cs
index e5fa8d5f4dc..59945bf5ca6 100644
--- a/Content.Server/Chat/Managers/IChatManager.cs
+++ b/Content.Server/Chat/Managers/IChatManager.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Administration;
 using Content.Shared.Chat;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
@@ -21,7 +22,7 @@ public interface IChatManager
         void TrySendOOCMessage(ICommonSession player, string message, OOCChatType type);
 
         void SendHookOOC(string sender, string message);
-        void SendAdminAnnouncement(string message);
+        void SendAdminAnnouncement(string message, AdminFlags? flagBlacklist = null, AdminFlags? flagWhitelist = null);
         void SendAdminAlert(string message);
         void SendAdminAlert(EntityUid player, string message);
 
diff --git a/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs b/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs
index 0f0365e56ba..11dcf42dfd7 100644
--- a/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs
+++ b/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs
@@ -1,10 +1,13 @@
 using Content.Server.Chat;
+using Content.Server.Announcements.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.Chat.Systems;
 
 public sealed class AnnounceOnSpawnSystem : EntitySystem
 {
     [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     public override void Initialize()
     {
@@ -15,8 +18,8 @@ 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";
-        _chat.DispatchGlobalAnnouncement(message, sender, playSound: true, comp.Sound, comp.Color);
+        _announcer.SendAnnouncement(_announcer.GetAnnouncementId("SpawnAnnounceCaptain"), Filter.Broadcast(),
+            comp.Message, sender, comp.Color);
     }
 }
diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
index 8bba76dadda..bd1b944db30 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -1,4 +1,5 @@
 using System.Collections.Frozen;
+using System.Linq;
 using Content.Shared.Chat.Prototypes;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -9,6 +10,7 @@ namespace Content.Server.Chat.Systems;
 public partial class ChatSystem
 {
     private FrozenDictionary<string, EmotePrototype> _wordEmoteDict = FrozenDictionary<string, EmotePrototype>.Empty;
+    private IReadOnlyList<string> Punctuation { get; } = new List<string> { ",", ".", "!", "?", "-", "~", "'", "\"", };
 
     protected override void OnPrototypeReload(PrototypesReloadedEventArgs obj)
     {
@@ -150,6 +152,10 @@ public bool TryPlayEmoteSound(EntityUid uid, EmoteSoundsPrototype? proto, string
     private void TryEmoteChatInput(EntityUid uid, string textInput)
     {
         var actionLower = textInput.ToLower();
+        // Replace ending punctuation with nothing
+        if (Punctuation.Any(punctuation => actionLower.EndsWith(punctuation)))
+            actionLower = actionLower.Remove(actionLower.Length - 1);
+
         if (!_wordEmoteDict.TryGetValue(actionLower, out var emote))
             return;
 
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 7eecaa32b43..978fd206210 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -241,6 +241,17 @@ public void TrySendInGameICMessage(
         if (string.IsNullOrEmpty(message))
             return;
 
+        // Check if the message is in sign language
+        if (desiredType == InGameICChatType.Speak || desiredType == InGameICChatType.Whisper)
+        {
+            var language = languageOverride ?? _language.GetLanguage(source);
+            if (language.SignLanguage ?? false)
+            {
+                SendEntityEmote(source, message, range, nameOverride, ignoreActionBlocker, signLanguage: true, languageOverride: languageOverride);
+                return;
+            }
+        }
+
         // This message may have a radio prefix, and should then be whispered to the resolved radio channel
         if (checkRadioPrefix)
         {
@@ -423,11 +434,11 @@ private void SendEntitySpeak(
 
         name = FormattedMessage.EscapeText(name);
         // The chat message wrapped in a "x says y" string
-        var wrappedMessage = WrapPublicMessage(source, name, message);
+        var wrappedMessage = WrapPublicMessage(source, name, message, languageOverride: language);
         // The chat message obfuscated via language obfuscation
         var obfuscated = SanitizeInGameICMessage(source, _language.ObfuscateSpeech(message, language), out var emoteStr, true, _configurationManager.GetCVar(CCVars.ChatPunctuation), (!CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Parent.Name == "en") || (CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Name == "en"));
         // The language-obfuscated message wrapped in a "x says y" string
-        var wrappedObfuscated = WrapPublicMessage(source, name, obfuscated);
+        var wrappedObfuscated = WrapPublicMessage(source, name, obfuscated, languageOverride: language);
 
         SendInVoiceRange(ChatChannel.Local, name, message, wrappedMessage, obfuscated, wrappedObfuscated, source, range, languageOverride: language);
 
@@ -494,15 +505,18 @@ private void SendEntityWhisper(
         var language = languageOverride ?? _language.GetLanguage(source);
         var languageObfuscatedMessage = SanitizeInGameICMessage(source, _language.ObfuscateSpeech(message, language), out var emoteStr, true, _configurationManager.GetCVar(CCVars.ChatPunctuation), (!CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Parent.Name == "en") || (CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Name == "en"));
 
-        foreach (var (session, data) in GetRecipients(source, WhisperMuffledRange))
+        foreach (var (session, data) in GetRecipients(source, Transform(source).GridUid == null ? 0.3f : WhisperMuffledRange))
         {
             if (session.AttachedEntity is not { Valid: true } listener)
                 continue;
 
+            if (Transform(session.AttachedEntity.Value).GridUid != Transform(source).GridUid)
+                continue;
+
             if (MessageRangeCheck(session, data, range) != MessageRangeCheckResult.Full)
                 continue; // Won't get logged to chat, and ghosts are too far away to see the pop-up, so we just won't send it to them.
 
-            var canUnderstandLanguage = _language.CanUnderstand(listener, language);
+            var canUnderstandLanguage = _language.CanUnderstand(listener, language.ID);
             // How the entity perceives the message depends on whether it can understand its language
             var perceivedMessage = canUnderstandLanguage ? message : languageObfuscatedMessage;
 
@@ -514,6 +528,7 @@ private void SendEntityWhisper(
                 // Scenario 1: the listener can clearly understand the message
                 result = perceivedMessage;
                 wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
+                    ("color", language.Color ?? Color.Gray),
                     ("entityName", name),
                     ("message", FormattedMessage.EscapeText(result)));
             }
@@ -523,13 +538,14 @@ private void SendEntityWhisper(
                 // Collisiongroup.Opaque is not ideal for this use. Preferably, there should be a check specifically with "Can Ent1 see Ent2" in mind
                 result = ObfuscateMessageReadability(perceivedMessage);
                 wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
-                    ("entityName", nameIdentity), ("message", FormattedMessage.EscapeText(result)));
+                    ("entityName", nameIdentity), ("color", language.Color ?? Color.Gray), ("message", FormattedMessage.EscapeText(result)));
             }
             else
             {
                 // Scenario 3: If listener is too far and has no line of sight, they can't identify the whisperer's identity
                 result = ObfuscateMessageReadability(perceivedMessage);
                 wrappedMessage = Loc.GetString("chat-manager-entity-whisper-unknown-wrap-message",
+                    ("color", language.Color ?? Color.Gray),
                     ("message", FormattedMessage.EscapeText(result)));
             }
 
@@ -537,6 +553,7 @@ private void SendEntityWhisper(
         }
 
         var replayWrap = Loc.GetString("chat-manager-entity-whisper-wrap-message",
+            ("color", language.Color ?? Color.Gray),
             ("entityName", name),
             ("message", FormattedMessage.EscapeText(message)));
         _replay.RecordServerMessage(new ChatMessage(ChatChannel.Whisper, message, replayWrap, GetNetEntity(source), null, MessageRangeHideChatForReplay(range)));
@@ -570,7 +587,9 @@ private void SendEntityEmote(
         bool hideLog = false,
         bool checkEmote = true,
         bool ignoreActionBlocker = false,
-        NetUserId? author = null
+        NetUserId? author = null,
+        LanguagePrototype? languageOverride = null,
+        bool? signLanguage = false
         )
     {
         if (!_actionBlocker.CanEmote(source) && !ignoreActionBlocker)
@@ -580,15 +599,32 @@ private void SendEntityEmote(
         var ent = Identity.Entity(source, EntityManager);
         string name = FormattedMessage.EscapeText(nameOverride ?? Name(ent));
 
+        var language = languageOverride ?? _language.GetLanguage(source);
+
         // Emotes use Identity.Name, since it doesn't actually involve your voice at all.
-        var wrappedMessage = Loc.GetString("chat-manager-entity-me-wrap-message",
-            ("entityName", name),
-            ("entity", ent),
-            ("message", FormattedMessage.RemoveMarkup(action)));
+        var wrappedMessage = "";
+        var obfuscatedWrappedMessage = "";
+        if (signLanguage == true)
+        {
+            wrappedMessage = Loc.GetString("entity-signlanguage-message",
+                ("entityName", name),
+                ("message", FormattedMessage.EscapeText(action)));
+
+            obfuscatedWrappedMessage = Loc.GetString(_language.ObfuscateSpeech(action, language),
+                ("entityName", name));
+        }
+        else
+        {
+            wrappedMessage = Loc.GetString("chat-manager-entity-me-wrap-message",
+                ("entityName", name),
+                ("entity", ent),
+                ("message", FormattedMessage.RemoveMarkup(action)));
+
+        }
 
         if (checkEmote)
             TryEmoteChatInput(source, action);
-        SendInVoiceRange(ChatChannel.Emotes, name, action, wrappedMessage, obfuscated: "", obfuscatedWrappedMessage: "", source, range, author);
+        SendInVoiceRange(ChatChannel.Emotes, name, action, wrappedMessage, obfuscated: "", obfuscatedWrappedMessage, source, range, author, signLanguage: true);
         if (!hideLog)
             if (name != Name(source))
                 _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Emote from {ToPrettyString(source):user} as {name}: {action}");
@@ -702,11 +738,14 @@ private MessageRangeCheckResult MessageRangeCheck(ICommonSession session, ICChat
     /// <summary>
     ///     Sends a chat message to the given players in range of the source entity.
     /// </summary>
-    private void SendInVoiceRange(ChatChannel channel, string name, string message, string wrappedMessage, string obfuscated, string obfuscatedWrappedMessage, EntityUid source, ChatTransmitRange range, NetUserId? author = null, LanguagePrototype? languageOverride = null)
+    private void SendInVoiceRange(ChatChannel channel, string name, string message, string wrappedMessage, string obfuscated, string obfuscatedWrappedMessage, EntityUid source, ChatTransmitRange range, NetUserId? author = null, LanguagePrototype? languageOverride = null, bool? signLanguage = false)
     {
         var language = languageOverride ?? _language.GetLanguage(source);
-        foreach (var (session, data) in GetRecipients(source, VoiceRange))
+        foreach (var (session, data) in GetRecipients(source, Transform(source).GridUid == null ? 0.3f : VoiceRange))
         {
+            if (session.AttachedEntity != null && Transform(session.AttachedEntity.Value).GridUid != Transform(source).GridUid)
+                continue;
+
             var entRange = MessageRangeCheck(session, data, range);
             if (entRange == MessageRangeCheckResult.Disallowed)
                 continue;
@@ -715,9 +754,17 @@ private void SendInVoiceRange(ChatChannel channel, string name, string message,
                 continue;
             EntityUid listener = session.AttachedEntity.Value;
 
+            // Quickly Checking if the Emote is a real one or Sign Language.
+            var notSignLanguage = false;
+            if (channel == ChatChannel.Emotes)
+            {
+                notSignLanguage = true;
+                if (signLanguage == true)
+                    notSignLanguage = false;
+            }
 
             // If the channel does not support languages, or the entity can understand the message, send the original message, otherwise send the obfuscated version
-            if (channel == ChatChannel.LOOC || channel == ChatChannel.Emotes || _language.CanUnderstand(listener, language))
+            if (channel == ChatChannel.LOOC || notSignLanguage || _language.CanUnderstand(listener, language.ID))
             {
                 _chatManager.ChatMessageToOne(channel, message, wrappedMessage, source, entHideChat, session.Channel, author: author);
             }
@@ -837,16 +884,17 @@ public string SanitizeMessageReplaceWords(string message)
     /// <summary>
     ///     Wraps a message sent by the specified entity into an "x says y" string.
     /// </summary>
-    public string WrapPublicMessage(EntityUid source, string name, string message)
+    public string WrapPublicMessage(EntityUid source, string name, string message, LanguagePrototype? languageOverride = null)
     {
+        var language = languageOverride ?? _language.GetLanguage(source);
         var speech = GetSpeechVerb(source, message);
-        var verbName = Loc.GetString(_random.Pick(speech.SpeechVerbStrings));
         return Loc.GetString(speech.Bold ? "chat-manager-entity-say-bold-wrap-message" : "chat-manager-entity-say-wrap-message",
+            ("color", language.Color ?? Color.White),
             ("entityName", name),
-            ("verb", verbName),
-            ("fontType", speech.FontId),
-            ("fontSize", speech.FontSize),
-            ("message", FormattedMessage.EscapeText(message)));
+            ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
+            ("fontType", language.FontId ?? speech.FontId),
+            ("fontSize", language.FontSize ?? speech.FontSize),
+            ("message", message));
     }
 
     /// <summary>
diff --git a/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs b/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs
new file mode 100644
index 00000000000..708c1ef0052
--- /dev/null
+++ b/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs
@@ -0,0 +1,60 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
+
+namespace Content.Server.Chemistry.Components;
+
+/// <summary>
+/// Base class for components that inject a solution into a target's bloodstream in response to an event.
+/// </summary>
+public abstract partial class BaseSolutionInjectOnEventComponent : Component
+{
+    /// <summary>
+    /// How much solution to remove from this entity per target when transferring.
+    /// </summary>
+    /// <remarks>
+    /// Note that this amount is per target, so the total amount removed will be
+    /// multiplied by the number of targets hit.
+    /// </remarks>
+    [DataField]
+    public FixedPoint2 TransferAmount = FixedPoint2.New(1);
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
+
+    /// <summary>
+    /// Proportion of the <see cref="TransferAmount"/> that will actually be injected
+    /// into the target's bloodstream. The rest is lost.
+    /// 0 means none of the transferred solution will enter the bloodstream.
+    /// 1 means the entire amount will enter the bloodstream.
+    /// </summary>
+    [DataField("transferEfficiency")]
+    private float _transferEfficiency = 1f;
+
+    /// <summary>
+    /// Solution to inject from.
+    /// </summary>
+    [DataField]
+    public string Solution = "default";
+
+    /// <summary>
+    /// Whether this will inject through hardsuits or not.
+    /// </summary>
+    [DataField]
+    public bool PierceArmor = true;
+
+    /// <summary>
+    /// Contents of popup message to display to the attacker when injection
+    /// fails due to the target wearing a hardsuit.
+    /// </summary>
+    /// <remarks>
+    /// Passed values: $weapon and $target
+    /// </remarks>
+    [DataField]
+    public LocId BlockedByHardsuitPopupMessage = "melee-inject-failed-hardsuit";
+
+    /// <summary>
+    /// If anything covers any of these slots then the injection fails.
+    /// </summary>
+    [DataField]
+    public SlotFlags BlockSlots = SlotFlags.NONE;
+}
diff --git a/Content.Server/Chemistry/Components/HyposprayComponent.cs b/Content.Server/Chemistry/Components/HyposprayComponent.cs
deleted file mode 100644
index 2a80cec801b..00000000000
--- a/Content.Server/Chemistry/Components/HyposprayComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Audio;
-
-namespace Content.Server.Chemistry.Components
-{
-    [RegisterComponent]
-    public sealed partial class HyposprayComponent : SharedHyposprayComponent
-    {
-        // TODO: This should be on clumsycomponent.
-        [DataField("clumsyFailChance")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float ClumsyFailChance = 0.5f;
-
-        [DataField("transferAmount")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public FixedPoint2 TransferAmount = FixedPoint2.New(5);
-
-        [DataField("injectSound")]
-        public SoundSpecifier InjectSound = new SoundPathSpecifier("/Audio/Items/hypospray.ogg");
-
-        /// <summary>
-        /// Whether or not the hypo is able to inject only into mobs. On false you can inject into beakers/jugs
-        /// </summary>
-        [DataField("onlyMobs")]
-        public bool OnlyMobs = true;
-    }
-}
diff --git a/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs b/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
index 6b6ce830a96..6b64b82f787 100644
--- a/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
+++ b/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
@@ -1,31 +1,8 @@
-using Content.Shared.FixedPoint;
-
-namespace Content.Server.Chemistry.Components
-{
-    [RegisterComponent]
-    public sealed partial class MeleeChemicalInjectorComponent : Component
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("transferAmount")]
-        public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(1);
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
-
-        [DataField("transferEfficiency")]
-        private float _transferEfficiency = 1f;
-
-        /// <summary>
-        /// Whether this will inject through hardsuits or not.
-        /// </summary>
-        [DataField("pierceArmor"), ViewVariables(VVAccess.ReadWrite)]
-        public bool PierceArmor = true;
-
-        /// <summary>
-        ///     Solution to inject from.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("solution")]
-        public string Solution { get; set; } = "default";
-    }
-}
+namespace Content.Server.Chemistry.Components;
+
+/// <summary>
+/// Used for melee weapon entities that should try to inject a
+/// contained solution into a target when used to hit it.
+/// </summary>
+[RegisterComponent]
+public sealed partial class MeleeChemicalInjectorComponent : BaseSolutionInjectOnEventComponent { }
diff --git a/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs b/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs
deleted file mode 100644
index 76bb5294bce..00000000000
--- a/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.FixedPoint;
-using Content.Shared.Inventory;
-using Content.Shared.Projectiles;
-
-namespace Content.Server.Chemistry.Components;
-
-/// <summary>
-/// On colliding with an entity that has a bloodstream will dump its solution onto them.
-/// </summary>
-[RegisterComponent]
-public sealed partial class SolutionInjectOnCollideComponent : Component
-{
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("transferAmount")]
-    public FixedPoint2 TransferAmount = FixedPoint2.New(1);
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
-
-    [DataField("transferEfficiency")]
-    private float _transferEfficiency = 1f;
-
-    /// <summary>
-    /// If anything covers any of these slots then the injection fails.
-    /// </summary>
-    [DataField("blockSlots"), ViewVariables(VVAccess.ReadWrite)]
-    public SlotFlags BlockSlots = SlotFlags.MASK;
-}
diff --git a/Content.Server/Chemistry/Components/SolutionInjectOnEmbedComponent.cs b/Content.Server/Chemistry/Components/SolutionInjectOnEmbedComponent.cs
new file mode 100644
index 00000000000..241da38045c
--- /dev/null
+++ b/Content.Server/Chemistry/Components/SolutionInjectOnEmbedComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server.Chemistry.Components;
+
+/// <summary>
+/// Used for embeddable entities that should try to inject a
+/// contained solution into a target when they become embedded in it.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SolutionInjectOnEmbedComponent : BaseSolutionInjectOnEventComponent { }
diff --git a/Content.Server/Chemistry/Components/SolutionInjectOnProjectileHitComponent.cs b/Content.Server/Chemistry/Components/SolutionInjectOnProjectileHitComponent.cs
new file mode 100644
index 00000000000..395a075298b
--- /dev/null
+++ b/Content.Server/Chemistry/Components/SolutionInjectOnProjectileHitComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server.Chemistry.Components;
+
+/// <summary>
+/// Used for projectile entities that should try to inject a
+/// contained solution into a target when they hit it.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SolutionInjectOnProjectileHitComponent : BaseSolutionInjectOnEventComponent { }
diff --git a/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs b/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs
index 7926121c2b3..755312554c2 100644
--- a/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs
+++ b/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs
@@ -4,7 +4,6 @@
 using Content.Shared.FixedPoint;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
-using Robust.Shared.Network;
 using Robust.Shared.Utility;
 using System.Numerics;
 
@@ -12,8 +11,6 @@ namespace Content.Server.Chemistry.Containers.EntitySystems;
 
 public sealed partial class SolutionContainerSystem : SharedSolutionContainerSystem
 {
-    [Dependency] private readonly INetManager _netManager = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -152,12 +149,12 @@ private Entity<SolutionComponent, ContainedSolutionComponent> SpawnSolutionUnini
         var relation = new ContainedSolutionComponent() { Container = container.Owner, ContainerName = name };
         AddComp(uid, relation);
 
+        MetaData.SetEntityName(uid, $"solution - {name}");
         ContainerSystem.Insert(uid, container, force: true);
 
         return (uid, solution, relation);
     }
 
-
     #region Event Handlers
 
     private void OnMapInit(Entity<SolutionContainerManagerComponent> entity, ref MapInitEvent args)
diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
deleted file mode 100644
index c4f22dc63aa..00000000000
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Server.Administration.Logs;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Interaction;
-using Content.Server.Popups;
-using Content.Shared.Chemistry;
-using Robust.Shared.Audio.Systems;
-
-namespace Content.Server.Chemistry.EntitySystems;
-
-public sealed partial class ChemistrySystem : EntitySystem
-{
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IEntityManager _entMan = default!;
-    [Dependency] private readonly InteractionSystem _interaction = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutionContainers = default!;
-
-    public override void Initialize()
-    {
-        // Why ChemMaster duplicates reagentdispenser nobody knows.
-        InitializeHypospray();
-        InitializeMixing();
-    }
-}
diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystemHypospray.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystemHypospray.cs
deleted file mode 100644
index abf0c1697f7..00000000000
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystemHypospray.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Content.Server.Body.Components;
-using Content.Shared.DoAfter;
-using Content.Shared.FixedPoint;
-using Content.Shared.Forensics;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Timing;
-using Content.Shared.Weapons.Melee.Events;
-using Robust.Shared.GameStates;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-
-namespace Content.Server.Chemistry.EntitySystems
-{
-    public sealed partial class ChemistrySystem
-    {
-        [Dependency] private readonly UseDelaySystem _useDelay = default!;
-        [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-
-        private void InitializeHypospray()
-        {
-            SubscribeLocalEvent<HyposprayComponent, AfterInteractEvent>(OnAfterInteract);
-            SubscribeLocalEvent<HyposprayComponent, MeleeHitEvent>(OnAttack);
-            SubscribeLocalEvent<HyposprayComponent, SolutionContainerChangedEvent>(OnSolutionChange);
-            SubscribeLocalEvent<HyposprayComponent, UseInHandEvent>(OnUseInHand);
-            SubscribeLocalEvent<HyposprayComponent, ComponentGetState>(OnHypoGetState);
-            SubscribeLocalEvent<HyposprayComponent, HyposprayDoAfterEvent>(HyposprayDoAfter);
-        }
-
-        private void OnHypoGetState(Entity<HyposprayComponent> entity, ref ComponentGetState args)
-        {
-            args.State = _solutionContainers.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out _, out var solution)
-                ? new HyposprayComponentState(solution.Volume, solution.MaxVolume)
-                : new HyposprayComponentState(FixedPoint2.Zero, FixedPoint2.Zero);
-        }
-
-        private void OnUseInHand(Entity<HyposprayComponent> entity, ref UseInHandEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            TryDoInject(entity, args.User, args.User);
-            args.Handled = true;
-        }
-
-        private void OnSolutionChange(Entity<HyposprayComponent> entity, ref SolutionContainerChangedEvent args)
-        {
-            Dirty(entity);
-        }
-
-        public void OnAfterInteract(Entity<HyposprayComponent> entity, ref AfterInteractEvent args)
-        {
-            if (!args.CanReach)
-                return;
-
-            var target = args.Target;
-            var user = args.User;
-
-            if (target != user && HasComp<BloodstreamComponent>(target))
-            {
-                _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(1), new HyposprayDoAfterEvent(), entity.Owner, target: target, used: user)
-                {
-                    BreakOnUserMove = true,
-                    BreakOnDamage = true,
-                    BreakOnTargetMove = true,
-                    MovementThreshold = 0.1f,
-                });
-            }
-            else
-            {
-                TryDoInject(entity, target, user);
-            }
-        }
-        
-         private void HyposprayDoAfter(Entity<HyposprayComponent> entity, ref HyposprayDoAfterEvent args)
-         {
-            if (args.Cancelled || args.Handled || args.Args.Target == null)
-            return;
-            TryDoInject(entity, args.Args.Target.Value, args.Args.User);
-            args.Handled = true;
-         }
-
-        public void OnAttack(Entity<HyposprayComponent> entity, ref MeleeHitEvent args)
-        {
-            if (!args.HitEntities.Any())
-                return;
-
-            TryDoInject(entity, args.HitEntities.First(), args.User);
-        }
-
-        public bool TryDoInject(Entity<HyposprayComponent> hypo, EntityUid? target, EntityUid user)
-        {
-            var (uid, component) = hypo;
-
-            if (!EligibleEntity(target, _entMan, component))
-                return false;
-
-            if (TryComp(uid, out UseDelayComponent? delayComp))
-            {
-                if (_useDelay.IsDelayed((uid, delayComp)))
-                    return false;
-            }
-
-
-            string? msgFormat = null;
-
-            if (target == user)
-                msgFormat = "hypospray-component-inject-self-message";
-            else if (EligibleEntity(user, _entMan, component) && _interaction.TryRollClumsy(user, component.ClumsyFailChance))
-            {
-                msgFormat = "hypospray-component-inject-self-clumsy-message";
-                target = user;
-            }
-
-            if (!_solutionContainers.TryGetSolution(uid, component.SolutionName, out var hypoSpraySoln, out var hypoSpraySolution) || hypoSpraySolution.Volume == 0)
-            {
-                _popup.PopupCursor(Loc.GetString("hypospray-component-empty-message"), user);
-                return true;
-            }
-
-            if (!_solutionContainers.TryGetInjectableSolution(target.Value, out var targetSoln, out var targetSolution))
-            {
-                _popup.PopupCursor(Loc.GetString("hypospray-cant-inject", ("target", Identity.Entity(target.Value, _entMan))), user);
-                return false;
-            }
-
-            _popup.PopupCursor(Loc.GetString(msgFormat ?? "hypospray-component-inject-other-message", ("other", target)), user);
-
-            if (target != user)
-            {
-                _popup.PopupEntity(Loc.GetString("hypospray-component-feel-prick-message"), target.Value, target.Value);
-                // TODO: This should just be using melee attacks...
-                // meleeSys.SendLunge(angle, user);
-            }
-
-            _audio.PlayPvs(component.InjectSound, user);
-
-            // Medipens and such use this system and don't have a delay, requiring extra checks
-            // BeginDelay function returns if item is already on delay
-            if (delayComp != null)
-                _useDelay.TryResetDelay((uid, delayComp));
-
-            // Get transfer amount. May be smaller than component.TransferAmount if not enough room
-            var realTransferAmount = FixedPoint2.Min(component.TransferAmount, targetSolution.AvailableVolume);
-
-            if (realTransferAmount <= 0)
-            {
-                _popup.PopupCursor(Loc.GetString("hypospray-component-transfer-already-full-message", ("owner", target)), user);
-                return true;
-            }
-
-            // Move units from attackSolution to targetSolution
-            var removedSolution = _solutionContainers.SplitSolution(hypoSpraySoln.Value, realTransferAmount);
-
-            if (!targetSolution.CanAddSolution(removedSolution))
-                return true;
-            _reactiveSystem.DoEntityReaction(target.Value, removedSolution, ReactionMethod.Injection);
-            _solutionContainers.TryAddSolution(targetSoln.Value, removedSolution);
-
-            var ev = new TransferDnaEvent { Donor = target.Value, Recipient = uid };
-            RaiseLocalEvent(target.Value, ref ev);
-
-            // same LogType as syringes...
-            _adminLogger.Add(LogType.ForceFeed, $"{_entMan.ToPrettyString(user):user} injected {_entMan.ToPrettyString(target.Value):target} with a solution {SolutionContainerSystem.ToPrettyString(removedSolution):removedSolution} using a {_entMan.ToPrettyString(uid):using}");
-
-            return true;
-        }
-
-        static bool EligibleEntity([NotNullWhen(true)] EntityUid? entity, IEntityManager entMan, HyposprayComponent component)
-        {
-            // TODO: Does checking for BodyComponent make sense as a "can be hypospray'd" tag?
-            // In SS13 the hypospray ONLY works on mobs, NOT beakers or anything else.
-            // But this is 14, we dont do what SS13 does just because SS13 does it.
-            return component.OnlyMobs
-                ? entMan.HasComponent<SolutionContainerManagerComponent>(entity) &&
-                  entMan.HasComponent<MobStateComponent>(entity)
-                : entMan.HasComponent<SolutionContainerManagerComponent>(entity);
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystemMixer.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystemMixer.cs
deleted file mode 100644
index 0230671ec98..00000000000
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystemMixer.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Chemistry.Reaction;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-
-namespace Content.Server.Chemistry.EntitySystems;
-
-public sealed partial class ChemistrySystem
-{
-    public void InitializeMixing()
-    {
-        SubscribeLocalEvent<ReactionMixerComponent, AfterInteractEvent>(OnAfterInteract);
-    }
-
-    private void OnAfterInteract(Entity<ReactionMixerComponent> entity, ref AfterInteractEvent args)
-    {
-        if (!args.Target.HasValue || !args.CanReach)
-            return;
-
-        var mixAttemptEvent = new MixingAttemptEvent(entity);
-        RaiseLocalEvent(entity, ref mixAttemptEvent);
-        if (mixAttemptEvent.Cancelled)
-        {
-            return;
-        }
-
-        if (!_solutionContainers.TryGetMixableSolution(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);
-
-        _solutionContainers.UpdateChemicals(solution.Value, true, entity.Comp);
-
-        var afterMixingEvent = new AfterMixingEvent(entity, args.Target.Value);
-        RaiseLocalEvent(entity, afterMixingEvent);
-    }
-}
diff --git a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
new file mode 100644
index 00000000000..dfbe45c035b
--- /dev/null
+++ b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
@@ -0,0 +1,197 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.Forensics;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Timing;
+using Content.Shared.Weapons.Melee.Events;
+using Content.Server.Interaction;
+using Content.Server.Body.Components;
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Robust.Shared.GameStates;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Robust.Server.Audio;
+
+namespace Content.Server.Chemistry.EntitySystems;
+
+public sealed class HypospraySystem : SharedHypospraySystem
+{
+    [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly InteractionSystem _interaction = default!;
+    [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HyposprayComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<HyposprayComponent, MeleeHitEvent>(OnAttack);
+        SubscribeLocalEvent<HyposprayComponent, UseInHandEvent>(OnUseInHand);
+    }
+
+    private void UseHypospray(Entity<HyposprayComponent> entity, EntityUid target, EntityUid user)
+    {
+        // if target is ineligible but is a container, try to draw from the container
+        if (!EligibleEntity(target, EntityManager, entity)
+            && _solutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
+        {
+            TryDraw(entity, target, drawableSolution.Value, user);
+        }
+
+        TryDoInject(entity, target, user);
+    }
+
+    private void OnUseInHand(Entity<HyposprayComponent> entity, ref UseInHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        TryDoInject(entity, args.User, args.User);
+        args.Handled = true;
+    }
+
+    public void OnAfterInteract(Entity<HyposprayComponent> entity, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach || args.Target == null)
+            return;
+
+        UseHypospray(entity, args.Target.Value, args.User);
+        args.Handled = true;
+    }
+
+    public void OnAttack(Entity<HyposprayComponent> entity, ref MeleeHitEvent args)
+    {
+        if (!args.HitEntities.Any())
+            return;
+
+        TryDoInject(entity, args.HitEntities.First(), args.User);
+    }
+
+    public bool TryDoInject(Entity<HyposprayComponent> entity, EntityUid target, EntityUid user)
+    {
+        var (uid, component) = entity;
+
+        if (!EligibleEntity(target, EntityManager, component))
+            return false;
+
+        if (TryComp(uid, out UseDelayComponent? delayComp))
+        {
+            if (_useDelay.IsDelayed((uid, delayComp)))
+                return false;
+        }
+
+        string? msgFormat = null;
+
+        if (target == user)
+            msgFormat = "hypospray-component-inject-self-message";
+        else if (EligibleEntity(user, EntityManager, component) && _interaction.TryRollClumsy(user, component.ClumsyFailChance))
+        {
+            msgFormat = "hypospray-component-inject-self-clumsy-message";
+            target = user;
+        }
+
+        if (!_solutionContainers.TryGetSolution(uid, component.SolutionName, out var hypoSpraySoln, out var hypoSpraySolution) || hypoSpraySolution.Volume == 0)
+        {
+            _popup.PopupEntity(Loc.GetString("hypospray-component-empty-message"), target, user);
+            return true;
+        }
+
+        if (!_solutionContainers.TryGetInjectableSolution(target, out var targetSoln, out var targetSolution))
+        {
+            _popup.PopupEntity(Loc.GetString("hypospray-cant-inject", ("target", Identity.Entity(target, EntityManager))), target, user);
+            return false;
+        }
+
+        _popup.PopupEntity(Loc.GetString(msgFormat ?? "hypospray-component-inject-other-message", ("other", target)), target, user);
+
+        if (target != user)
+        {
+            _popup.PopupEntity(Loc.GetString("hypospray-component-feel-prick-message"), target, target);
+            // TODO: This should just be using melee attacks...
+            // meleeSys.SendLunge(angle, user);
+        }
+
+        _audio.PlayPvs(component.InjectSound, user);
+
+        // Medipens and such use this system and don't have a delay, requiring extra checks
+        // BeginDelay function returns if item is already on delay
+        if (delayComp != null)
+            _useDelay.TryResetDelay((uid, delayComp));
+
+        // Get transfer amount. May be smaller than component.TransferAmount if not enough room
+        var realTransferAmount = FixedPoint2.Min(component.TransferAmount, targetSolution.AvailableVolume);
+
+        if (realTransferAmount <= 0)
+        {
+            _popup.PopupEntity(Loc.GetString("hypospray-component-transfer-already-full-message", ("owner", target)), target, user);
+            return true;
+        }
+
+        // Move units from attackSolution to targetSolution
+        var removedSolution = _solutionContainers.SplitSolution(hypoSpraySoln.Value, realTransferAmount);
+
+        if (!targetSolution.CanAddSolution(removedSolution))
+            return true;
+        _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
+        _solutionContainers.TryAddSolution(targetSoln.Value, removedSolution);
+
+        var ev = new TransferDnaEvent { Donor = target, Recipient = uid };
+        RaiseLocalEvent(target, ref ev);
+
+        // same LogType as syringes...
+        _adminLogger.Add(LogType.ForceFeed, $"{EntityManager.ToPrettyString(user):user} injected {EntityManager.ToPrettyString(target):target} with a solution {SolutionContainerSystem.ToPrettyString(removedSolution):removedSolution} using a {EntityManager.ToPrettyString(uid):using}");
+
+        return true;
+    }
+
+    private void TryDraw(Entity<HyposprayComponent> entity, Entity<BloodstreamComponent?> target, Entity<SolutionComponent> targetSolution, EntityUid user)
+    {
+        if (!_solutionContainers.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln,
+                out var solution) || solution.AvailableVolume == 0)
+        {
+            return;
+        }
+
+        // Get transfer amount. May be smaller than _transferAmount if not enough room, also make sure there's room in the injector
+        var realTransferAmount = FixedPoint2.Min(entity.Comp.TransferAmount, targetSolution.Comp.Solution.Volume,
+            solution.AvailableVolume);
+
+        if (realTransferAmount <= 0)
+        {
+            _popup.PopupEntity(
+                Loc.GetString("injector-component-target-is-empty-message",
+                    ("target", Identity.Entity(target, EntityManager))),
+                entity.Owner, user);
+            return;
+        }
+
+        var removedSolution = _solutionContainers.Draw(target.Owner, targetSolution, realTransferAmount);
+
+        if (!_solutionContainers.TryAddSolution(soln.Value, removedSolution))
+        {
+            return;
+        }
+
+        _popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
+            ("amount", removedSolution.Volume),
+            ("target", Identity.Entity(target, EntityManager))), entity.Owner, user);
+    }
+
+    private bool EligibleEntity(EntityUid entity, IEntityManager entMan, HyposprayComponent component)
+    {
+        // TODO: Does checking for BodyComponent make sense as a "can be hypospray'd" tag?
+        // In SS13 the hypospray ONLY works on mobs, NOT beakers or anything else.
+        // But this is 14, we dont do what SS13 does just because SS13 does it.
+        return component.OnlyAffectsMobs
+            ? entMan.HasComponent<SolutionContainerManagerComponent>(entity) &&
+              entMan.HasComponent<MobStateComponent>(entity)
+            : entMan.HasComponent<SolutionContainerManagerComponent>(entity);
+    }
+}
diff --git a/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs b/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
new file mode 100644
index 00000000000..032374d4a55
--- /dev/null
+++ b/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Server.Popups;
+
+namespace Content.Server.Chemistry.EntitySystems;
+
+public sealed partial class ReactionMixerSystem : EntitySystem
+{
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly SolutionContainerSystem _solutionContainers = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ReactionMixerComponent, AfterInteractEvent>(OnAfterInteract);
+    }
+
+    private void OnAfterInteract(Entity<ReactionMixerComponent> entity, ref AfterInteractEvent args)
+    {
+        if (!args.Target.HasValue || !args.CanReach)
+            return;
+
+        var mixAttemptEvent = new MixingAttemptEvent(entity);
+        RaiseLocalEvent(entity, ref mixAttemptEvent);
+        if (mixAttemptEvent.Cancelled)
+        {
+            return;
+        }
+
+        if (!_solutionContainers.TryGetMixableSolution(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);
+
+        _solutionContainers.UpdateChemicals(solution.Value, true, entity.Comp);
+
+        var afterMixingEvent = new AfterMixingEvent(entity, args.Target.Value);
+        RaiseLocalEvent(entity, afterMixingEvent);
+    }
+}
diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
index b93498fe31b..d6433da56a0 100644
--- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
@@ -1,12 +1,12 @@
-using Content.Server.Administration.Logs;
 using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Nutrition.EntitySystems;
+using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Dispenser;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.FixedPoint;
+using Content.Shared.Nutrition.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
@@ -30,7 +30,6 @@ public sealed class ReagentDispenserSystem : EntitySystem
         [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
         [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly OpenableSystem _openable = default!;
 
         public override void Initialize()
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
deleted file mode 100644
index fb84aca3e41..00000000000
--- a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.Inventory;
-using Content.Shared.Projectiles;
-
-namespace Content.Server.Chemistry.EntitySystems;
-
-public sealed class SolutionInjectOnCollideSystem : EntitySystem
-{
-    [Dependency] private readonly SolutionContainerSystem _solutionContainersSystem = default!;
-    [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
-    [Dependency] private readonly InventorySystem _inventorySystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<SolutionInjectOnCollideComponent, ProjectileHitEvent>(HandleInjection);
-    }
-
-    private void HandleInjection(Entity<SolutionInjectOnCollideComponent> ent, ref ProjectileHitEvent args)
-    {
-        var component = ent.Comp;
-        var target = args.Target;
-
-        if (!TryComp<BloodstreamComponent>(target, out var bloodstream) ||
-            !_solutionContainersSystem.TryGetInjectableSolution(ent.Owner, out var solution, out _))
-        {
-            return;
-        }
-
-        if (component.BlockSlots != 0x0)
-        {
-            var containerEnumerator = _inventorySystem.GetSlotEnumerator(target, component.BlockSlots);
-
-            // TODO add a helper method for this?
-            if (containerEnumerator.MoveNext(out _))
-                return;
-        }
-
-        var solRemoved = _solutionContainersSystem.SplitSolution(solution.Value, component.TransferAmount);
-        var solRemovedVol = solRemoved.Volume;
-
-        var solToInject = solRemoved.SplitSolution(solRemovedVol * component.TransferEfficiency);
-
-        _bloodstreamSystem.TryAddToChemicals(target, solToInject, bloodstream);
-    }
-}
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
new file mode 100644
index 00000000000..3c57cc31afd
--- /dev/null
+++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
@@ -0,0 +1,148 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Server.Chemistry.Components;
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.Inventory;
+using Content.Shared.Popups;
+using Content.Shared.Projectiles;
+using Content.Shared.Tag;
+using Content.Shared.Weapons.Melee.Events;
+using Robust.Shared.Collections;
+
+namespace Content.Server.Chemistry.EntitySystems;
+
+/// <summary>
+/// System for handling the different inheritors of <see cref="BaseSolutionInjectOnEventComponent"/>.
+/// Subscribes to relevent events and performs solution injections when they are raised.
+/// </summary>
+public sealed class SolutionInjectOnCollideSystem : EntitySystem
+{
+    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SolutionInjectOnProjectileHitComponent, ProjectileHitEvent>(HandleProjectileHit);
+        SubscribeLocalEvent<SolutionInjectOnEmbedComponent, EmbedEvent>(HandleEmbed);
+        SubscribeLocalEvent<MeleeChemicalInjectorComponent, MeleeHitEvent>(HandleMeleeHit);
+    }
+
+    private void HandleProjectileHit(Entity<SolutionInjectOnProjectileHitComponent> entity, ref ProjectileHitEvent args)
+    {
+        DoInjection((entity.Owner, entity.Comp), args.Target, args.Shooter);
+    }
+
+    private void HandleEmbed(Entity<SolutionInjectOnEmbedComponent> entity, ref EmbedEvent args)
+    {
+        DoInjection((entity.Owner, entity.Comp), args.Embedded, args.Shooter);
+    }
+
+    private void HandleMeleeHit(Entity<MeleeChemicalInjectorComponent> entity, ref MeleeHitEvent args)
+    {
+        // MeleeHitEvent is weird, so we have to filter to make sure we actually
+        // hit something and aren't just examining the weapon.
+        if (args.IsHit)
+            TryInjectTargets((entity.Owner, entity.Comp), args.HitEntities, args.User);
+    }
+
+    private void DoInjection(Entity<BaseSolutionInjectOnEventComponent> injectorEntity, EntityUid target, EntityUid? source = null)
+    {
+        TryInjectTargets(injectorEntity, [target], source);
+    }
+
+    /// <summary>
+    /// Filters <paramref name="targets"/> for valid targets and tries to inject a portion of <see cref="BaseSolutionInjectOnEventComponent.Solution"/> into
+    /// each valid target's bloodstream.
+    /// </summary>
+    /// <remarks>
+    /// Targets are invalid if any of the following are true:
+    /// <list type="bullet">
+    ///     <item>The target does not have a bloodstream.</item>
+    ///     <item><see cref="BaseSolutionInjectOnEventComponent.PierceArmor"/> is false and the target is wearing a hardsuit.</item>
+    ///     <item><see cref="BaseSolutionInjectOnEventComponent.BlockSlots"/> is not NONE and the target has an item equipped in any of the specified slots.</item>
+    /// </list>
+    /// </remarks>
+    /// <returns>true if at least one target was successfully injected, otherwise false</returns>
+    private bool TryInjectTargets(Entity<BaseSolutionInjectOnEventComponent> injector, IReadOnlyList<EntityUid> targets, EntityUid? source = null)
+    {
+        // Make sure we have at least one target
+        if (targets.Count == 0)
+            return false;
+
+        // Get the solution to inject
+        if (!_solutionContainer.TryGetSolution(injector.Owner, injector.Comp.Solution, out var injectorSolution))
+            return false;
+
+        // Build a list of bloodstreams to inject into
+        var targetBloodstreams = new ValueList<Entity<BloodstreamComponent>>();
+        foreach (var target in targets)
+        {
+            if (Deleted(target))
+                continue;
+
+            // Yuck, this is way to hardcodey for my tastes
+            // TODO blocking injection with a hardsuit should probably done with a cancellable event or something
+            if (!injector.Comp.PierceArmor && _inventory.TryGetSlotEntity(target, "outerClothing", out var suit) && _tag.HasTag(suit.Value, "Hardsuit"))
+            {
+                // Only show popup to attacker
+                if (source != null)
+                    _popup.PopupEntity(Loc.GetString(injector.Comp.BlockedByHardsuitPopupMessage, ("weapon", injector.Owner), ("target", target)), target, source.Value, PopupType.SmallCaution);
+
+                continue;
+            }
+
+            // Check if the target has anything equipped in a slot that would block injection
+            if (injector.Comp.BlockSlots != SlotFlags.NONE)
+            {
+                var blocked = false;
+                var containerEnumerator = _inventory.GetSlotEnumerator(target, injector.Comp.BlockSlots);
+                while (containerEnumerator.MoveNext(out var container))
+                {
+                    if (container.ContainedEntity != null)
+                    {
+                        blocked = true;
+                        break;
+                    }
+                }
+                if (blocked)
+                    continue;
+            }
+
+            // Make sure the target has a bloodstream
+            if (!TryComp<BloodstreamComponent>(target, out var bloodstream))
+                continue;
+
+
+            // Checks passed; add this target's bloodstream to the list
+            targetBloodstreams.Add((target, bloodstream));
+        }
+
+        // Make sure we got at least one bloodstream
+        if (targetBloodstreams.Count == 0)
+            return false;
+
+        // Extract total needed solution from the injector
+        var removedSolution = _solutionContainer.SplitSolution(injectorSolution.Value, injector.Comp.TransferAmount * targetBloodstreams.Count);
+        // Adjust solution amount based on transfer efficiency
+        var solutionToInject = removedSolution.SplitSolution(removedSolution.Volume * injector.Comp.TransferEfficiency);
+        // Calculate how much of the adjusted solution each target will get
+        var volumePerBloodstream = solutionToInject.Volume * (1f / targetBloodstreams.Count);
+
+        var anySuccess = false;
+        foreach (var targetBloodstream in targetBloodstreams)
+        {
+            // Take our portion of the adjusted solution for this target
+            var individualInjection = solutionToInject.SplitSolution(volumePerBloodstream);
+            // Inject our portion into the target's bloodstream
+            if (_bloodstream.TryAddToChemicals(targetBloodstream.Owner, individualInjection, targetBloodstream.Comp))
+                anySuccess = true;
+        }
+
+        // Huzzah!
+        return anySuccess;
+    }
+}
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
deleted file mode 100644
index 1ed5cec8dd8..00000000000
--- a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-using Content.Server.Administration.Logs;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Interaction;
-using Content.Shared.Popups;
-using Content.Shared.Verbs;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Player;
-
-namespace Content.Server.Chemistry.EntitySystems
-{
-    [UsedImplicitly]
-    public sealed class SolutionTransferSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-        [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
-        [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-
-        /// <summary>
-        ///     Default transfer amounts for the set-transfer verb.
-        /// </summary>
-        public static readonly List<int> DefaultTransferAmounts = new() { 1, 5, 10, 25, 50, 100, 250, 500, 1000 };
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<SolutionTransferComponent, GetVerbsEvent<AlternativeVerb>>(AddSetTransferVerbs);
-            SubscribeLocalEvent<SolutionTransferComponent, AfterInteractEvent>(OnAfterInteract);
-            SubscribeLocalEvent<SolutionTransferComponent, TransferAmountSetValueMessage>(OnTransferAmountSetValueMessage);
-        }
-
-        private void OnTransferAmountSetValueMessage(Entity<SolutionTransferComponent> entity, ref TransferAmountSetValueMessage message)
-        {
-            var newTransferAmount = FixedPoint2.Clamp(message.Value, entity.Comp.MinimumTransferAmount, entity.Comp.MaximumTransferAmount);
-            entity.Comp.TransferAmount = newTransferAmount;
-
-            if (message.Session.AttachedEntity is { Valid: true } user)
-                _popupSystem.PopupEntity(Loc.GetString("comp-solution-transfer-set-amount", ("amount", newTransferAmount)), entity.Owner, user);
-        }
-
-        private void AddSetTransferVerbs(Entity<SolutionTransferComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
-        {
-            var (uid, component) = entity;
-
-            if (!args.CanAccess || !args.CanInteract || !component.CanChangeTransferAmount || args.Hands == null)
-                return;
-
-            if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
-                return;
-
-            // Custom transfer verb
-            AlternativeVerb custom = new();
-            custom.Text = Loc.GetString("comp-solution-transfer-verb-custom-amount");
-            custom.Category = VerbCategory.SetTransferAmount;
-            custom.Act = () => _userInterfaceSystem.TryOpen(uid, TransferAmountUiKey.Key, actor.PlayerSession);
-            custom.Priority = 1;
-            args.Verbs.Add(custom);
-
-            // Add specific transfer verbs according to the container's size
-            var priority = 0;
-            var user = args.User;
-            foreach (var amount in DefaultTransferAmounts)
-            {
-                if (amount < component.MinimumTransferAmount.Int() || amount > component.MaximumTransferAmount.Int())
-                    continue;
-
-                AlternativeVerb verb = new();
-                verb.Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount));
-                verb.Category = VerbCategory.SetTransferAmount;
-                verb.Act = () =>
-                {
-                    component.TransferAmount = FixedPoint2.New(amount);
-                    _popupSystem.PopupEntity(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), uid, user);
-                };
-
-                // we want to sort by size, not alphabetically by the verb text.
-                verb.Priority = priority;
-                priority--;
-
-                args.Verbs.Add(verb);
-            }
-        }
-
-        private void OnAfterInteract(Entity<SolutionTransferComponent> entity, ref AfterInteractEvent args)
-        {
-            if (!args.CanReach || args.Target == null)
-                return;
-
-            var target = args.Target!.Value;
-            var (uid, component) = entity;
-
-            //Special case for reagent tanks, because normally clicking another container will give solution, not take it.
-            if (component.CanReceive && !EntityManager.HasComponent<RefillableSolutionComponent>(target) // target must not be refillable (e.g. Reagent Tanks)
-                                     && _solutionContainerSystem.TryGetDrainableSolution(target, out var targetSoln, out _) // target must be drainable
-                                     && EntityManager.TryGetComponent(uid, out RefillableSolutionComponent? refillComp)
-                                     && _solutionContainerSystem.TryGetRefillableSolution((uid, refillComp, null), out var ownerSoln, out var ownerRefill))
-
-            {
-
-                var transferAmount = component.TransferAmount; // This is the player-configurable transfer amount of "uid," not the target reagent tank.
-
-                if (EntityManager.TryGetComponent(uid, out RefillableSolutionComponent? refill) && refill.MaxRefill != null) // uid is the entity receiving solution from target.
-                {
-                    transferAmount = FixedPoint2.Min(transferAmount, (FixedPoint2) refill.MaxRefill); // if the receiver has a smaller transfer limit, use that instead
-                }
-
-                var transferred = Transfer(args.User, target, targetSoln.Value, uid, ownerSoln.Value, transferAmount);
-                if (transferred > 0)
-                {
-                    var toTheBrim = ownerRefill.AvailableVolume == 0;
-                    var msg = toTheBrim
-                        ? "comp-solution-transfer-fill-fully"
-                        : "comp-solution-transfer-fill-normal";
-
-                    _popupSystem.PopupEntity(Loc.GetString(msg, ("owner", args.Target), ("amount", transferred), ("target", uid)), uid, args.User);
-
-                    args.Handled = true;
-                    return;
-                }
-            }
-
-            // if target is refillable, and owner is drainable
-            if (component.CanSend && _solutionContainerSystem.TryGetRefillableSolution(target, out targetSoln, out var targetRefill)
-                                  && _solutionContainerSystem.TryGetDrainableSolution(uid, out ownerSoln, out var ownerDrain))
-            {
-                var transferAmount = component.TransferAmount;
-
-                if (EntityManager.TryGetComponent(target, out RefillableSolutionComponent? refill) && refill.MaxRefill != null)
-                {
-                    transferAmount = FixedPoint2.Min(transferAmount, (FixedPoint2) refill.MaxRefill);
-                }
-
-                var transferred = Transfer(args.User, uid, ownerSoln.Value, target, targetSoln.Value, transferAmount);
-
-                if (transferred > 0)
-                {
-                    var message = Loc.GetString("comp-solution-transfer-transfer-solution", ("amount", transferred), ("target", target));
-                    _popupSystem.PopupEntity(message, uid, args.User);
-
-                    args.Handled = true;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Transfer from a solution to another.
-        /// </summary>
-        /// <returns>The actual amount transferred.</returns>
-        public FixedPoint2 Transfer(EntityUid user,
-            EntityUid sourceEntity,
-            Entity<SolutionComponent> source,
-            EntityUid targetEntity,
-            Entity<SolutionComponent> target,
-            FixedPoint2 amount)
-        {
-            var transferAttempt = new SolutionTransferAttemptEvent(sourceEntity, targetEntity);
-
-            // Check if the source is cancelling the transfer
-            RaiseLocalEvent(sourceEntity, transferAttempt, broadcast: true);
-            if (transferAttempt.Cancelled)
-            {
-                _popupSystem.PopupEntity(transferAttempt.CancelReason!, sourceEntity, user);
-                return FixedPoint2.Zero;
-            }
-
-            var sourceSolution = source.Comp.Solution;
-            if (sourceSolution.Volume == 0)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("comp-solution-transfer-is-empty", ("target", sourceEntity)), sourceEntity, user);
-                return FixedPoint2.Zero;
-            }
-
-            // Check if the target is cancelling the transfer
-            RaiseLocalEvent(targetEntity, transferAttempt, broadcast: true);
-            if (transferAttempt.Cancelled)
-            {
-                _popupSystem.PopupEntity(transferAttempt.CancelReason!, sourceEntity, user);
-                return FixedPoint2.Zero;
-            }
-
-            var targetSolution = target.Comp.Solution;
-            if (targetSolution.AvailableVolume == 0)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("comp-solution-transfer-is-full", ("target", targetEntity)), targetEntity, user);
-                return FixedPoint2.Zero;
-            }
-
-            var actualAmount = FixedPoint2.Min(amount, FixedPoint2.Min(sourceSolution.Volume, targetSolution.AvailableVolume));
-
-            var solution = _solutionContainerSystem.Drain(sourceEntity, source, actualAmount);
-            _solutionContainerSystem.Refill(targetEntity, target, solution);
-
-            _adminLogger.Add(LogType.Action, LogImpact.Medium,
-                $"{EntityManager.ToPrettyString(user):player} transferred {string.Join(", ", solution.Contents)} to {EntityManager.ToPrettyString(targetEntity):entity}, which now contains {SolutionContainerSystem.ToPrettyString(targetSolution)}");
-
-            return actualAmount;
-        }
-    }
-
-    /// <summary>
-    /// Raised when attempting to transfer from one solution to another.
-    /// </summary>
-    public sealed class SolutionTransferAttemptEvent : CancellableEntityEventArgs
-    {
-        public SolutionTransferAttemptEvent(EntityUid from, EntityUid to)
-        {
-            From = from;
-            To = to;
-        }
-
-        public EntityUid From { get; }
-        public EntityUid To { get; }
-
-        /// <summary>
-        /// Why the transfer has been cancelled.
-        /// </summary>
-        public string? CancelReason { get; private set; }
-
-        /// <summary>
-        /// Cancels the transfer.
-        /// </summary>
-        public void Cancel(string reason)
-        {
-            base.Cancel();
-            CancelReason = reason;
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs b/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
index 664569d7be4..50be89581fb 100644
--- a/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
+++ b/Content.Server/Chemistry/ReagentEffectConditions/ReagentThreshold.cs
@@ -31,7 +31,7 @@ public override bool Condition(ReagentEffectArgs args)
 
             var quant = FixedPoint2.Zero;
             if (args.Source != null)
-                quant = args.Source.GetTotalPrototypeQuantity(reagent);
+                quant = args.Source.GetTotalPrototypeQuantity(reagent) * args.QuantityMultiplier;
 
             return quant >= Min && quant <= Max;
         }
diff --git a/Content.Server/Chemistry/ReagentEffects/Drunk.cs b/Content.Server/Chemistry/ReagentEffects/Drunk.cs
index dbce995ca2e..6088db5787c 100644
--- a/Content.Server/Chemistry/ReagentEffects/Drunk.cs
+++ b/Content.Server/Chemistry/ReagentEffects/Drunk.cs
@@ -25,7 +25,7 @@ public override void Effect(ReagentEffectArgs args)
     {
         var boozePower = BoozePower;
 
-        boozePower *= args.Scale;
+        boozePower *= Math.Max(args.Scale, 1);
 
         var drunkSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedDrunkSystem>();
         drunkSys.TryApplyDrunkenness(args.SolutionEntity, boozePower, SlurSpeech);
diff --git a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs b/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
index da16529d515..8d5a583f6d8 100644
--- a/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
+++ b/Content.Server/Chemistry/ReagentEffects/MakeSentient.cs
@@ -1,13 +1,17 @@
 using System.Linq;
 using Content.Server.Ghost.Roles.Components;
+using Content.Server.Language;
+using Content.Server.Language.Events;
 using Content.Server.Speech.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Language;
 using Content.Shared.Language.Systems;
 using Content.Shared.Mind.Components;
 using Robust.Shared.Prototypes;
-using Content.Server.Psionics; //Nyano - Summary: pulls in the ability for the sentient creature to become psionic.
-using Content.Shared.Humanoid; //Delta-V - Banning humanoids from becoming ghost roles.
+using Content.Server.Psionics;
+using Content.Shared.Body.Part; //Nyano - Summary: pulls in the ability for the sentient creature to become psionic.
+using Content.Shared.Humanoid;
+using Content.Shared.Language.Components; //Delta-V - Banning humanoids from becoming ghost roles.
 using Content.Shared.Language.Events;
 
 namespace Content.Server.Chemistry.ReagentEffects;
@@ -28,19 +32,18 @@ public override void Effect(ReagentEffectArgs args)
         entityManager.RemoveComponent<ReplacementAccentComponent>(uid);
         entityManager.RemoveComponent<MonkeyAccentComponent>(uid);
 
+        // Make sure the entity knows at least fallback (Galactic Common)
         var speaker = entityManager.EnsureComponent<LanguageSpeakerComponent>(uid);
+        var knowledge = entityManager.EnsureComponent<LanguageKnowledgeComponent>(uid);
         var fallback = SharedLanguageSystem.FallbackLanguagePrototype;
 
-        if (!speaker.UnderstoodLanguages.Contains(fallback))
-            speaker.UnderstoodLanguages.Add(fallback);
+        if (!knowledge.UnderstoodLanguages.Contains(fallback))
+            knowledge.UnderstoodLanguages.Add(fallback);
 
-        if (!speaker.SpokenLanguages.Contains(fallback))
-        {
-            speaker.CurrentLanguage = fallback;
-            speaker.SpokenLanguages.Add(fallback);
-        }
+        if (!knowledge.SpokenLanguages.Contains(fallback))
+            knowledge.SpokenLanguages.Add(fallback);
 
-        args.EntityManager.EventBus.RaiseLocalEvent(uid, new LanguagesUpdateEvent(), true);
+        IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>().UpdateEntityLanguages(uid, speaker);
 
         // Stops from adding a ghost role to things like people who already have a mind
         if (entityManager.TryGetComponent<MindContainerComponent>(uid, out var mindContainer) && mindContainer.HasMind)
diff --git a/Content.Server/Communications/CommsHackerSystem.cs b/Content.Server/Communications/CommsHackerSystem.cs
index 1248d214003..bbe64a7987a 100644
--- a/Content.Server/Communications/CommsHackerSystem.cs
+++ b/Content.Server/Communications/CommsHackerSystem.cs
@@ -9,6 +9,8 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
+using Content.Server.Announcements.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.Communications;
 
@@ -21,6 +23,7 @@ public sealed class CommsHackerSystem : SharedCommsHackerSystem
     // TODO: remove when generic check event is used
     [Dependency] private readonly NinjaGlovesSystem _gloves = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     public override void Initialize()
     {
@@ -79,7 +82,8 @@ private void OnDoAfter(EntityUid uid, CommsHackerComponent comp, TerrorDoAfterEv
     public void CallInThreat(NinjaHackingThreatPrototype ninjaHackingThreat)
     {
         _gameTicker.StartGameRule(ninjaHackingThreat.Rule, out _);
-        _chat.DispatchGlobalAnnouncement(Loc.GetString(ninjaHackingThreat.Announcement), playSound: true, colorOverride: Color.Red);
+        _announcer.SendAnnouncement(_announcer.GetAnnouncementId("NinjaHacking"), Filter.Broadcast(),
+            ninjaHackingThreat.Announcement, colorOverride: Color.Red);
     }
 }
 
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 6b745c8cd95..b68a952105e 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -24,6 +24,9 @@
 using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
+using Content.Server.Announcements.Systems;
+using Robust.Shared.Player;
+using Content.Server.Station.Components;
 
 namespace Content.Server.Communications
 {
@@ -42,6 +45,7 @@ public sealed class CommunicationsConsoleSystem : EntitySystem
         [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
         private const float UIUpdateInterval = 5.0f;
 
@@ -170,7 +174,6 @@ public void UpdateCommsConsoleInterface(EntityUid uid, CommunicationsConsoleComp
 
             _uiSystem.SetUiState(ui, new CommunicationsConsoleInterfaceState(
                 CanAnnounce(comp),
-                CanBroadcast(comp),
                 CanCallOrRecall(comp),
                 levels,
                 currentLevel,
@@ -184,11 +187,6 @@ private static bool CanAnnounce(CommunicationsConsoleComponent comp)
             return comp.AnnouncementCooldownRemaining <= 0f;
         }
 
-        private static bool CanBroadcast(CommunicationsConsoleComponent comp)
-        {
-            return comp.AnnouncementCooldownRemaining <= 0f;
-        }
-
         private bool CanUse(EntityUid user, EntityUid console)
         {
             // This shouldn't technically be possible because of BUI but don't trust client.
@@ -276,17 +274,19 @@ private void OnAnnounceMessage(EntityUid uid, CommunicationsConsoleComponent com
             Loc.TryGetString(comp.Title, out var title);
             title ??= comp.Title;
 
-            msg += "\n" + Loc.GetString("comms-console-announcement-sent-by") + " " + author;
+            msg += $"\n{Loc.GetString("comms-console-announcement-sent-by")} {author}";
             if (comp.Global)
             {
-                _chatSystem.DispatchGlobalAnnouncement(msg, title, announcementSound: comp.Sound, colorOverride: comp.Color);
+                _announcer.SendAnnouncement("announce", Filter.Broadcast(), msg, title, comp.Color);
 
                 if (message.Session.AttachedEntity != null)
                     _adminLogger.Add(LogType.Chat, LogImpact.Low, $"{ToPrettyString(message.Session.AttachedEntity.Value):player} has sent the following global announcement: {msg}");
 
                 return;
             }
-            _chatSystem.DispatchStationAnnouncement(uid, msg, title, colorOverride: comp.Color);
+            if (TryComp<StationDataComponent>(_stationSystem.GetOwningStation(uid), out var stationData))
+                _announcer.SendAnnouncement("announce", _stationSystem.GetInStation(stationData), msg, title,
+                    comp.Color);
 
             if (message.Session.AttachedEntity != null)
                 _adminLogger.Add(LogType.Chat, LogImpact.Low, $"{ToPrettyString(message.Session.AttachedEntity.Value):player} has sent the following station announcement: {msg}");
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 719b4a9c639..64e93c5af19 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -1,4 +1,6 @@
 using System.Collections.Immutable;
+using System.Runtime.InteropServices;
+using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using Content.Server.Database;
 using Content.Server.GameTicking;
@@ -9,6 +11,7 @@
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
+using Robust.Shared.Timing;
 
 
 namespace Content.Server.Connection
@@ -16,7 +19,20 @@ namespace Content.Server.Connection
     public interface IConnectionManager
     {
         void Initialize();
+
         Task<bool> HasPrivilegedJoin(NetUserId userId);
+
+        /// <summary>
+        /// Temporarily allow a user to bypass regular connection requirements.
+        /// </summary>
+        /// <remarks>
+        /// The specified user will be allowed to bypass regular player cap,
+        /// whitelist and panic bunker restrictions for <paramref name="duration"/>.
+        /// Bans are not bypassed.
+        /// </remarks>
+        /// <param name="user">The user to give a temporary bypass.</param>
+        /// <param name="duration">How long the bypass should last for.</param>
+        void AddTemporaryConnectBypass(NetUserId user, TimeSpan duration);
     }
 
     /// <summary>
@@ -31,11 +47,18 @@ public sealed class ConnectionManager : IConnectionManager
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly ILocalizationManager _loc = default!;
         [Dependency] private readonly ServerDbEntryManager _serverDbEntry = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+
+        private readonly Dictionary<NetUserId, TimeSpan> _temporaryBypasses = [];
+        private ISawmill _sawmill = default!;
 
         private List<NetUserId> _connectedWhitelistedPlayers = new(); // DeltaV - Soft whitelist improvements
 
         public void Initialize()
         {
+            _sawmill = _logManager.GetSawmill("connections");
+
             _netMgr.Connecting += NetMgrOnConnecting;
             _netMgr.Connected += OnConnected; // DeltaV - Soft whitelist improvements
             _netMgr.Disconnect += OnDisconnected; // DeltaV - Soft whitelist improvements
@@ -44,6 +67,15 @@ public void Initialize()
             // _netMgr.HandleApprovalCallback = HandleApproval;
         }
 
+        public void AddTemporaryConnectBypass(NetUserId user, TimeSpan duration)
+        {
+            ref var time = ref CollectionsMarshal.GetValueRefOrAddDefault(_temporaryBypasses, user, out _);
+            var newTime = _gameTiming.RealTime + duration;
+            // Make sure we only update the time if we wouldn't shrink it.
+            if (newTime > time)
+                time = newTime;
+        }
+
         /*
         private async Task<NetApproval> HandleApproval(NetApprovalEventArgs eventArgs)
         {
@@ -109,6 +141,20 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 hwId = null;
             }
 
+            var bans = await _db.GetServerBansAsync(addr, userId, hwId, includeUnbanned: false);
+            if (bans.Count > 0)
+            {
+                var firstBan = bans[0];
+                var message = firstBan.FormatBanMessage(_cfg, _loc);
+                return (ConnectionDenyReason.Ban, message, bans);
+            }
+
+            if (HasTemporaryBypass(userId))
+            {
+                _sawmill.Verbose("User {UserId} has temporary bypass, skipping further connection checks", userId);
+                return null;
+            }
+
             var adminData = await _dbManager.GetAdminDataForAsync(e.UserId);
 
             if (_cfg.GetCVar(CCVars.PanicBunkerEnabled) && adminData == null)
@@ -166,14 +212,6 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 return (ConnectionDenyReason.Full, Loc.GetString("soft-player-cap-full"), null);
 
 
-            var bans = await _db.GetServerBansAsync(addr, userId, hwId, includeUnbanned: false);
-            if (bans.Count > 0)
-            {
-                var firstBan = bans[0];
-                var message = firstBan.FormatBanMessage(_cfg, _loc);
-                return (ConnectionDenyReason.Ban, message, bans);
-            }
-
             // DeltaV - Replace existing softwhitelist implementation
             if (false) //_cfg.GetCVar(CCVars.WhitelistEnabled))
             {
@@ -217,6 +255,11 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             return null;
         }
 
+        private bool HasTemporaryBypass(NetUserId user)
+        {
+            return _temporaryBypasses.TryGetValue(user, out var time) && time > _gameTiming.RealTime;
+        }
+
         private async Task<NetUserId?> AssignUserIdCallback(string name)
         {
             if (!_cfg.GetCVar(CCVars.GamePersistGuests))
diff --git a/Content.Server/Connection/GrantConnectBypassCommand.cs b/Content.Server/Connection/GrantConnectBypassCommand.cs
new file mode 100644
index 00000000000..e2d0d7338a4
--- /dev/null
+++ b/Content.Server/Connection/GrantConnectBypassCommand.cs
@@ -0,0 +1,60 @@
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server.Connection;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class GrantConnectBypassCommand : LocalizedCommands
+{
+    private static readonly TimeSpan DefaultDuration = TimeSpan.FromHours(1);
+
+    [Dependency] private readonly IPlayerLocator _playerLocator = default!;
+    [Dependency] private readonly IConnectionManager _connectionManager = default!;
+
+    public override string Command => "grant_connect_bypass";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length is not (1 or 2))
+        {
+            shell.WriteError(Loc.GetString("cmd-grant_connect_bypass-invalid-args"));
+            return;
+        }
+
+        var argPlayer = args[0];
+        var info = await _playerLocator.LookupIdByNameOrIdAsync(argPlayer);
+        if (info == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-grant_connect_bypass-unknown-user", ("user", argPlayer)));
+            return;
+        }
+
+        var duration = DefaultDuration;
+        if (args.Length > 1)
+        {
+            var argDuration = args[2];
+            if (!uint.TryParse(argDuration, out var minutes))
+            {
+                shell.WriteLine(Loc.GetString("cmd-grant_connect_bypass-invalid-duration", ("duration", argDuration)));
+                return;
+            }
+
+            duration = TimeSpan.FromMinutes(minutes);
+        }
+
+        _connectionManager.AddTemporaryConnectBypass(info.UserId, duration);
+        shell.WriteLine(Loc.GetString("cmd-grant_connect_bypass-success", ("user", argPlayer)));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+            return CompletionResult.FromHint(Loc.GetString("cmd-grant_connect_bypass-arg-user"));
+
+        if (args.Length == 2)
+            return CompletionResult.FromHint(Loc.GetString("cmd-grant_connect_bypass-arg-duration"));
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/Construction/Conditions/ToiletLidClosed.cs b/Content.Server/Construction/Conditions/ToiletLidClosed.cs
deleted file mode 100644
index 40a3be006bc..00000000000
--- a/Content.Server/Construction/Conditions/ToiletLidClosed.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.Construction;
-using Content.Shared.Examine;
-using Content.Shared.Toilet;
-using JetBrains.Annotations;
-
-namespace Content.Server.Construction.Conditions
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class ToiletLidClosed : IGraphCondition
-    {
-        public bool Condition(EntityUid uid, IEntityManager entityManager)
-        {
-            if (!entityManager.TryGetComponent(uid, out ToiletComponent? toilet))
-                return false;
-
-            return !toilet.LidOpen;
-        }
-
-        public bool DoExamine(ExaminedEvent args)
-        {
-            var entity = args.Examined;
-
-            if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ToiletComponent? toilet)) return false;
-            if (!toilet.LidOpen) return false;
-
-            args.PushMarkup(Loc.GetString("construction-examine-condition-toilet-lid-closed") + "\n");
-            return true;
-        }
-
-        public IEnumerable<ConstructionGuideEntry> GenerateGuideEntry()
-        {
-            yield return new ConstructionGuideEntry()
-            {
-                Localization = "construction-step-condition-toilet-lid-closed"
-            };
-        }
-    }
-}
diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs
index efec18485c2..9ffe9444867 100644
--- a/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs
+++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs
@@ -3,7 +3,7 @@
 using Content.Shared.CriminalRecords;
 using Content.Shared.Security;
 using Content.Shared.StationRecords;
-using Robust.Shared.Timing;
+using Content.Server.GameTicking;
 
 namespace Content.Server.CriminalRecords.Systems;
 
@@ -17,7 +17,7 @@ namespace Content.Server.CriminalRecords.Systems;
 /// </summary>
 public sealed class CriminalRecordsSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly StationRecordsSystem _stationRecords = default!;
 
     public override void Initialize()
@@ -71,7 +71,7 @@ public bool TryAddHistory(StationRecordKey key, CrimeHistory entry)
     /// </summary>
     public bool TryAddHistory(StationRecordKey key, string line)
     {
-        var entry = new CrimeHistory(_timing.CurTime, line);
+        var entry = new CrimeHistory(_ticker.RoundDuration(), line);
         return TryAddHistory(key, entry);
     }
 
diff --git a/Content.Server/Damage/Components/DamagePopupComponent.cs b/Content.Server/Damage/Components/DamagePopupComponent.cs
index b1216069f5e..37c5d57cf45 100644
--- a/Content.Server/Damage/Components/DamagePopupComponent.cs
+++ b/Content.Server/Damage/Components/DamagePopupComponent.cs
@@ -5,6 +5,11 @@ namespace Content.Server.Damage.Components;
 [RegisterComponent, Access(typeof(DamagePopupSystem))]
 public sealed partial class DamagePopupComponent : Component
 {
+    /// <summary>
+    /// Bool that will be used to determine if the popup type can be changed with a left click.
+    /// </summary>
+    [DataField("allowTypeChange")] [ViewVariables(VVAccess.ReadWrite)]
+    public bool AllowTypeChange = false;
     /// <summary>
     /// Enum that will be used to determine the type of damage popup displayed.
     /// </summary>
diff --git a/Content.Server/Damage/Systems/DamagePopupSystem.cs b/Content.Server/Damage/Systems/DamagePopupSystem.cs
index 12fd894ac6f..3386c92129f 100644
--- a/Content.Server/Damage/Systems/DamagePopupSystem.cs
+++ b/Content.Server/Damage/Systems/DamagePopupSystem.cs
@@ -1,7 +1,8 @@
+using System.Linq;
 using Content.Server.Damage.Components;
 using Content.Server.Popups;
 using Content.Shared.Damage;
-using Robust.Shared.Player;
+using Content.Shared.Interaction;
 
 namespace Content.Server.Damage.Systems;
 
@@ -13,6 +14,7 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<DamagePopupComponent, DamageChangedEvent>(OnDamageChange);
+        SubscribeLocalEvent<DamagePopupComponent, InteractHandEvent>(OnInteractHand);
     }
 
     private void OnDamageChange(EntityUid uid, DamagePopupComponent component, DamageChangedEvent args)
@@ -33,4 +35,20 @@ private void OnDamageChange(EntityUid uid, DamagePopupComponent component, Damag
             _popupSystem.PopupEntity(msg, uid);
         }
     }
+
+    private void OnInteractHand(EntityUid uid, DamagePopupComponent component, InteractHandEvent args)
+    {
+        if (component.AllowTypeChange)
+        {
+            if (component.Type == Enum.GetValues(typeof(DamagePopupType)).Cast<DamagePopupType>().Last())
+            {
+                component.Type = Enum.GetValues(typeof(DamagePopupType)).Cast<DamagePopupType>().First();
+            }
+            else
+            {
+                component.Type = (DamagePopupType) (int) component.Type + 1;
+            }
+            _popupSystem.PopupEntity("Target set to type: " + component.Type.ToString(), uid);
+        }
+    }
 }
diff --git a/Content.Server/Database/DatabaseRecords.cs b/Content.Server/Database/DatabaseRecords.cs
index 460a6c8222a..c0d81147bb4 100644
--- a/Content.Server/Database/DatabaseRecords.cs
+++ b/Content.Server/Database/DatabaseRecords.cs
@@ -123,6 +123,6 @@ public sealed record PlayerRecord(
     IPAddress LastSeenAddress,
     ImmutableArray<byte>? HWId);
 
-public sealed record RoundRecord(int Id, DateTimeOffset StartDate, ServerRecord Server);
+public sealed record RoundRecord(int Id, DateTimeOffset? StartDate, ServerRecord Server);
 
 public sealed record ServerRecord(int Id, string Name);
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index a550479b30f..af9220ee6db 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -710,7 +710,7 @@ public async Task AddAdminRankAsync(AdminRank rank, CancellationToken cancel)
             await db.DbContext.SaveChangesAsync(cancel);
         }
 
-        public virtual async Task<int> AddNewRound(Server server, params Guid[] playerIds)
+        public async Task<int> AddNewRound(Server server, params Guid[] playerIds)
         {
             await using var db = await GetDb();
 
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index 46886fe4d18..88ecf820020 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -452,34 +452,6 @@ public override async Task<int> AddConnectionLogAsync(
             return (admins.Select(p => (p.a, p.LastSeenUserName)).ToArray(), adminRanks)!;
         }
 
-        public override async Task<int> AddNewRound(Server server, params Guid[] playerIds)
-        {
-            await using var db = await GetDb();
-
-            var players = await db.DbContext.Player
-                .Where(player => playerIds.Contains(player.UserId))
-                .ToListAsync();
-
-            var nextId = 1;
-            if (await db.DbContext.Round.AnyAsync())
-            {
-                nextId = db.DbContext.Round.Max(round => round.Id) + 1;
-            }
-
-            var round = new Round
-            {
-                Id = nextId,
-                Players = players,
-                ServerId = server.Id
-            };
-
-            db.DbContext.Round.Add(round);
-
-            await db.DbContext.SaveChangesAsync();
-
-            return round.Id;
-        }
-
         protected override IQueryable<AdminLog> StartAdminLogsQuery(ServerDbContext db, LogFilter? filter = null)
         {
             IQueryable<AdminLog> query = db.AdminLog;
diff --git a/Content.Server/Decals/Commands/EditDecalCommand.cs b/Content.Server/Decals/Commands/EditDecalCommand.cs
index baaef1f3f64..2ae814113f0 100644
--- a/Content.Server/Decals/Commands/EditDecalCommand.cs
+++ b/Content.Server/Decals/Commands/EditDecalCommand.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Decals;
 
@@ -10,7 +11,6 @@ namespace Content.Server.Decals;
 public sealed class EditDecalCommand : IConsoleCommand
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
 
     public string Command => "editdecal";
     public string Description => "Edits a decal.";
@@ -43,7 +43,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        if (!_mapManager.GridExists(gridId))
+        if (!_entManager.HasComponent<MapGridComponent>(gridId))
         {
             shell.WriteError($"No grid with gridId {gridId} exists.");
             return;
diff --git a/Content.Server/Decals/Commands/RemoveDecalCommand.cs b/Content.Server/Decals/Commands/RemoveDecalCommand.cs
index 771c66fbbd5..6b6a91c9d33 100644
--- a/Content.Server/Decals/Commands/RemoveDecalCommand.cs
+++ b/Content.Server/Decals/Commands/RemoveDecalCommand.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using SQLitePCL;
 
 namespace Content.Server.Decals.Commands
@@ -10,7 +11,6 @@ namespace Content.Server.Decals.Commands
     public sealed class RemoveDecalCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
 
         public string Command => "rmdecal";
         public string Description => "removes a decal";
@@ -31,7 +31,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
 
             if (!NetEntity.TryParse(args[1], out var rawGridIdNet) ||
                 !_entManager.TryGetEntity(rawGridIdNet, out var rawGridId) ||
-                !_mapManager.GridExists(rawGridId))
+                !_entManager.HasComponent<MapGridComponent>(rawGridId))
             {
                 shell.WriteError("Failed parsing gridId.");
                 return;
diff --git a/Content.Server/Decals/DecalSystem.cs b/Content.Server/Decals/DecalSystem.cs
index ad225afe224..da95401d206 100644
--- a/Content.Server/Decals/DecalSystem.cs
+++ b/Content.Server/Decals/DecalSystem.cs
@@ -105,7 +105,7 @@ private void OnGridSplit(ref PostGridSplitEvent ev)
                 return;
 
             // Transfer decals over to the new grid.
-            var enumerator = MapManager.GetGrid(ev.Grid).GetAllTilesEnumerator();
+            var enumerator = Comp<MapGridComponent>(ev.Grid).GetAllTilesEnumerator();
 
             var oldChunkCollection = oldComp.ChunkCollection.ChunkCollection;
             var chunkCollection = newComp.ChunkCollection.ChunkCollection;
diff --git a/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs b/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs
index 65678668d7d..30a894a2d11 100644
--- a/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs
+++ b/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs
@@ -99,7 +99,7 @@ private void UpdateUI(EntityUid owner, SyrinxVoiceMaskComponent? component = nul
             return;
 
         if (_uiSystem.TryGetUi(owner, VoiceMaskUIKey.Key, out var bui))
-            _uiSystem.SetUiState(bui, new VoiceMaskBuiState(component.VoiceName));
+            _uiSystem.SetUiState(bui, new VoiceMaskBuiState(component.VoiceName, null));
     }
 
     /// <summary>
diff --git a/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs b/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs
index f0538c47f95..ba042d89662 100644
--- a/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs
+++ b/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs
@@ -39,7 +39,7 @@ protected override void Started(EntityUid uid, PirateRadioSpawnRuleComponent com
         var xformQuery = GetEntityQuery<TransformComponent>();
         var aabbs = EntityQuery<StationDataComponent>().SelectMany(x =>
                 x.Grids.Select(x =>
-                    xformQuery.GetComponent(x).WorldMatrix.TransformBox(_mapManager.GetGridComp(x).LocalAABB)))
+                    xformQuery.GetComponent(x).WorldMatrix.TransformBox(_entities.GetComponent<MapGridComponent>(x).LocalAABB)))
             .ToArray();
         if (aabbs.Length < 1) return;
         var aabb = aabbs[0];
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
new file mode 100644
index 00000000000..28c4b2ef16e
--- /dev/null
+++ b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Inventory;
+using Content.Shared.Popups;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+
+namespace Content.Server.Destructible.Thresholds.Behaviors;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class BurnBodyBehavior : IThresholdBehavior
+{
+
+    public void Execute(EntityUid bodyId, DestructibleSystem system, EntityUid? cause = null)
+    {
+        var transformSystem = system.EntityManager.System<TransformSystem>();
+        var inventorySystem = system.EntityManager.System<InventorySystem>();
+        var sharedPopupSystem = system.EntityManager.System<SharedPopupSystem>();
+
+        if (!system.EntityManager.TryGetComponent<InventoryComponent>(bodyId, out var comp))
+            return;
+
+        foreach (var item in inventorySystem.GetHandOrInventoryEntities(bodyId))
+        {
+            transformSystem.DropNextTo(item, bodyId);
+        }
+
+        sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyId)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
+
+        system.EntityManager.QueueDeleteEntity(bodyId);
+    }
+}
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/OpenBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/OpenBehavior.cs
index f01e4f7048e..7ab1fe11b01 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/OpenBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/OpenBehavior.cs
@@ -1,4 +1,4 @@
-using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Nutrition.EntitySystems;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors;
 
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index ed5777c42aa..0fa3c06c04b 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -23,7 +23,10 @@ public sealed partial class SpawnEntitiesBehavior : IThresholdBehavior
         public float Offset { get; set; } = 0.5f;
 
         [DataField("transferForensics")]
-        public bool DoTransferForensics = false;
+        public bool DoTransferForensics;
+
+        [DataField]
+        public bool SpawnInContainer;
 
         public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
         {
@@ -49,7 +52,9 @@ public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause
 
                     if (EntityPrototypeHelpers.HasComponent<StackComponent>(entityId, system.PrototypeManager, system.ComponentFactory))
                     {
-                        var spawned = system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
+                        var spawned = SpawnInContainer
+                            ? system.EntityManager.SpawnNextToOrDrop(entityId, owner)
+                            : system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
                         system.StackSystem.SetCount(spawned, count);
 
                         TransferForensics(spawned, system, owner);
@@ -58,7 +63,9 @@ public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause
                     {
                         for (var i = 0; i < count; i++)
                         {
-                            var spawned = system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
+                            var spawned = SpawnInContainer
+                                ? system.EntityManager.SpawnNextToOrDrop(entityId, owner)
+                                : system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
 
                             TransferForensics(spawned, system, owner);
                         }
diff --git a/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs b/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs
index 2e9b369b99a..b3535cde1fd 100644
--- a/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs
+++ b/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs
@@ -23,6 +23,12 @@ public sealed partial class SignalTimerComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public string Label = string.Empty;
 
+    /// <summary>
+    ///     Default max width of a label (how many letters can this render?)
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public int MaxLength = 5;
+
     /// <summary>
     ///     The port that gets signaled when the timer triggers.
     /// </summary>
diff --git a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
index f9c2d3430e9..0e214ee865a 100644
--- a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
@@ -39,6 +39,7 @@ public override void Initialize()
 
     private void OnInit(EntityUid uid, SignalTimerComponent component, ComponentInit args)
     {
+        _appearanceSystem.SetData(uid, TextScreenVisuals.DefaultText, component.Label);
         _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, component.Label);
         _signalSystem.EnsureSinkPorts(uid, component.Trigger);
     }
@@ -66,11 +67,6 @@ public void Trigger(EntityUid uid, SignalTimerComponent signalTimer)
     {
         RemComp<ActiveSignalTimerComponent>(uid);
 
-        if (TryComp<AppearanceComponent>(uid, out var appearance))
-        {
-            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, signalTimer.Label, appearance);
-        }
-
         _audio.PlayPvs(signalTimer.DoneSound, uid);
         _signalSystem.InvokePort(uid, signalTimer.TriggerPort);
 
@@ -139,10 +135,15 @@ private void OnTextChangedMessage(EntityUid uid, SignalTimerComponent component,
         if (!IsMessageValid(uid, args))
             return;
 
-        component.Label = args.Text[..Math.Min(5, args.Text.Length)];
+        component.Label = args.Text[..Math.Min(component.MaxLength, args.Text.Length)];
 
         if (!HasComp<ActiveSignalTimerComponent>(uid))
+        {
+            // could maybe move the defaulttext update out of this block,
+            // if you delved deep into appearance update batching
+            _appearanceSystem.SetData(uid, TextScreenVisuals.DefaultText, component.Label);
             _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, component.Label);
+        }
     }
 
     /// <summary>
@@ -166,7 +167,15 @@ private void OnTimerStartMessage(EntityUid uid, SignalTimerComponent component,
     {
         if (!IsMessageValid(uid, args))
             return;
-        OnStartTimer(uid, component);
+
+        // feedback received: pressing the timer button while a timer is running should cancel the timer.
+        if (HasComp<ActiveSignalTimerComponent>(uid))
+        {
+            _appearanceSystem.SetData(uid, TextScreenVisuals.TargetTime, _gameTiming.CurTime);
+            Trigger(uid, component);
+        }
+        else
+            OnStartTimer(uid, component);
     }
 
     private void OnSignalReceived(EntityUid uid, SignalTimerComponent component, ref SignalReceivedEvent args)
diff --git a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
index 20aa8b6d2c5..6c0bced53e0 100644
--- a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
+++ b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
@@ -6,20 +6,16 @@
 using Content.Server.Disposal.Unit.Components;
 using Content.Server.Disposal.Unit.EntitySystems;
 using Content.Server.Popups;
-using Content.Server.UserInterface;
 using Content.Shared.Destructible;
 using Content.Shared.Disposal.Components;
-using Content.Shared.Hands.Components;
-using Content.Shared.Movement.Events;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
-using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
 using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent;
 using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent;
 
@@ -27,8 +23,6 @@ namespace Content.Server.Disposal.Tube
 {
     public sealed class DisposalTubeSystem : EntitySystem
     {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
         [Dependency] private readonly PopupSystem _popups = default!;
@@ -349,7 +343,7 @@ private void UpdateAnchored(EntityUid uid, DisposalTubeComponent component, bool
             var oppositeDirection = nextDirection.GetOpposite();
 
             var xform = Transform(target);
-            if (!_mapManager.TryGetGrid(xform.GridUid, out var grid))
+            if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
                 return null;
 
             var position = xform.Coordinates;
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
index eb3cda4db9b..38e39238039 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Disposal.Tube;
 using Content.Server.Disposal.Tube.Components;
@@ -12,14 +11,12 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Random;
 
 namespace Content.Server.Disposal.Unit.EntitySystems
 {
     public sealed class DisposableSystem : EntitySystem
     {
         [Dependency] private readonly ThrowingSystem _throwing = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
         [Dependency] private readonly DamageableSystem _damageable = default!;
         [Dependency] private readonly DisposalUnitSystem _disposalUnitSystem = default!;
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index 6938792315c..f9403f33b9d 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -135,8 +135,7 @@ private void AddClimbInsideVerb(EntityUid uid, SharedDisposalUnitComponent compo
     {
         // This is not an interaction, activation, or alternative verb type because unfortunately most users are
         // unwilling to accept that this is where they belong and don't want to accidentally climb inside.
-        if (!component.MobsCanEnter ||
-            !args.CanAccess ||
+        if (!args.CanAccess ||
             !args.CanInteract ||
             component.Container.ContainedEntities.Contains(args.User) ||
             !_actionBlockerSystem.CanMove(args.User))
@@ -300,7 +299,12 @@ private void OnThrowCollide(EntityUid uid, SharedDisposalUnitComponent component
         var canInsert = CanInsert(uid, component, args.Thrown);
         var randDouble = _robustRandom.NextDouble();
 
-        if (!canInsert || randDouble > 0.75)
+        if (!canInsert)
+        {
+            return;
+        }
+
+        if (randDouble > 0.75)
         {
             _audioSystem.PlayPvs(component.MissSound, uid);
 
@@ -631,10 +635,10 @@ public void UpdateVisualState(EntityUid uid, SharedDisposalUnitComponent compone
         switch (state)
         {
             case DisposalsPressureState.Flushed:
-                _appearance.SetData(uid, SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.Flushing, appearance);
+                _appearance.SetData(uid, SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.OverlayFlushing, appearance);
                 break;
             case DisposalsPressureState.Pressurizing:
-                _appearance.SetData(uid, SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.Charging, appearance);
+                _appearance.SetData(uid, SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.OverlayCharging, appearance);
                 break;
             case DisposalsPressureState.Ready:
                 _appearance.SetData(uid, SharedDisposalUnitComponent.Visuals.VisualState, SharedDisposalUnitComponent.VisualState.Anchored, appearance);
diff --git a/Content.Server/Doors/Electronics/Systems/DoorElectronicsSystem.cs b/Content.Server/Doors/Electronics/Systems/DoorElectronicsSystem.cs
new file mode 100644
index 00000000000..56e8bd50b32
--- /dev/null
+++ b/Content.Server/Doors/Electronics/Systems/DoorElectronicsSystem.cs
@@ -0,0 +1,69 @@
+using System.Linq;
+using Content.Server.Doors.Electronics;
+using Content.Shared.Access;
+using Content.Shared.Access.Components;
+using Content.Shared.Access.Systems;
+using Content.Shared.DeviceNetwork.Components;
+using Content.Shared.Doors.Electronics;
+using Content.Shared.Doors;
+using Content.Shared.Interaction;
+using Robust.Server.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Doors.Electronics;
+
+public sealed class DoorElectronicsSystem : EntitySystem
+{
+    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<DoorElectronicsComponent, DoorElectronicsUpdateConfigurationMessage>(OnChangeConfiguration);
+        SubscribeLocalEvent<DoorElectronicsComponent, AccessReaderConfigurationChangedEvent>(OnAccessReaderChanged);
+        SubscribeLocalEvent<DoorElectronicsComponent, BoundUIOpenedEvent>(OnBoundUIOpened);
+    }
+
+    public void UpdateUserInterface(EntityUid uid, DoorElectronicsComponent component)
+    {
+        var accesses = new List<ProtoId<AccessLevelPrototype>>();
+
+        if (TryComp<AccessReaderComponent>(uid, out var accessReader))
+        {
+            foreach (var accessList in accessReader.AccessLists)
+            {
+                var access = accessList.FirstOrDefault();
+                accesses.Add(access);
+            }
+        }
+
+        var state = new DoorElectronicsConfigurationState(accesses);
+        _uiSystem.TrySetUiState(uid, DoorElectronicsConfigurationUiKey.Key, state);
+    }
+
+    private void OnChangeConfiguration(
+        EntityUid uid,
+        DoorElectronicsComponent component,
+        DoorElectronicsUpdateConfigurationMessage args)
+    {
+        var accessReader = EnsureComp<AccessReaderComponent>(uid);
+        _accessReader.SetAccesses(uid, accessReader, args.AccessList);
+    }
+
+    private void OnAccessReaderChanged(
+        EntityUid uid,
+        DoorElectronicsComponent component,
+        AccessReaderConfigurationChangedEvent args)
+    {
+        UpdateUserInterface(uid, component);
+    }
+
+    private void OnBoundUIOpened(
+        EntityUid uid,
+        DoorElectronicsComponent component,
+        BoundUIOpenedEvent args)
+    {
+        UpdateUserInterface(uid, component);
+    }
+}
diff --git a/Content.Server/Dragon/DragonRiftSystem.cs b/Content.Server/Dragon/DragonRiftSystem.cs
index f7d5cd783d4..776aa841d85 100644
--- a/Content.Server/Dragon/DragonRiftSystem.cs
+++ b/Content.Server/Dragon/DragonRiftSystem.cs
@@ -13,6 +13,8 @@
 using System.Numerics;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Utility;
+using Content.Server.Announcements.Systems;
 
 namespace Content.Server.Dragon;
 
@@ -27,6 +29,7 @@ public sealed class DragonRiftSystem : EntitySystem
     [Dependency] private readonly NavMapSystem _navMap = default!;
     [Dependency] private readonly NPCSystem _npc = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     public override void Initialize()
     {
@@ -70,8 +73,8 @@ public override void Update(float frameTime)
                 Dirty(comp);
 
                 var location = xform.LocalPosition;
-                _chat.DispatchGlobalAnnouncement(Loc.GetString("carp-rift-warning", ("location", location)), playSound: false, colorOverride: Color.Red);
-                _audio.PlayGlobal("/Audio/Misc/notice1.ogg", Filter.Broadcast(), true);
+                _announcer.SendAnnouncement(_announcer.GetAnnouncementId("CarpRift"), Filter.Broadcast(),
+                    "carp-rift-warning", colorOverride: Color.Red, localeArgs: ("location", location));
                 _navMap.SetBeaconEnabled(uid, true);
             }
 
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 6400472d036..79e5c0a2a9c 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -10,18 +10,16 @@
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Movement.Systems;
-using Robust.Shared.Audio;
+using Content.Shared.Zombies;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.GameStates;
 using Robust.Shared.Map;
-using Robust.Shared.Player;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Dragon;
 
 public sealed partial class DragonSystem : EntitySystem
 {
     [Dependency] private readonly CarpRiftsConditionSystem _carpRifts = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDef = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
@@ -138,7 +136,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi
         var xform = Transform(uid);
 
         // Have to be on a grid fam
-        if (!_mapManager.TryGetGrid(xform.GridUid, out var grid))
+        if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
         {
             _popup.PopupEntity(Loc.GetString("carp-rift-anchor"), uid, uid);
             return;
diff --git a/Content.Server/Electrocution/Components/ElectrifiedComponent.cs b/Content.Server/Electrocution/Components/ElectrifiedComponent.cs
index 2f3def6e061..65a539eb08e 100644
--- a/Content.Server/Electrocution/Components/ElectrifiedComponent.cs
+++ b/Content.Server/Electrocution/Components/ElectrifiedComponent.cs
@@ -41,8 +41,32 @@ public sealed partial class ElectrifiedComponent : Component
     [DataField("lowVoltageNode")]
     public string? LowVoltageNode;
 
+    /// <summary>
+    /// Damage multiplier for HV electrocution
+    /// </summary>
+    [DataField]
+    public float HighVoltageDamageMultiplier = 3f;
+
+    /// <summary>
+    /// Shock time multiplier for HV electrocution
+    /// </summary>
+    [DataField]
+    public float HighVoltageTimeMultiplier = 1.5f;
+
+    /// <summary>
+    /// Damage multiplier for MV electrocution
+    /// </summary>
+    [DataField]
+    public float MediumVoltageDamageMultiplier = 2f;
+
+    /// <summary>
+    /// Shock time multiplier for MV electrocution
+    /// </summary>
+    [DataField]
+    public float MediumVoltageTimeMultiplier = 1.25f;
+
     [DataField("shockDamage")]
-    public int ShockDamage = 20;
+    public float ShockDamage = 7.5f;
 
     /// <summary>
     ///     Shock time, in seconds.
diff --git a/Content.Server/Electrocution/Components/ElectrocutionComponent.cs b/Content.Server/Electrocution/Components/ElectrocutionComponent.cs
index 9da78c9134f..7badc852579 100644
--- a/Content.Server/Electrocution/Components/ElectrocutionComponent.cs
+++ b/Content.Server/Electrocution/Components/ElectrocutionComponent.cs
@@ -15,10 +15,4 @@ public sealed partial class ElectrocutionComponent : Component
 
     [DataField("timeLeft")]
     public float TimeLeft;
-
-    [DataField("accumDamage")]
-    public float AccumulatedDamage;
-
-    [DataField("baseDamage")]
-    public float BaseDamage = 20f;
 }
diff --git a/Content.Server/Electrocution/ElectrocutionNode.cs b/Content.Server/Electrocution/ElectrocutionNode.cs
index 7abcba76666..c8e437d3532 100644
--- a/Content.Server/Electrocution/ElectrocutionNode.cs
+++ b/Content.Server/Electrocution/ElectrocutionNode.cs
@@ -9,7 +9,7 @@ namespace Content.Server.Electrocution
     public sealed partial class ElectrocutionNode : Node
     {
         [DataField("cable")]
-        public EntityUid CableEntity;
+        public EntityUid? CableEntity;
         [DataField("node")]
         public string? NodeName;
 
@@ -19,12 +19,11 @@ public override IEnumerable<Node> GetReachableNodes(TransformComponent xform,
             MapGridComponent? grid,
             IEntityManager entMan)
         {
-            var _nodeContainer = entMan.System<NodeContainerSystem>();
-
-            if (!nodeQuery.TryGetComponent(CableEntity, out var nodeContainer))
+            if (CableEntity == null || NodeName == null)
                 yield break;
 
-            if (_nodeContainer.TryGetNode(nodeContainer, NodeName, out Node? node))
+            var _nodeContainer = entMan.System<NodeContainerSystem>();
+            if (_nodeContainer.TryGetNode(CableEntity.Value, NodeName, out Node? node))
                 yield return node;
         }
     }
diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index f71f8b69742..11633062829 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -17,9 +17,7 @@
 using Content.Shared.Inventory;
 using Content.Shared.Jittering;
 using Content.Shared.Maps;
-using Content.Shared.Mobs;
 using Content.Shared.Popups;
-using Content.Shared.Pulling.Components;
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffect;
 using Content.Shared.Stunnable;
@@ -32,6 +30,8 @@
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent;
+using PullerComponent = Content.Shared.Movement.Pulling.Components.PullerComponent;
 
 namespace Content.Server.Electrocution;
 
@@ -97,29 +97,18 @@ public override void Update(float frameTime)
     private void UpdateElectrocutions(float frameTime)
     {
         var query = EntityQueryEnumerator<ElectrocutionComponent, PowerConsumerComponent>();
-        while (query.MoveNext(out var uid, out var electrocution, out var consumer))
+        while (query.MoveNext(out var uid, out var electrocution, out _))
         {
             var timePassed = Math.Min(frameTime, electrocution.TimeLeft);
 
             electrocution.TimeLeft -= timePassed;
-            electrocution.AccumulatedDamage += electrocution.BaseDamage * (consumer.ReceivedPower / consumer.DrawRate) * timePassed;
 
             if (!MathHelper.CloseTo(electrocution.TimeLeft, 0))
                 continue;
 
-            if (EntityManager.EntityExists(electrocution.Electrocuting))
-            {
-                // TODO: damage should be scaled by shock damage multiplier
-                // TODO: better paralyze/jitter timing
-                var damage = new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>(DamageType), (int) electrocution.AccumulatedDamage);
+            // We tried damage scaling based on power in the past and it really wasn't good.
+            // Various scaling types didn't fix tiders and HV grilles instantly critting players.
 
-                var actual = _damageable.TryChangeDamage(electrocution.Electrocuting, damage, origin: electrocution.Source);
-                if (actual != null)
-                {
-                    _adminLogger.Add(LogType.Electrocution,
-                        $"{ToPrettyString(electrocution.Electrocuting):entity} received {actual.GetTotal():damage} powered electrocution damage from {ToPrettyString(electrocution.Source):source}");
-                }
-            }
             QueueDel(uid);
         }
     }
@@ -197,7 +186,7 @@ private void OnLightAttacked(EntityUid uid, PoweredLightComponent component, Att
         if (!_meleeWeapon.GetDamage(args.Used, args.User).Any())
             return;
 
-        DoCommonElectrocution(args.User, uid, component.UnarmedHitShock, component.UnarmedHitStun, false, 1);
+        DoCommonElectrocution(args.User, uid, component.UnarmedHitShock, component.UnarmedHitStun, false);
     }
 
     private void OnElectrifiedInteractUsing(EntityUid uid, ElectrifiedComponent electrified, InteractUsingEvent args)
@@ -212,16 +201,6 @@ private void OnElectrifiedInteractUsing(EntityUid uid, ElectrifiedComponent elec
         TryDoElectrifiedAct(uid, args.User, siemens, electrified);
     }
 
-    private float CalculateElectrifiedDamageScale(float power)
-    {
-        // A logarithm allows a curve of damage that grows quickly, but slows down dramatically past a value. This keeps the damage to a reasonable range.
-        const float DamageShift = 1.67f; // Shifts the curve for an overall higher or lower damage baseline
-        const float CeilingCoefficent = 1.35f; // Adjusts the approach to maximum damage, higher = Higher top damage
-        const float LogGrowth = 0.00001f; // Adjusts the growth speed of the curve
-
-        return DamageShift + MathF.Log(power * LogGrowth) * CeilingCoefficent;
-    }
-
     public bool TryDoElectrifiedAct(EntityUid uid, EntityUid targetUid,
         float siemens = 1,
         ElectrifiedComponent? electrified = null,
@@ -262,19 +241,15 @@ public bool TryDoElectrifiedAct(EntityUid uid, EntityUid targetUid,
         }
 
         var node = PoweredNode(uid, electrified, nodeContainer);
-        if (node?.NodeGroup is not IBasePowerNet powerNet)
-            return false;
-
-        var net = powerNet.NetworkNode;
-        var supp = net.LastCombinedMaxSupply;
-
-        if (supp <= 0f)
+        if (node?.NodeGroup is not IBasePowerNet)
             return false;
 
-        // Initial damage scales off of the available supply on the principle that the victim has shorted the entire powernet through their body.
-        var damageScale = CalculateElectrifiedDamageScale(supp);
-        if (damageScale <= 0f)
-            return false;
+        var (damageScalar, timeScalar) = node.NodeGroupID switch
+        {
+            NodeGroupID.HVPower => (electrified.HighVoltageDamageMultiplier, electrified.HighVoltageTimeMultiplier),
+            NodeGroupID.MVPower => (electrified.MediumVoltageDamageMultiplier, electrified.MediumVoltageTimeMultiplier),
+            _ => (1f, 1f)
+        };
 
         {
             var lastRet = true;
@@ -285,8 +260,8 @@ public bool TryDoElectrifiedAct(EntityUid uid, EntityUid targetUid,
                     entity,
                     uid,
                     node,
-                    (int) MathF.Ceiling(electrified.ShockDamage * damageScale * MathF.Pow(RecursiveDamageMultiplier, depth)),
-                    TimeSpan.FromSeconds(electrified.ShockTime * MathF.Min(1f + MathF.Log2(1f + damageScale), 3f) * MathF.Pow(RecursiveTimeMultiplier, depth)),
+                    (int) (electrified.ShockDamage * MathF.Pow(RecursiveDamageMultiplier, depth) * damageScalar),
+                    TimeSpan.FromSeconds(electrified.ShockTime * MathF.Pow(RecursiveTimeMultiplier, depth) * timeScalar),
                     true,
                     electrified.SiemensCoefficient);
             }
@@ -475,14 +450,14 @@ private void GetChainedElectrocutionTargetsRecurse(
         all.Add((entity, depth));
         visited.Add(entity);
 
-        if (TryComp<SharedPullableComponent>(entity, out var pullable) &&
+        if (TryComp<PullableComponent>(entity, out var pullable) &&
             pullable.Puller is { Valid: true } pullerId &&
             !visited.Contains(pullerId))
         {
             GetChainedElectrocutionTargetsRecurse(pullerId, depth + 1, visited, all);
         }
 
-        if (TryComp<SharedPullerComponent>(entity, out var puller) &&
+        if (TryComp<PullerComponent>(entity, out var puller) &&
             puller.Pulling is { Valid: true } pullingId &&
             !visited.Contains(pullingId))
         {
diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
index 61c4937a271..a0bbbdf350a 100644
--- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
@@ -6,14 +6,13 @@
 using Content.Shared.Maps;
 using Content.Shared.Stacks;
 using JetBrains.Annotations;
-using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Engineering.EntitySystems
 {
     [UsedImplicitly]
     public sealed class SpawnAfterInteractSystem : EntitySystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
         [Dependency] private readonly StackSystem _stackSystem = default!;
 
@@ -30,7 +29,7 @@ private async void HandleAfterInteract(EntityUid uid, SpawnAfterInteractComponen
                 return;
             if (string.IsNullOrEmpty(component.Prototype))
                 return;
-            if (!_mapManager.TryGetGrid(args.ClickLocation.GetGridUid(EntityManager), out var grid))
+            if (!TryComp<MapGridComponent>(args.ClickLocation.GetGridUid(EntityManager), out var grid))
                 return;
             if (!grid.TryGetTileRef(args.ClickLocation, out var tileRef))
                 return;
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index 28687d17cd7..a04f274491c 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -106,6 +106,7 @@ public override void Init()
                 IoCManager.Resolve<ServerInfoManager>().Initialize();
                 IoCManager.Resolve<JoinQueueManager>().Initialize();
                 IoCManager.Resolve<DiscordAuthManager>().Initialize();
+                IoCManager.Resolve<ServerApi>().Initialize();
 
                 _voteManager.Initialize();
                 _updateManager.Initialize();
@@ -171,6 +172,7 @@ protected override void Dispose(bool disposing)
         {
             _playTimeTracking?.Shutdown();
             _dbManager?.Shutdown();
+            IoCManager.Resolve<ServerApi>().Shutdown();
         }
 
         private static void LoadConfigPresets(IConfigurationManager cfg, IResourceManager res, ISawmill sawmill)
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs b/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
index 8d2a699de27..7db1f513f7c 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
@@ -271,7 +271,7 @@ private void AddNewAdjacentTiles(int iteration, IEnumerable<Vector2i> tiles, boo
                 var direction = (AtmosDirection) (1 << i);
                 if (ignoreTileBlockers || !blockedDirections.IsFlagSet(direction))
                 {
-                    ProcessNewTile(iteration, tile.Offset(direction), direction.GetOpposite());
+                    ProcessNewTile(iteration, tile.Offset(direction), i.ToOppositeDir());
                 }
             }
 
@@ -300,7 +300,7 @@ private void AddNewAdjacentTiles(int iteration, IEnumerable<Vector2i> tiles, boo
                 var direction = (AtmosDirection) (1 << i);
                 if (blockedDirections.IsFlagSet(direction))
                 {
-                    list.Add((tile.Offset(direction), direction.GetOpposite()));
+                    list.Add((tile.Offset(direction), i.ToOppositeDir()));
                 }
             }
         }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSpaceTileFlood.cs b/Content.Server/Explosion/EntitySystems/ExplosionSpaceTileFlood.cs
index f8c917c1cd6..313b03e03a6 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSpaceTileFlood.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSpaceTileFlood.cs
@@ -97,7 +97,7 @@ private void AddNewAdjacentTiles(int iteration, IEnumerable<Vector2i> tiles)
                 if (!unblockedDirections.IsFlagSet(direction))
                     continue; // explosion cannot propagate in this direction. Ever.
 
-                ProcessNewTile(iteration, tile.Offset(direction), direction.GetOpposite());
+                ProcessNewTile(iteration, tile.Offset(direction), i.ToOppositeDir());
             }
         }
     }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
index af150c93250..55e8de26321 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
@@ -4,7 +4,6 @@
 using Content.Shared.Damage;
 using Content.Shared.Explosion;
 using Content.Shared.FixedPoint;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 
 namespace Content.Server.Explosion.EntitySystems;
@@ -102,7 +101,7 @@ private void OnAirtightDamaged(EntityUid uid, AirtightComponent airtight, Damage
         if (!EntityManager.TryGetComponent(uid, out TransformComponent? transform) || !transform.Anchored)
             return;
 
-        if (!_mapManager.TryGetGrid(transform.GridUid, out var grid))
+        if (!TryComp<MapGridComponent>(transform.GridUid, out var grid))
             return;
 
         UpdateAirtightMap(transform.GridUid.Value, grid, grid.CoordinatesToTile(transform.Coordinates));
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
index b04642a8db0..719a2eca797 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
@@ -23,7 +23,7 @@ public sealed partial class ExplosionSystem : EntitySystem
     /// </summary>
     private void OnGridStartup(GridStartupEvent ev)
     {
-        var grid = _mapManager.GetGrid(ev.EntityUid);
+        var grid = Comp<MapGridComponent>(ev.EntityUid);
 
         Dictionary<Vector2i, NeighborFlag> edges = new();
         _gridEdges[ev.EntityUid] = edges;
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index 4a9477e7443..14a149074dc 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using System.Numerics;
 using Content.Shared.CCVar;
 using Content.Shared.Damage;
@@ -17,6 +16,7 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
+using Content.Server.Atmos.EntitySystems;
 
 namespace Content.Server.Explosion.EntitySystems;
 
@@ -36,20 +36,20 @@ public sealed partial class ExplosionSystem
     ///     Queue for delayed processing of explosions. If there is an explosion that covers more than <see
     ///     cref="TilesPerTick"/> tiles, other explosions will actually be delayed slightly. Unless it's a station
     ///     nuke, this delay should never really be noticeable.
+    ///     This is also used to combine explosion intensities of the same kind.
     /// </summary>
-    private Queue<Func<Explosion?>> _explosionQueue = new();
+    private Queue<QueuedExplosion> _explosionQueue = new();
 
     /// <summary>
-    ///     The explosion currently being processed.
+    /// All queued explosions that will be processed in <see cref="_explosionQueue"/>.
+    /// These always have the same contents.
     /// </summary>
-    private Explosion? _activeExplosion;
+    private HashSet<QueuedExplosion> _queuedExplosions = new();
 
     /// <summary>
-    ///     While processing an explosion, the "progress" is sent to clients, so that the explosion fireball effect
-    ///     syncs up with the damage. When the tile iteration increments, an update needs to be sent to clients.
-    ///     This integer keeps track of the last value sent to clients.
+    ///     The explosion currently being processed.
     /// </summary>
-    private int _previousTileIteration;
+    private Explosion? _activeExplosion;
 
     /// <summary>
     /// This list is used when raising <see cref="BeforeExplodeEvent"/> to avoid allocating a new list per event.
@@ -98,18 +98,17 @@ public override void Update(float frameTime)
                 if (MathF.Max(MaxProcessingTime - 1, 0.1f)  < Stopwatch.Elapsed.TotalMilliseconds)
                     break;
 
-                if (!_explosionQueue.TryDequeue(out var spawnNextExplosion))
+                if (!_explosionQueue.TryDequeue(out var queued))
                     break;
 
-                _activeExplosion = spawnNextExplosion();
+                _queuedExplosions.Remove(queued);
+                _activeExplosion = SpawnExplosion(queued);
 
                 // explosion spawning can be null if something somewhere went wrong. (e.g., negative explosion
                 // intensity).
                 if (_activeExplosion == null)
                     continue;
 
-                _previousTileIteration = 0;
-
                 // just a lil nap
                 if (SleepNodeSys)
                 {
@@ -858,3 +857,15 @@ private void SetTiles()
         _tileUpdateDict.Clear();
     }
 }
+
+/// <summary>
+/// Data needed to spawn an explosion with <see cref="ExplosionSystem.SpawnExplosion"/>.
+/// </summary>
+public sealed class QueuedExplosion
+{
+    public MapCoordinates Epicenter;
+    public ExplosionPrototype Proto = new();
+    public float TotalIntensity, Slope, MaxTileIntensity, TileBreakScale;
+    public int MaxTileBreak;
+    public bool CanCreateVacuum;
+}
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
index afad0e27e09..a42dd110831 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Explosion;
 using Content.Shared.Explosion.Components;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
 
@@ -56,7 +57,7 @@ public sealed partial class ExplosionSystem : EntitySystem
         else if (referenceGrid != null)
         {
             // reference grid defines coordinate system that the explosion in space will use
-            initialTile = _mapManager.GetGrid(referenceGrid.Value).WorldToTile(epicenter.Position);
+            initialTile = Comp<MapGridComponent>(referenceGrid.Value).WorldToTile(epicenter.Position);
         }
         else
         {
@@ -87,7 +88,7 @@ public sealed partial class ExplosionSystem : EntitySystem
         var spaceAngle = Angle.Zero;
         if (referenceGrid != null)
         {
-            var xform = Transform(_mapManager.GetGrid(referenceGrid.Value).Owner);
+            var xform = Transform(Comp<MapGridComponent>(referenceGrid.Value).Owner);
             spaceMatrix = xform.WorldMatrix;
             spaceAngle = xform.WorldRotation;
         }
@@ -102,7 +103,7 @@ public sealed partial class ExplosionSystem : EntitySystem
                 airtightMap = new();
 
             var initialGridData = new ExplosionGridTileFlood(
-                _mapManager.GetGrid(epicentreGrid.Value),
+                Comp<MapGridComponent>(epicentreGrid.Value),
                 airtightMap,
                 maxIntensity,
                 stepSize,
@@ -191,7 +192,7 @@ public sealed partial class ExplosionSystem : EntitySystem
                         airtightMap = new();
 
                     data = new ExplosionGridTileFlood(
-                        _mapManager.GetGrid(grid),
+                        Comp<MapGridComponent>(grid),
                         airtightMap,
                         maxIntensity,
                         stepSize,
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 6351d999a98..607a514e63c 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -112,6 +112,7 @@ public override void Initialize()
     private void OnReset(RoundRestartCleanupEvent ev)
     {
         _explosionQueue.Clear();
+        _queuedExplosions.Clear();
         if (_activeExplosion != null)
             QueueDel(_activeExplosion.VisualEnt);
         _activeExplosion = null;
@@ -297,8 +298,36 @@ public void QueueExplosion(MapCoordinates epicenter,
         if (addLog) // dont log if already created a separate, more detailed, log.
             _adminLogger.Add(LogType.Explosion, LogImpact.High, $"Explosion ({typeId}) spawned at {epicenter:coordinates} with intensity {totalIntensity} slope {slope}");
 
-        _explosionQueue.Enqueue(() => SpawnExplosion(epicenter, type, totalIntensity,
-            slope, maxTileIntensity, tileBreakScale, maxTileBreak, canCreateVacuum));
+        // try to combine explosions on the same tile if they are the same type
+        foreach (var queued in _queuedExplosions)
+        {
+            // ignore different types or those on different maps
+            if (queued.Proto.ID != type.ID || queued.Epicenter.MapId != epicenter.MapId)
+                continue;
+
+            var dst2 = queued.Proto.MaxCombineDistance * queued.Proto.MaxCombineDistance;
+            var direction = queued.Epicenter.Position - epicenter.Position;
+            if (direction.LengthSquared() > dst2)
+                continue;
+
+            // they are close enough to combine so just add total intensity and prevent queuing another one
+            queued.TotalIntensity += totalIntensity;
+            return;
+        }
+
+        var boom = new QueuedExplosion()
+        {
+            Epicenter = epicenter,
+            Proto = type,
+            TotalIntensity = totalIntensity,
+            Slope = slope,
+            MaxTileIntensity = maxTileIntensity,
+            TileBreakScale = tileBreakScale,
+            MaxTileBreak = maxTileBreak,
+            CanCreateVacuum = canCreateVacuum
+        };
+        _explosionQueue.Enqueue(boom);
+        _queuedExplosions.Add(boom);
     }
 
     /// <summary>
@@ -306,32 +335,26 @@ public void QueueExplosion(MapCoordinates epicenter,
     ///     information about the affected tiles for the explosion system to process. It will also trigger the
     ///     camera shake and sound effect.
     /// </summary>
-    private Explosion? SpawnExplosion(MapCoordinates epicenter,
-        ExplosionPrototype type,
-        float totalIntensity,
-        float slope,
-        float maxTileIntensity,
-        float tileBreakScale,
-        int maxTileBreak,
-        bool canCreateVacuum)
+    private Explosion? SpawnExplosion(QueuedExplosion queued)
     {
-        if (!_mapManager.MapExists(epicenter.MapId))
+        var pos = queued.Epicenter;
+        if (!_mapManager.MapExists(pos.MapId))
             return null;
 
-        var results = GetExplosionTiles(epicenter, type.ID, totalIntensity, slope, maxTileIntensity);
+        var results = GetExplosionTiles(pos, queued.Proto.ID, queued.TotalIntensity, queued.Slope, queued.MaxTileIntensity);
 
         if (results == null)
             return null;
 
         var (area, iterationIntensity, spaceData, gridData, spaceMatrix) = results.Value;
 
-        var visualEnt = CreateExplosionVisualEntity(epicenter, type.ID, spaceMatrix, spaceData, gridData.Values, iterationIntensity);
+        var visualEnt = CreateExplosionVisualEntity(pos, queued.Proto.ID, spaceMatrix, spaceData, gridData.Values, iterationIntensity);
 
         // camera shake
-        CameraShake(iterationIntensity.Count * 4f, epicenter, totalIntensity);
+        CameraShake(iterationIntensity.Count * 4f, pos, queued.TotalIntensity);
 
         //For whatever bloody reason, sound system requires ENTITY coordinates.
-        var mapEntityCoords = EntityCoordinates.FromMap(_mapManager.GetMapEntityId(epicenter.MapId), epicenter, _transformSystem, EntityManager);
+        var mapEntityCoords = EntityCoordinates.FromMap(_mapManager.GetMapEntityId(pos.MapId), pos, _transformSystem, EntityManager);
 
         // play sound.
         // for the normal audio, we want everyone in pvs range
@@ -339,34 +362,35 @@ public void QueueExplosion(MapCoordinates epicenter,
         // this is capped to 30 because otherwise really huge bombs
         // will attempt to play regular audio for people who can't hear it anyway because the epicenter is so far away
         var audioRange = Math.Min(iterationIntensity.Count * 2, MaxExplosionAudioRange);
-        var filter = Filter.Pvs(epicenter).AddInRange(epicenter, audioRange);
-        var sound = iterationIntensity.Count < type.SmallSoundIterationThreshold
-            ? type.SmallSound
-            : type.Sound;
+        var filter = Filter.Pvs(pos).AddInRange(pos, audioRange);
+        var sound = iterationIntensity.Count < queued.Proto.SmallSoundIterationThreshold
+            ? queued.Proto.SmallSound
+            : queued.Proto.Sound;
 
         _audio.PlayStatic(sound, filter, mapEntityCoords, true, sound.Params);
 
         // play far sound
         // far sound should play for anyone who wasn't in range of any of the effects of the bomb
         var farAudioRange = iterationIntensity.Count * 5;
-        var farFilter = Filter.Empty().AddInRange(epicenter, farAudioRange).RemoveInRange(epicenter, audioRange);
-        var farSound = iterationIntensity.Count < type.SmallSoundIterationThreshold
-            ? type.SmallSoundFar
-            : type.SoundFar;
+        var farFilter = Filter.Empty().AddInRange(pos, farAudioRange).RemoveInRange(pos, audioRange);
+        var farSound = iterationIntensity.Count < queued.Proto.SmallSoundIterationThreshold
+            ? queued.Proto.SmallSoundFar
+            : queued.Proto.SoundFar;
 
         _audio.PlayGlobal(farSound, farFilter, true, farSound.Params);
 
         return new Explosion(this,
-            type,
+            queued.Proto,
             spaceData,
             gridData.Values.ToList(),
             iterationIntensity,
-            epicenter,
+            pos,
             spaceMatrix,
             area,
-            tileBreakScale,
-            maxTileBreak,
-            canCreateVacuum,
+            // TODO: instead of le copy paste fields refactor so it has QueuedExplosion as a field?
+            queued.TileBreakScale,
+            queued.MaxTileBreak,
+            queued.CanCreateVacuum,
             EntityManager,
             _mapManager,
             visualEnt);
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index e24de5a2f66..94f55855362 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Explosion.Components;
 using Content.Server.Flash;
+using Content.Server.Pinpointer;
 using Content.Shared.Flash.Components;
 using Content.Server.Radio.EntitySystems;
 using Content.Shared.Chemistry.Components;
@@ -31,6 +32,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Player;
 using Content.Shared.Coordinates;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Explosion.EntitySystems
 {
@@ -67,6 +69,7 @@ public sealed partial class TriggerSystem : EntitySystem
         [Dependency] private readonly BodySystem _body = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+        [Dependency] private readonly NavMapSystem _navMap = default!;
         [Dependency] private readonly RadioSystem _radioSystem = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -185,12 +188,7 @@ private void HandleRattleTrigger(EntityUid uid, RattleComponent component, Trigg
                 return;
 
             // Gets location of the implant
-            var ownerXform = Transform(uid);
-            var pos = ownerXform.MapPosition;
-            var x = (int) pos.X;
-            var y = (int) pos.Y;
-            var posText = $"({x}, {y})";
-
+            var posText = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString(uid));
             var critMessage = Loc.GetString(component.CritMessage, ("user", implanted.ImplantedEntity.Value), ("position", posText));
             var deathMessage = Loc.GetString(component.DeathMessage, ("user", implanted.ImplantedEntity.Value), ("position", posText));
 
diff --git a/Content.Server/Extinguisher/FireExtinguisherSystem.cs b/Content.Server/Extinguisher/FireExtinguisherSystem.cs
index dfecd72398d..b33a1af157f 100644
--- a/Content.Server/Extinguisher/FireExtinguisherSystem.cs
+++ b/Content.Server/Extinguisher/FireExtinguisherSystem.cs
@@ -73,6 +73,7 @@ private void OnAfterInteract(Entity<FireExtinguisherComponent> entity, ref After
 
         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))
         {
diff --git a/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs b/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs
index 24ee2b71541..2d54c03b51b 100644
--- a/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs
+++ b/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs
@@ -1,10 +1,8 @@
 using Content.Shared.StatusEffect;
 using Content.Shared.Inventory;
-using Content.Shared.Item;
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Eye.Blinding.Systems;
 using Content.Shared.Tools.Components;
-using Content.Shared.Item.ItemToggle;
 using Content.Shared.Item.ItemToggle.Components;
 
 namespace Content.Server.Eye.Blinding.EyeProtection
@@ -13,7 +11,6 @@ public sealed class EyeProtectionSystem : EntitySystem
     {
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
         [Dependency] private readonly BlindableSystem _blindingSystem = default!;
-        [Dependency] private readonly SharedItemToggleSystem _itemToggle = default!;
         
         public override void Initialize()
         {
diff --git a/Content.Server/Fluids/Components/PreventSpillerComponent.cs b/Content.Server/Fluids/Components/PreventSpillerComponent.cs
deleted file mode 100644
index 37096f1bb3c..00000000000
--- a/Content.Server/Fluids/Components/PreventSpillerComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Fluids.Components;
-
-[RegisterComponent]
-public sealed partial class PreventSpillerComponent : Component
-{
-
-}
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
index 3cd6d06aebd..7780e5d4676 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
@@ -1,6 +1,5 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Fluids.Components;
-using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
@@ -8,15 +7,14 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Database;
-using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory.Events;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Spillable;
 using Content.Shared.Throwing;
-using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Player;
 
@@ -24,9 +22,6 @@ namespace Content.Server.Fluids.EntitySystems;
 
 public sealed partial class PuddleSystem
 {
-    [Dependency] private readonly OpenableSystem _openable = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-
     protected override void InitializeSpillable()
     {
         base.InitializeSpillable();
@@ -34,8 +29,8 @@ protected override void InitializeSpillable()
         SubscribeLocalEvent<SpillableComponent, LandEvent>(SpillOnLand);
         // Openable handles the event if it's closed
         SubscribeLocalEvent<SpillableComponent, MeleeHitEvent>(SplashOnMeleeHit, after: [typeof(OpenableSystem)]);
-        SubscribeLocalEvent<SpillableComponent, GetVerbsEvent<Verb>>(AddSpillVerb);
         SubscribeLocalEvent<SpillableComponent, GotEquippedEvent>(OnGotEquipped);
+        SubscribeLocalEvent<SpillableComponent, GotUnequippedEvent>(OnGotUnequipped);
         SubscribeLocalEvent<SpillableComponent, SolutionContainerOverflowEvent>(OnOverflow);
         SubscribeLocalEvent<SpillableComponent, SpillDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<SpillableComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
@@ -121,6 +116,9 @@ private void OnGotEquipped(Entity<SpillableComponent> entity, ref GotEquippedEve
         if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln, out var solution))
             return;
 
+        // block access to the solution while worn
+        AddComp<BlockSolutionAccessComponent>(entity);
+
         if (solution.Volume == 0)
             return;
 
@@ -129,12 +127,23 @@ private void OnGotEquipped(Entity<SpillableComponent> entity, ref GotEquippedEve
         TrySplashSpillAt(entity.Owner, Transform(args.Equipee).Coordinates, drainedSolution, out _);
     }
 
+    private void OnGotUnequipped(Entity<SpillableComponent> entity, ref GotUnequippedEvent args)
+    {
+        if (!entity.Comp.SpillWorn)
+            return;
+
+        RemCompDeferred<BlockSolutionAccessComponent>(entity);
+    }
+
     private void SpillOnLand(Entity<SpillableComponent> entity, ref LandEvent args)
     {
         if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln, out var solution))
             return;
 
-        if (_openable.IsClosed(entity.Owner))
+        if (Openable.IsClosed(entity.Owner))
+            return;
+
+        if (!entity.Comp.SpillWhenThrown)
             return;
 
         if (args.User != null)
@@ -153,7 +162,7 @@ private void SpillOnLand(Entity<SpillableComponent> entity, ref LandEvent args)
     private void OnAttemptPacifiedThrow(Entity<SpillableComponent> ent, ref AttemptPacifiedThrowEvent args)
     {
         // Don’t care about closed containers.
-        if (_openable.IsClosed(ent))
+        if (Openable.IsClosed(ent))
             return;
 
         // Don’t care about empty containers.
@@ -163,58 +172,6 @@ private void OnAttemptPacifiedThrow(Entity<SpillableComponent> ent, ref AttemptP
         args.Cancel("pacified-cannot-throw-spill");
     }
 
-    private void AddSpillVerb(Entity<SpillableComponent> entity, ref GetVerbsEvent<Verb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract)
-            return;
-
-        if (!_solutionContainerSystem.TryGetSolution(args.Target, entity.Comp.SolutionName, out var soln, out var solution))
-            return;
-
-        if (_openable.IsClosed(args.Target))
-            return;
-
-        if (solution.Volume == FixedPoint2.Zero)
-            return;
-
-        if (_entityManager.HasComponent<PreventSpillerComponent>(args.User))
-            return;
-
-
-        Verb verb = new()
-        {
-            Text = Loc.GetString("spill-target-verb-get-data-text")
-        };
-
-        // TODO VERB ICONS spill icon? pouring out a glass/beaker?
-        if (entity.Comp.SpillDelay == null)
-        {
-            var target = args.Target;
-            verb.Act = () =>
-            {
-                var puddleSolution = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume);
-                TrySpillAt(Transform(target).Coordinates, puddleSolution, out _);
-            };
-        }
-        else
-        {
-            var user = args.User;
-            verb.Act = () =>
-            {
-                _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, entity.Comp.SpillDelay ?? 0, new SpillDoAfterEvent(), entity.Owner, target: entity.Owner)
-                {
-                    BreakOnTargetMove = true,
-                    BreakOnUserMove = true,
-                    BreakOnDamage = true,
-                    NeedHand = true,
-                });
-            };
-        }
-        verb.Impact = LogImpact.Medium; // dangerous reagent reaction are logged separately.
-        verb.DoContactInteraction = true;
-        args.Verbs.Add(verb);
-    }
-
     private void OnDoAfter(Entity<SpillableComponent> entity, ref SpillDoAfterEvent args)
     {
         if (args.Handled || args.Cancelled || args.Args.Target == null)
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index e3481f98da3..923210cc73c 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -46,7 +46,6 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
-    [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly ReactiveSystem _reactive = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
@@ -551,11 +550,8 @@ public Solution GetOverflowSolution(EntityUid uid, PuddleComponent? puddle = nul
 
     #region Spill
 
-    /// <summary>
-    ///     First splashes reagent on reactive entities near the spilling entity, then spills the rest regularly to a
-    ///     puddle. This is intended for 'destructive' spills, like when entities are destroyed or thrown.
-    /// </summary>
-    public bool TrySplashSpillAt(EntityUid uid,
+    /// <inheritdoc/>
+    public override bool TrySplashSpillAt(EntityUid uid,
         EntityCoordinates coordinates,
         Solution solution,
         out EntityUid puddleUid,
@@ -600,11 +596,8 @@ public bool TrySplashSpillAt(EntityUid uid,
         return TrySpillAt(coordinates, solution, out puddleUid, sound);
     }
 
-    /// <summary>
-    ///     Spills solution at the specified coordinates.
-    /// Will add to an existing puddle if present or create a new one if not.
-    /// </summary>
-    public bool TrySpillAt(EntityCoordinates coordinates, Solution solution, out EntityUid puddleUid, bool sound = true)
+    /// <inheritdoc/>
+    public override bool TrySpillAt(EntityCoordinates coordinates, Solution solution, out EntityUid puddleUid, bool sound = true)
     {
         if (solution.Volume == 0)
         {
@@ -622,10 +615,8 @@ public bool TrySpillAt(EntityCoordinates coordinates, Solution solution, out Ent
         return TrySpillAt(_map.GetTileRef(gridUid.Value, mapGrid, coordinates), solution, out puddleUid, sound);
     }
 
-    /// <summary>
-    /// <see cref="TrySpillAt(Robust.Shared.Map.EntityCoordinates,Content.Shared.Chemistry.Components.Solution,out Robust.Shared.GameObjects.EntityUid,bool)"/>
-    /// </summary>
-    public bool TrySpillAt(EntityUid uid, Solution solution, out EntityUid puddleUid, bool sound = true,
+    /// <inheritdoc/>
+    public override bool TrySpillAt(EntityUid uid, Solution solution, out EntityUid puddleUid, bool sound = true,
         TransformComponent? transformComponent = null)
     {
         if (!Resolve(uid, ref transformComponent, false))
@@ -637,10 +628,8 @@ public bool TrySpillAt(EntityUid uid, Solution solution, out EntityUid puddleUid
         return TrySpillAt(transformComponent.Coordinates, solution, out puddleUid, sound: sound);
     }
 
-    /// <summary>
-    /// <see cref="TrySpillAt(Robust.Shared.Map.EntityCoordinates,Content.Shared.Chemistry.Components.Solution,out Robust.Shared.GameObjects.EntityUid,bool)"/>
-    /// </summary>
-    public bool TrySpillAt(TileRef tileRef, Solution solution, out EntityUid puddleUid, bool sound = true,
+    /// <inheritdoc/>
+    public override bool TrySpillAt(TileRef tileRef, Solution solution, out EntityUid puddleUid, bool sound = true,
         bool tileReact = true)
     {
         if (solution.Volume <= 0)
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 6e02c4ac404..154244ace19 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -4,6 +4,7 @@
 using Content.Server.GameTicking.Events;
 using Content.Server.Ghost;
 using Content.Server.Maps;
+using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.GameTicking;
 using Content.Shared.Mind;
@@ -19,6 +20,7 @@
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
+using Content.Server.Announcements.Systems;
 
 namespace Content.Server.GameTicking
 {
@@ -26,6 +28,7 @@ public sealed partial class GameTicker
     {
         [Dependency] private readonly DiscordWebhook _discord = default!;
         [Dependency] private readonly ITaskManager _taskManager = default!;
+        [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
         private static readonly Counter RoundNumberMetric = Metrics.CreateCounter(
             "ss14_round_number",
@@ -194,26 +197,18 @@ public void StartRound(bool force = false)
 
             SendServerMessage(Loc.GetString("game-ticker-start-round"));
 
-            // Just in case it hasn't been loaded previously we'll try loading it.
-            LoadMaps();
-
-            // map has been selected so update the lobby info text
-            // applies to players who didn't ready up
-            UpdateInfoText();
-
-            StartGamePresetRules();
-
-            RoundLengthMetric.Set(0);
-
-            var startingEvent = new RoundStartingEvent(RoundId);
-            RaiseLocalEvent(startingEvent);
             var readyPlayers = new List<ICommonSession>();
             var readyPlayerProfiles = new Dictionary<NetUserId, HumanoidCharacterProfile>();
-
+            var autoDeAdmin = _cfg.GetCVar(CCVars.AdminDeadminOnJoin);
             foreach (var (userId, status) in _playerGameStatuses)
             {
                 if (LobbyEnabled && status != PlayerGameStatus.ReadyToPlay) continue;
                 if (!_playerManager.TryGetSessionById(userId, out var session)) continue;
+
+                if (autoDeAdmin && _adminManager.IsAdmin(session))
+                {
+                    _adminManager.DeAdmin(session);
+                }
 #if DEBUG
                 DebugTools.Assert(_userDb.IsLoadComplete(session), $"Player was readied up but didn't have user DB data loaded yet??");
 #endif
@@ -235,6 +230,20 @@ public void StartRound(bool force = false)
                 readyPlayerProfiles.Add(userId, profile);
             }
 
+            // Just in case it hasn't been loaded previously we'll try loading it.
+            LoadMaps();
+
+            // map has been selected so update the lobby info text
+            // applies to players who didn't ready up
+            UpdateInfoText();
+
+            StartGamePresetRules();
+
+            RoundLengthMetric.Set(0);
+
+            var startingEvent = new RoundStartingEvent(RoundId);
+            RaiseLocalEvent(startingEvent);
+
             var origReadyPlayers = readyPlayers.ToArray();
 
             if (!StartPreset(origReadyPlayers, force))
@@ -601,11 +610,8 @@ private void AnnounceRound()
 
             var proto = _robustRandom.Pick(options);
 
-            if (proto.Message != null)
-                _chatSystem.DispatchGlobalAnnouncement(Loc.GetString(proto.Message), playSound: true);
-
-            if (proto.Sound != null)
-                _audio.PlayGlobal(proto.Sound, Filter.Broadcast(), true);
+            _announcer.SendAnnouncement(_announcer.GetAnnouncementId(proto.ID), Filter.Broadcast(),
+                proto.Message ?? "game-ticker-welcome-to-the-station");
         }
 
         private async void SendRoundStartedDiscordMessage()
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 658832f36ba..f007718f6b4 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -44,7 +44,7 @@ public sealed partial class GameTicker
         // Mainly to avoid allocations.
         private readonly List<EntityCoordinates> _possiblePositions = new();
 
-        private List<EntityUid> GetSpawnableStations()
+        public List<EntityUid> GetSpawnableStations()
         {
             var spawnableStations = new List<EntityUid>();
             var query = EntityQueryEnumerator<StationJobsComponent, StationSpawningComponent>();
@@ -155,10 +155,6 @@ private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile charact
                 return;
             }
 
-            // Automatically de-admin players who are joining.
-            if (_cfg.GetCVar(CCVars.AdminDeadminOnJoin) && _adminManager.IsAdmin(player))
-                _adminManager.DeAdmin(player);
-
             // We raise this event to allow other systems to handle spawning this player themselves. (e.g. late-join wizard, etc)
             var bev = new PlayerBeforeSpawnEvent(player, character, jobId, lateJoin, station);
             RaiseLocalEvent(bev);
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
index 7563d66dbad..a60a2bfe22f 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
@@ -119,8 +119,7 @@ protected bool TryFindRandomTileOnStation(Entity<StationDataComponent> station,
             var randomY = RobustRandom.Next((int) aabb.Bottom, (int) aabb.Top);
 
             tile = new Vector2i(randomX, randomY);
-            if (_atmosphere.IsTileSpace(targetGrid, Transform(targetGrid).MapUid, tile,
-                    mapGridComp: gridComp)
+            if (_atmosphere.IsTileSpace(targetGrid, Transform(targetGrid).MapUid, tile)
                 || _atmosphere.IsTileAirBlocked(targetGrid, tile, mapGridComp: gridComp))
             {
                 continue;
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index b9255bcbe4f..46040e29450 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -763,10 +763,6 @@ private void SpawnOperatives(List<NukieSpawn> sessions, bool spawnGhostRoles, Nu
                 _mind.SetUserId(newMind, nukieSession.Session.UserId);
                 _roles.MindAddRole(newMind, new NukeopsRoleComponent { PrototypeId = nukieSession.Type.AntagRoleProto });
 
-                // Automatically de-admin players who are being made nukeops
-                if (_cfg.GetCVar(CCVars.AdminDeadminOnJoin) && _adminManager.IsAdmin(nukieSession.Session))
-                    _adminManager.DeAdmin(nukieSession.Session);
-
                 _mind.TransferTo(newMind, mob);
             }
             //Otherwise, spawn as a ghost role
diff --git a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
index 98926536b9d..128f1123043 100644
--- a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
@@ -24,6 +24,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -180,7 +181,7 @@ private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev)
 
             var aabbs = EntityQuery<StationDataComponent>().SelectMany(x =>
                     x.Grids.Select(x =>
-                        xformQuery.GetComponent(x).WorldMatrix.TransformBox(_mapManager.GetGridComp(x).LocalAABB)))
+                        xformQuery.GetComponent(x).WorldMatrix.TransformBox(Comp<MapGridComponent>(x).LocalAABB)))
                 .ToArray();
 
             var aabb = aabbs[0];
diff --git a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
index 6a00eb7d102..fa5f17b4f37 100644
--- a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Administration.Logs;
+using Content.Server.Chat.Managers;
 using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Shared.Random;
@@ -17,6 +18,7 @@ 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!;
 
     protected override void Added(EntityUid uid, SecretRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
@@ -42,6 +44,7 @@ private void PickRule(SecretRuleComponent component)
         var preset = _prototypeManager.Index<WeightedRandomPrototype>(presetString).Pick(_random);
         Log.Info($"Selected {preset} for secret.");
         _adminLogger.Add(LogType.EventStarted, $"Selected {preset} for secret.");
+        _chatManager.SendAdminAnnouncement(Loc.GetString("rule-secret-selected-preset", ("preset", preset)));
 
         var rules = _prototypeManager.Index<GamePresetPrototype>(preset).Rules;
         foreach (var rule in rules)
diff --git a/Content.Server/GameTicking/Rules/VariationPass/Components/CutWireVariationPassComponent.cs b/Content.Server/GameTicking/Rules/VariationPass/Components/CutWireVariationPassComponent.cs
new file mode 100644
index 00000000000..dc9a582ec99
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/VariationPass/Components/CutWireVariationPassComponent.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Whitelist;
+
+namespace Content.Server.GameTicking.Rules.VariationPass.Components;
+
+/// <summary>
+/// Handles cutting a random wire on random devices around the station.
+/// </summary>
+[RegisterComponent]
+public sealed partial class CutWireVariationPassComponent : Component
+{
+    /// <summary>
+    /// Blacklist of hackable entities that should not be chosen to
+    /// have wires cut.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist Blacklist = new();
+
+    /// <summary>
+    /// Chance for an individual wire to be cut.
+    /// </summary>
+    [DataField]
+    public float WireCutChance = 0.05f;
+
+    /// <summary>
+    /// Maximum number of wires that can be cut stationwide.
+    /// </summary>
+    [DataField]
+    public int MaxWiresCut = 10;
+}
diff --git a/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs
new file mode 100644
index 00000000000..fd94c74ac8c
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs
@@ -0,0 +1,39 @@
+using Content.Server.GameTicking.Rules.VariationPass.Components;
+using Content.Server.Wires;
+using Robust.Shared.Random;
+
+namespace Content.Server.GameTicking.Rules.VariationPass;
+
+/// <summary>
+/// Handles cutting a random wire on random devices around the station.
+/// This system identifies target devices and adds <see cref="CutWireOnMapInitComponent"/> to them.
+/// The actual wire cutting is handled by <see cref="CutWireOnMapInitSystem"/>.
+/// </summary>
+public sealed class CutWireVariationPassSystem : VariationPassSystem<CutWireVariationPassComponent>
+{
+    protected override void ApplyVariation(Entity<CutWireVariationPassComponent> ent, ref StationVariationPassEvent args)
+    {
+        var wiresCut = 0;
+        var query = AllEntityQuery<WiresComponent, TransformComponent>();
+        while (query.MoveNext(out var uid, out _, out var transform))
+        {
+            // Ignore if not part of the station
+            if (!IsMemberOfStation((uid, transform), ref args))
+                continue;
+
+            // Check against blacklist
+            if (ent.Comp.Blacklist.IsValid(uid))
+                continue;
+
+            if (Random.Prob(ent.Comp.WireCutChance))
+            {
+                EnsureComp<CutWireOnMapInitComponent>(uid);
+                wiresCut++;
+
+                // Limit max wires cut
+                if (wiresCut >= ent.Comp.MaxWiresCut)
+                    break;
+            }
+        }
+    }
+}
diff --git a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
index 0b7cb9cf8f7..e8dc37dc1eb 100644
--- a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
@@ -22,6 +22,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using System.Globalization;
+using Content.Server.Announcements.Systems;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -41,6 +42,7 @@ public sealed class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly AntagSelectionSystem _antagSelection = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     public override void Initialize()
     {
@@ -123,7 +125,9 @@ private void CheckRoundEnd(ZombieRuleComponent zombieRuleComponent)
         {
             foreach (var station in _station.GetStations())
             {
-                _chat.DispatchStationAnnouncement(station, Loc.GetString("zombie-shuttle-call"), colorOverride: Color.Crimson);
+                _announcer.SendAnnouncement(_announcer.GetAnnouncementId("ShuttleCalled"),
+                    _station.GetInOwningStation(station), "zombie-shuttle-call",
+                    colorOverride: Color.Crimson);
             }
             _roundEnd.RequestRoundEnd(null, false);
         }
@@ -249,7 +253,7 @@ private void InfectInitialPlayers(ZombieRuleComponent component)
             _playerManager.Sessions,
             component.PatientZeroPrototypeId,
             includeAllJobs: false,
-            customExcludeCondition: player => HasComp<ZombieImmuneComponent>(player) || HasComp<InitialInfectedExemptComponent>(player) 
+            customExcludeCondition: player => HasComp<ZombieImmuneComponent>(player) || HasComp<InitialInfectedExemptComponent>(player)
             );
 
         //And get all players, excluding ZombieImmune and roles with CanBeAntag = False - to fill any leftover initial infected slots
@@ -259,7 +263,7 @@ private void InfectInitialPlayers(ZombieRuleComponent component)
             acceptableAntags: Shared.Antag.AntagAcceptability.All,
             includeAllJobs: false ,
             ignorePreferences: true,
-            customExcludeCondition: HasComp<ZombieImmuneComponent> 
+            customExcludeCondition: HasComp<ZombieImmuneComponent>
             );
 
         //If there are no players to choose, abort
@@ -293,6 +297,7 @@ private void MakeZombie(EntityUid entity, ZombieRuleComponent component)
 
         //Add the role to the mind silently (to avoid repeating job assignment)
         _roles.MindAddRole(mind, new InitialInfectedRoleComponent { PrototypeId = component.PatientZeroPrototypeId }, silent: true);
+        EnsureComp<InitialInfectedComponent>(entity);
 
         //Add the zombie components and grace period
         var pending = EnsureComp<PendingZombieComponent>(entity);
diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
index 7558f7afc0b..c934fb66bfb 100644
--- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
+++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
@@ -1,23 +1,16 @@
 using System.Linq;
-using System.Numerics;
 using Content.Server.Gateway.Components;
 using Content.Server.Parallax;
 using Content.Server.Procedural;
-using Content.Server.Salvage;
 using Content.Shared.CCVar;
 using Content.Shared.Dataset;
 using Content.Shared.Maps;
-using Content.Shared.Movement.Components;
 using Content.Shared.Parallax.Biomes;
-using Content.Shared.Physics;
 using Content.Shared.Procedural;
 using Content.Shared.Salvage;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
@@ -40,7 +33,6 @@ public sealed class GatewayGeneratorSystem : EntitySystem
     [Dependency] private readonly DungeonSystem _dungeon = default!;
     [Dependency] private readonly GatewaySystem _gateway = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
-    [Dependency] private readonly RestrictedRangeSystem _restricted = default!;
     [Dependency] private readonly SharedMapSystem _maps = default!;
     [Dependency] private readonly TileSystem _tile = default!;
 
diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
index 93e7e9efaa6..abb26a8c8bc 100644
--- a/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
+++ b/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
@@ -11,7 +11,7 @@ public sealed partial class GhostRoleComponent : Component
 
         [DataField("description")] private string _roleDescription = "Unknown";
 
-        [DataField("rules")] private string _roleRules = "";
+        [DataField("rules")] private string _roleRules = "ghost-role-component-default-rules";
 
         [DataField("requirements")]
         public HashSet<JobRequirement>? Requirements;
diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
index 2397edc724e..f603416d00a 100644
--- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
@@ -56,7 +56,8 @@ public override void Initialize()
             SubscribeLocalEvent<GhostTakeoverAvailableComponent, MindAddedMessage>(OnMindAdded);
             SubscribeLocalEvent<GhostTakeoverAvailableComponent, MindRemovedMessage>(OnMindRemoved);
             SubscribeLocalEvent<GhostTakeoverAvailableComponent, MobStateChangedEvent>(OnMobStateChanged);
-            SubscribeLocalEvent<GhostRoleComponent, ComponentInit>(OnInit);
+            SubscribeLocalEvent<GhostRoleComponent, MapInitEvent>(OnMapInit);
+            SubscribeLocalEvent<GhostRoleComponent, ComponentStartup>(OnStartup);
             SubscribeLocalEvent<GhostRoleComponent, ComponentShutdown>(OnShutdown);
             SubscribeLocalEvent<GhostRoleComponent, EntityPausedEvent>(OnPaused);
             SubscribeLocalEvent<GhostRoleComponent, EntityUnpausedEvent>(OnUnpaused);
@@ -318,17 +319,14 @@ private void OnUnpaused(EntityUid uid, GhostRoleComponent component, ref EntityU
             UpdateAllEui();
         }
 
-        private void OnInit(Entity<GhostRoleComponent> ent, ref ComponentInit args)
+        private void OnMapInit(Entity<GhostRoleComponent> ent, ref MapInitEvent args)
         {
-            var role = ent.Comp;
-            if (role.Probability < 1f && !_random.Prob(role.Probability))
-            {
-                RemComp<GhostRoleComponent>(ent);
-                return;
-            }
+            if (ent.Comp.Probability < 1f && !_random.Prob(ent.Comp.Probability))
+                RemCompDeferred<GhostRoleComponent>(ent);
+        }
 
-            if (role.RoleRules == "")
-                role.RoleRules = Loc.GetString("ghost-role-component-default-rules");
+        private void OnStartup(Entity<GhostRoleComponent> ent, ref ComponentStartup args)
+        {
             RegisterGhostRole(ent);
         }
 
diff --git a/Content.Server/Glue/GlueSystem.cs b/Content.Server/Glue/GlueSystem.cs
index 44ff4e54593..ff53ef91cac 100644
--- a/Content.Server/Glue/GlueSystem.cs
+++ b/Content.Server/Glue/GlueSystem.cs
@@ -1,12 +1,12 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Glue;
 using Content.Shared.Hands;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Item;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs
index d3a717c74af..4ad6c1f8359 100644
--- a/Content.Server/Guardian/GuardianSystem.cs
+++ b/Content.Server/Guardian/GuardianSystem.cs
@@ -260,7 +260,7 @@ private void OnHostStateChange(EntityUid uid, GuardianHostComponent component, M
         /// </summary>
         private void OnGuardianDamaged(EntityUid uid, GuardianComponent component, DamageChangedEvent args)
         {
-            if (args.DamageDelta == null || component.Host == null || component.DamageShare > 0)
+            if (args.DamageDelta == null || component.Host == null || component.DamageShare == 0)
                 return;
 
             _damageSystem.TryChangeDamage(
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index a0e872dbeb1..bd24ddab5d1 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -1,6 +1,5 @@
 using System.Numerics;
 using Content.Server.Inventory;
-using Content.Server.Pulling;
 using Content.Server.Stack;
 using Content.Server.Stunnable;
 using Content.Shared.ActionBlocker;
@@ -11,8 +10,9 @@
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Input;
 using Content.Shared.Inventory.VirtualItem;
-using Content.Shared.Physics.Pull;
-using Content.Shared.Pulling.Components;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Events;
+using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Stacks;
 using Content.Shared.Throwing;
 using Robust.Shared.GameStates;
@@ -71,6 +71,9 @@ private void GetComponentState(EntityUid uid, HandsComponent hands, ref Componen
 
         private void OnExploded(Entity<HandsComponent> ent, ref BeforeExplodeEvent args)
         {
+            if (ent.Comp.DisableExplosionRecursion)
+                return;
+
             foreach (var hand in ent.Comp.Hands.Values)
             {
                 if (hand.HeldEntity is { } uid)
@@ -84,9 +87,8 @@ private void OnDisarmed(EntityUid uid, HandsComponent component, DisarmedEvent a
                 return;
 
             // Break any pulls
-            if (TryComp(uid, out SharedPullerComponent? puller) && puller.Pulling is EntityUid pulled &&
-                TryComp(pulled, out SharedPullableComponent? pullable))
-                _pullingSystem.TryStopPull(pullable);
+            if (TryComp(uid, out PullerComponent? puller) && TryComp(puller.Pulling, out PullableComponent? pullable))
+                _pullingSystem.TryStopPull(puller.Pulling.Value, pullable);
 
             if (!_handsSystem.TryDrop(uid, component.ActiveHand!, null, checkActionBlocker: false))
                 return;
@@ -96,17 +98,17 @@ private void OnDisarmed(EntityUid uid, HandsComponent component, DisarmedEvent a
 
         private void HandleBodyPartAdded(EntityUid uid, HandsComponent component, ref BodyPartAddedEvent args)
         {
-            if (args.Part.PartType != BodyPartType.Hand)
+            if (args.Part.Comp.PartType != BodyPartType.Hand)
                 return;
 
             // If this annoys you, which it should.
             // Ping Smugleaf.
-            var location = args.Part.Symmetry switch
+            var location = args.Part.Comp.Symmetry switch
             {
                 BodyPartSymmetry.None => HandLocation.Middle,
                 BodyPartSymmetry.Left => HandLocation.Left,
                 BodyPartSymmetry.Right => HandLocation.Right,
-                _ => throw new ArgumentOutOfRangeException(nameof(args.Part.Symmetry))
+                _ => throw new ArgumentOutOfRangeException(nameof(args.Part.Comp.Symmetry))
             };
 
             AddHand(uid, args.Slot, location);
@@ -114,7 +116,7 @@ private void HandleBodyPartAdded(EntityUid uid, HandsComponent component, ref Bo
 
         private void HandleBodyPartRemoved(EntityUid uid, HandsComponent component, ref BodyPartRemovedEvent args)
         {
-            if (args.Part.PartType != BodyPartType.Hand)
+            if (args.Part.Comp.PartType != BodyPartType.Hand)
                 return;
 
             RemoveHand(uid, args.Slot);
@@ -124,13 +126,13 @@ private void HandleBodyPartRemoved(EntityUid uid, HandsComponent component, ref
 
         private void HandlePullStarted(EntityUid uid, HandsComponent component, PullStartedMessage args)
         {
-            if (args.Puller.Owner != uid)
+            if (args.PullerUid != uid)
                 return;
 
-            if (TryComp<SharedPullerComponent>(args.Puller.Owner, out var pullerComp) && !pullerComp.NeedsHands)
+            if (TryComp<PullerComponent>(args.PullerUid, out var pullerComp) && !pullerComp.NeedsHands)
                 return;
 
-            if (!_virtualItemSystem.TrySpawnVirtualItemInHand(args.Pulled.Owner, uid))
+            if (!_virtualItemSystem.TrySpawnVirtualItemInHand(args.PulledUid, uid))
             {
                 DebugTools.Assert("Unable to find available hand when starting pulling??");
             }
@@ -138,7 +140,7 @@ private void HandlePullStarted(EntityUid uid, HandsComponent component, PullStar
 
         private void HandlePullStopped(EntityUid uid, HandsComponent component, PullStoppedMessage args)
         {
-            if (args.Puller.Owner != uid)
+            if (args.PullerUid != uid)
                 return;
 
             // Try find hand that is doing this pull.
@@ -147,10 +149,12 @@ private void HandlePullStopped(EntityUid uid, HandsComponent component, PullStop
             {
                 if (hand.HeldEntity == null
                     || !TryComp(hand.HeldEntity, out VirtualItemComponent? virtualItem)
-                    || virtualItem.BlockingEntity != args.Pulled.Owner)
+                    || virtualItem.BlockingEntity != args.PulledUid)
+                {
                     continue;
+                }
 
-                QueueDel(hand.HeldEntity.Value);
+                TryDrop(args.PullerUid, hand, handsComp: component);
                 break;
             }
         }
diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
index 326c80617a9..ed6d91f56c7 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -1,36 +1,23 @@
-using Content.Shared.Examine;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.IdentityManagement;
 using Content.Shared.Preferences;
 using Content.Shared.Verbs;
 using Robust.Shared.GameObjects.Components.Localization;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.Humanoid;
 
 public sealed partial class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
 {
     [Dependency] private readonly MarkingManager _markingManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<HumanoidAppearanceComponent, HumanoidMarkingModifierMarkingSetMessage>(OnMarkingsSet);
         SubscribeLocalEvent<HumanoidAppearanceComponent, HumanoidMarkingModifierBaseLayersSetMessage>(OnBaseLayersSet);
         SubscribeLocalEvent<HumanoidAppearanceComponent, GetVerbsEvent<Verb>>(OnVerbsRequest);
-        SubscribeLocalEvent<HumanoidAppearanceComponent, ExaminedEvent>(OnExamined);
-    }
-
-    private void OnExamined(EntityUid uid, HumanoidAppearanceComponent component, ExaminedEvent args)
-    {
-        var identity = Identity.Entity(uid, EntityManager);
-        var species = GetSpeciesRepresentation(component.Species).ToLower();
-        var age = GetAgeRepresentation(component.Species, component.Age);
-
-        args.PushText(Loc.GetString("humanoid-appearance-component-examine", ("user", identity), ("age", age), ("species", species)));
     }
 
     // this was done enough times that it only made sense to do it here
@@ -168,42 +155,4 @@ public void SetMarkingColor(EntityUid uid, MarkingCategories category, int index
 
         Dirty(humanoid);
     }
-
-    /// <summary>
-    /// Takes ID of the species prototype, returns UI-friendly name of the species.
-    /// </summary>
-    public string GetSpeciesRepresentation(string speciesId)
-    {
-        if (_prototypeManager.TryIndex<SpeciesPrototype>(speciesId, out var species))
-        {
-            return Loc.GetString(species.Name);
-        }
-        else
-        {
-            return Loc.GetString("humanoid-appearance-component-unknown-species");
-        }
-    }
-
-    public string GetAgeRepresentation(string species, int age)
-    {
-        _prototypeManager.TryIndex<SpeciesPrototype>(species, out var speciesPrototype);
-
-        if (speciesPrototype == null)
-        {
-            Log.Error("Tried to get age representation of species that couldn't be indexed: " + species);
-            return Loc.GetString("identity-age-young");
-        }
-
-        if (age < speciesPrototype.YoungAge)
-        {
-            return Loc.GetString("identity-age-young");
-        }
-
-        if (age < speciesPrototype.OldAge)
-        {
-            return Loc.GetString("identity-age-middle-aged");
-        }
-
-        return Loc.GetString("identity-age-old");
-    }
 }
diff --git a/Content.Server/IdentityManagement/IdentitySystem.cs b/Content.Server/IdentityManagement/IdentitySystem.cs
index ec8412ed1ab..a959b96ef97 100644
--- a/Content.Server/IdentityManagement/IdentitySystem.cs
+++ b/Content.Server/IdentityManagement/IdentitySystem.cs
@@ -62,6 +62,7 @@ private void OnMapInit(EntityUid uid, IdentityComponent component, MapInitEvent
     {
         var ident = Spawn(null, Transform(uid).Coordinates);
 
+        _metaData.SetEntityName(ident, "identity");
         QueueIdentityUpdate(uid);
         _container.Insert(ident, component.IdentityEntitySlot);
     }
diff --git a/Content.Server/ImmovableRod/ImmovableRodComponent.cs b/Content.Server/ImmovableRod/ImmovableRodComponent.cs
index f3605914795..05fa3d9d9b2 100644
--- a/Content.Server/ImmovableRod/ImmovableRodComponent.cs
+++ b/Content.Server/ImmovableRod/ImmovableRodComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Damage;
 using Robust.Shared.Audio;
 
 namespace Content.Server.ImmovableRod;
@@ -36,4 +37,16 @@ public sealed partial class ImmovableRodComponent : Component
     /// </summary>
     [DataField("destroyTiles")]
     public bool DestroyTiles = true;
+
+    /// <summary>
+    ///     If true, this will gib & delete bodies
+    /// </summary>
+    [DataField]
+    public bool ShouldGib = true;
+
+    /// <summary>
+    ///     Damage done, if not gibbing
+    /// </summary>
+    [DataField]
+    public DamageSpecifier? Damage;
 }
diff --git a/Content.Server/ImmovableRod/ImmovableRodSystem.cs b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
index 31aa39cf03a..4553dda095a 100644
--- a/Content.Server/ImmovableRod/ImmovableRodSystem.cs
+++ b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
@@ -1,11 +1,13 @@
 using Content.Server.Body.Systems;
+using Content.Server.Polymorph.Components;
 using Content.Server.Popups;
 using Content.Shared.Body.Components;
+using Content.Shared.Damage;
 using Content.Shared.Examine;
 using Content.Shared.Popups;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
@@ -16,12 +18,13 @@ namespace Content.Server.ImmovableRod;
 public sealed class ImmovableRodSystem : EntitySystem
 {
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IMapManager _map = default!;
 
     [Dependency] private readonly BodySystem _bodySystem = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public override void Update(float frameTime)
     {
@@ -33,7 +36,7 @@ public override void Update(float frameTime)
             if (!rod.DestroyTiles)
                 continue;
 
-            if (!_map.TryGetGrid(trans.GridUid, out var grid))
+            if (!TryComp<MapGridComponent>(trans.GridUid, out var grid))
                 continue;
 
             grid.SetTile(trans.Coordinates, Tile.Empty);
@@ -64,11 +67,11 @@ private void OnMapInit(EntityUid uid, ImmovableRodComponent component, MapInitEv
             var vel = component.DirectionOverride.Degrees switch
             {
                 0f => _random.NextVector2(component.MinSpeed, component.MaxSpeed),
-                _ => xform.WorldRotation.RotateVec(component.DirectionOverride.ToVec()) * _random.NextFloat(component.MinSpeed, component.MaxSpeed)
+                _ => _transform.GetWorldRotation(uid).RotateVec(component.DirectionOverride.ToVec()) * _random.NextFloat(component.MinSpeed, component.MaxSpeed)
             };
 
             _physics.ApplyLinearImpulse(uid, vel, body: phys);
-            xform.LocalRotation = (vel - xform.WorldPosition).ToWorldAngle() + MathHelper.PiOver2;
+            xform.LocalRotation = (vel - _transform.GetWorldPosition(uid)).ToWorldAngle() + MathHelper.PiOver2;
         }
     }
 
@@ -94,12 +97,28 @@ private void OnCollide(EntityUid uid, ImmovableRodComponent component, ref Start
             return;
         }
 
-        // gib em
+        // dont delete/hurt self if polymoprhed into a rod
+        if (TryComp<PolymorphedEntityComponent>(uid, out var polymorphed))
+        {
+            if (polymorphed.Parent == ent)
+                return;
+        }
+
+        // gib or damage em
         if (TryComp<BodyComponent>(ent, out var body))
         {
             component.MobCount++;
-
             _popup.PopupEntity(Loc.GetString("immovable-rod-penetrated-mob", ("rod", uid), ("mob", ent)), uid, PopupType.LargeCaution);
+
+            if (!component.ShouldGib)
+            {
+                if (component.Damage == null)
+                    return;
+
+                _damageable.TryChangeDamage(ent, component.Damage, ignoreResistances: true);
+                return;
+            }
+
             _bodySystem.GibBody(ent, body: body);
             return;
         }
diff --git a/Content.Server/Implants/Components/ScramImplantComponent.cs b/Content.Server/Implants/Components/ScramImplantComponent.cs
index 88c433abfbe..f3bbc9e5842 100644
--- a/Content.Server/Implants/Components/ScramImplantComponent.cs
+++ b/Content.Server/Implants/Components/ScramImplantComponent.cs
@@ -15,12 +15,6 @@ public sealed partial class ScramImplantComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float TeleportRadius = 100f;
 
-    /// <summary>
-    /// How many times to check for a valid tile to teleport to
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadOnly)]
-    public int TeleportAttempts = 20;
-
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public SoundSpecifier TeleportSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
 }
diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs
index 8eb27414481..e8af08b2ebb 100644
--- a/Content.Server/Implants/SubdermalImplantSystem.cs
+++ b/Content.Server/Implants/SubdermalImplantSystem.cs
@@ -14,11 +14,14 @@
 using Content.Shared.Preferences;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
 using System.Numerics;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
+using Robust.Shared.Collections;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Implants;
 
@@ -26,7 +29,6 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
 {
     [Dependency] private readonly CuffableSystem _cuffable = default!;
     [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearance = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly StoreSystem _store = default!;
@@ -34,8 +36,12 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _xform = default!;
     [Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
+    [Dependency] private readonly PullingSystem _pullingSystem = default!;
+    [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
     private EntityQuery<PhysicsComponent> _physicsQuery;
+    private HashSet<Entity<MapGridComponent>> _targetGrids = [];
 
     public override void Initialize()
     {
@@ -98,43 +104,98 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component,
         if (!TryComp<ScramImplantComponent>(uid, out var implant))
             return;
 
+        // We need stop the user from being pulled so they don't just get "attached" with whoever is pulling them.
+        // This can for example happen when the user is cuffed and being pulled.
+        if (TryComp<PullableComponent>(ent, out var pull) && _pullingSystem.IsPulled(ent, pull))
+            _pullingSystem.TryStopPull(ent, pull);
+
         var xform = Transform(ent);
-        var entityCoords = xform.Coordinates.ToMap(EntityManager, _xform);
+        var targetCoords = SelectRandomTileInRange(xform, implant.TeleportRadius);
 
-        // try to find a valid position to teleport to, teleport to whatever works if we can't
-        var targetCoords = new MapCoordinates();
-        for (var i = 0; i < implant.TeleportAttempts; i++)
+        if (targetCoords != null)
         {
-            var distance = implant.TeleportRadius * MathF.Sqrt(_random.NextFloat()); // to get an uniform distribution
-            targetCoords = entityCoords.Offset(_random.NextAngle().ToVec() * distance);
-
-            // prefer teleporting to grids
-            if (!_mapManager.TryFindGridAt(targetCoords, out var gridUid, out var grid))
-                continue;
+            _xform.SetCoordinates(ent, targetCoords.Value);
+            _audio.PlayPvs(implant.TeleportSound, ent);
+            args.Handled = true;
+        }
+    }
 
-            // the implant user probably does not want to be in your walls
-            var valid = true;
-            foreach (var entity in grid.GetAnchoredEntities(targetCoords))
+    private EntityCoordinates? SelectRandomTileInRange(TransformComponent userXform, float radius)
+    {
+        var userCoords = userXform.Coordinates.ToMap(EntityManager, _xform);
+        _targetGrids.Clear();
+        _lookupSystem.GetEntitiesInRange(userCoords, radius, _targetGrids);
+        Entity<MapGridComponent>? targetGrid = null;
+
+        if (_targetGrids.Count == 0)
+            return null;
+
+        // Give preference to the grid the entity is currently on.
+        // This does not guarantee that if the probability fails that the owner's grid won't be picked.
+        // In reality the probability is higher and depends on the number of grids.
+        if (userXform.GridUid != null && TryComp<MapGridComponent>(userXform.GridUid, out var gridComp))
+        {
+            var userGrid = new Entity<MapGridComponent>(userXform.GridUid.Value, gridComp);
+            if (_random.Prob(0.5f))
             {
-                if (!_physicsQuery.TryGetComponent(entity, out var body))
-                    continue;
+                _targetGrids.Remove(userGrid);
+                targetGrid = userGrid;
+            }
+        }
 
-                if (body.BodyType != BodyType.Static ||
-                    !body.Hard ||
-                    (body.CollisionLayer & (int) CollisionGroup.Impassable) == 0)
-                    continue;
+        if (targetGrid == null)
+            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
 
-                valid = false;
-                break;
+        EntityCoordinates? targetCoords = null;
+
+        do
+        {
+            var valid = false;
+
+            var range = (float) Math.Sqrt(radius);
+            var box = Box2.CenteredAround(userCoords.Position, new Vector2(range, range));
+            var tilesInRange = _mapSystem.GetTilesEnumerator(targetGrid.Value.Owner, targetGrid.Value.Comp, box, false);
+            var tileList = new ValueList<Vector2i>();
+
+            while (tilesInRange.MoveNext(out var tile))
+            {
+                tileList.Add(tile.GridIndices);
+            }
+
+            while (tileList.Count != 0)
+            {
+                var tile = tileList.RemoveSwap(_random.Next(tileList.Count));
+                valid = true;
+                foreach (var entity in _mapSystem.GetAnchoredEntities(targetGrid.Value.Owner, targetGrid.Value.Comp,
+                             tile))
+                {
+                    if (!_physicsQuery.TryGetComponent(entity, out var body))
+                        continue;
+
+                    if (body.BodyType != BodyType.Static ||
+                        !body.Hard ||
+                        (body.CollisionLayer & (int) CollisionGroup.MobMask) == 0)
+                        continue;
+
+                    valid = false;
+                    break;
+                }
+
+                if (valid)
+                {
+                    targetCoords = new EntityCoordinates(targetGrid.Value.Owner,
+                        _mapSystem.TileCenterToVector(targetGrid.Value, tile));
+                    break;
+                }
             }
-            if (valid)
+
+            if (valid || _targetGrids.Count == 0) // if we don't do the check here then PickAndTake will blow up on an empty set.
                 break;
-        }
-        _xform.SetWorldPosition(ent, targetCoords.Position);
-        _xform.AttachToGridOrMap(ent, xform);
-        _audio.PlayPvs(implant.TeleportSound, ent);
 
-        args.Handled = true;
+            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
+        } while (true);
+
+        return targetCoords;
     }
 
     private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent component, UseDnaScramblerImplantEvent args)
diff --git a/Content.Server/Instruments/InstrumentComponent.cs b/Content.Server/Instruments/InstrumentComponent.cs
index 4302ab6791b..1b7913386d2 100644
--- a/Content.Server/Instruments/InstrumentComponent.cs
+++ b/Content.Server/Instruments/InstrumentComponent.cs
@@ -1,6 +1,5 @@
 using Content.Server.UserInterface;
 using Content.Shared.Instruments;
-using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 
 namespace Content.Server.Instruments;
diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs
index 6692886daee..203781bcdaa 100644
--- a/Content.Server/Interaction/InteractionSystem.cs
+++ b/Content.Server/Interaction/InteractionSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction;
 using Content.Shared.Storage;
 using JetBrains.Annotations;
@@ -14,7 +13,6 @@ namespace Content.Server.Interaction
     [UsedImplicitly]
     public sealed partial class InteractionSystem : SharedInteractionSystem
     {
-        [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
         [Dependency] private readonly SharedContainerSystem _container = default!;
         [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
 
diff --git a/Content.Server/Interaction/TilePryCommand.cs b/Content.Server/Interaction/TilePryCommand.cs
index 57b07e8181b..006a245ead3 100644
--- a/Content.Server/Interaction/TilePryCommand.cs
+++ b/Content.Server/Interaction/TilePryCommand.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Maps;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Interaction
 {
@@ -46,7 +47,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             var xform = _entities.GetComponent<TransformComponent>(attached);
             var playerGrid = xform.GridUid;
 
-            if (!mapManager.TryGetGrid(playerGrid, out var mapGrid))
+            if (!_entities.TryGetComponent<MapGridComponent>(playerGrid, out var mapGrid))
                 return;
 
             var playerPosition = xform.Coordinates;
diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
index 4c1e522e9d2..fa263e059de 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -24,6 +24,7 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Administration.Managers;
 using Content.Shared.Kitchen;
+using Content.Shared.Players.PlayTimeTracking;
 
 namespace Content.Server.IoC
 {
@@ -62,6 +63,8 @@ public static void Register()
             IoCManager.Register<ServerDbEntryManager>();
             IoCManager.Register<JoinQueueManager>();
             IoCManager.Register<DiscordAuthManager>();
+            IoCManager.Register<ISharedPlaytimeManager, PlayTimeTrackingManager>();
+            IoCManager.Register<ServerApi>();
         }
     }
 }
diff --git a/Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs b/Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs
index 923a10b22a8..30fa84ed90b 100644
--- a/Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs
+++ b/Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs
@@ -1,19 +1,21 @@
 namespace Content.Server.Item;
 
 /// <summary>
-/// Handles whether this item applies a disarm malus when active. 
+/// 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
index ea2efae147b..227491b16c2 100644
--- a/Content.Server/Item/ItemToggle/Components/ItemToggleSharpComponent.cs
+++ b/Content.Server/Item/ItemToggle/Components/ItemToggleSharpComponent.cs
@@ -1,14 +1,9 @@
 namespace Content.Server.Item;
 
 /// <summary>
-/// Handles whether this item is sharp when toggled on. 
+/// Handles whether this item is sharp when toggled on.
 /// </summary>
 [RegisterComponent]
 public sealed partial class ItemToggleSharpComponent : Component
 {
-    /// <summary>
-    ///     Item can be used to butcher when activated.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly), DataField]
-    public bool ActivatedSharp = true;
 }
diff --git a/Content.Server/Item/ItemToggle/ItemToggleSystem.cs b/Content.Server/Item/ItemToggle/ItemToggleSystem.cs
index 4507ace9d25..f98415eb08f 100644
--- a/Content.Server/Item/ItemToggle/ItemToggleSystem.cs
+++ b/Content.Server/Item/ItemToggle/ItemToggleSystem.cs
@@ -1,9 +1,7 @@
-using Content.Shared.Item;
 using Content.Server.CombatMode.Disarm;
 using Content.Server.Kitchen.Components;
 using Content.Shared.Item.ItemToggle;
 using Content.Shared.Item.ItemToggle.Components;
-using ItemToggleComponent = Content.Shared.Item.ItemToggle.Components.ItemToggleComponent;
 
 namespace Content.Server.Item;
 
@@ -13,47 +11,34 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ItemToggleComponent, ItemToggledEvent>(Toggle);
+        SubscribeLocalEvent<ItemToggleSharpComponent, ItemToggledEvent>(ToggleSharp);
+        SubscribeLocalEvent<ItemToggleDisarmMalusComponent, ItemToggledEvent>(ToggleMalus);
     }
 
-    private void Toggle(EntityUid uid, ItemToggleComponent comp, ref ItemToggledEvent args)
+    private void ToggleSharp(Entity<ItemToggleSharpComponent> ent, ref ItemToggledEvent args)
     {
-        if (args.Activated == true)
-        {
-            if (TryComp<ItemToggleSharpComponent>(uid, out var itemSharpness))
-            {
-                if (itemSharpness.ActivatedSharp)
-                    EnsureComp<SharpComponent>(uid);
-            }
-
-            if (!TryComp<ItemToggleDisarmMalusComponent>(uid, out var itemToggleDisarmMalus) ||
-                !TryComp<DisarmMalusComponent>(uid, out var malus))
-                return;
-
-            //Default the deactivated DisarmMalus to the item's value before activation happens.
-            itemToggleDisarmMalus.DeactivatedDisarmMalus ??= malus.Malus;
-
-            if (itemToggleDisarmMalus.ActivatedDisarmMalus != null)
-            {
-                malus.Malus = (float) itemToggleDisarmMalus.ActivatedDisarmMalus;
-            }
-        }
+        // TODO generalize this into a  "ToggleComponentComponent", though probably with a better name
+        if (args.Activated)
+            EnsureComp<SharpComponent>(ent);
         else
-        {
-            if (TryComp<ItemToggleSharpComponent>(uid, out var itemSharpness))
-            {
-                if (itemSharpness.ActivatedSharp)
-                    RemCompDeferred<SharpComponent>(uid);
-            }
+            RemCompDeferred<SharpComponent>(ent);
+    }
 
-            if (!TryComp<ItemToggleDisarmMalusComponent>(uid, out var itemToggleDisarmMalus) ||
-                !TryComp<DisarmMalusComponent>(uid, out var malus))
-                return;
+    private void ToggleMalus(Entity<ItemToggleDisarmMalusComponent> ent, ref ItemToggledEvent args)
+    {
+        if (!TryComp<DisarmMalusComponent>(ent, out var malus))
+            return;
 
-            if (itemToggleDisarmMalus.DeactivatedDisarmMalus != null)
-            {
-                malus.Malus = (float) itemToggleDisarmMalus.DeactivatedDisarmMalus;
-            }
+        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/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
index 27834aa5735..5bbbe2dc8da 100644
--- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
+++ b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
@@ -13,24 +13,27 @@ namespace Content.Server.Kitchen.Components
     [Access(typeof(ReagentGrinderSystem)), RegisterComponent]
     public sealed partial class ReagentGrinderComponent : Component
     {
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public int StorageMaxEntities = 6;
 
-        [DataField("workTime"), ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public TimeSpan WorkTime = TimeSpan.FromSeconds(3.5); // Roughly matches the grind/juice sounds.
 
-        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public float WorkTimeMultiplier = 1;
 
-        [DataField("clickSound"), ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public SoundSpecifier ClickSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
 
-        [DataField("grindSound"), ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public SoundSpecifier GrindSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/blender.ogg");
 
-        [DataField("juiceSound"), ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public SoundSpecifier JuiceSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/juicer.ogg");
 
+        [DataField]
+        public GrinderAutoMode AutoMode = GrinderAutoMode.Off;
+
         public EntityUid? AudioStream;
     }
 
diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index 07f8849b4a9..e8ee4539860 100644
--- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -53,11 +53,19 @@ public override void Initialize()
             SubscribeLocalEvent<ReagentGrinderComponent, EntRemovedFromContainerMessage>(OnContainerModified);
             SubscribeLocalEvent<ReagentGrinderComponent, ContainerIsRemovingAttemptEvent>(OnEntRemoveAttempt);
 
+            SubscribeLocalEvent<ReagentGrinderComponent, ReagentGrinderToggleAutoModeMessage>(OnToggleAutoModeMessage);
             SubscribeLocalEvent<ReagentGrinderComponent, ReagentGrinderStartMessage>(OnStartMessage);
             SubscribeLocalEvent<ReagentGrinderComponent, ReagentGrinderEjectChamberAllMessage>(OnEjectChamberAllMessage);
             SubscribeLocalEvent<ReagentGrinderComponent, ReagentGrinderEjectChamberContentMessage>(OnEjectChamberContentMessage);
         }
 
+        private void OnToggleAutoModeMessage(Entity<ReagentGrinderComponent> entity, ref ReagentGrinderToggleAutoModeMessage message)
+        {
+            entity.Comp.AutoMode = (GrinderAutoMode) (((byte) entity.Comp.AutoMode + 1) % Enum.GetValues(typeof(GrinderAutoMode)).Length);
+
+            UpdateUiState(entity);
+        }
+
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
@@ -148,6 +156,12 @@ 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))
+            {
+                var program = reagentGrinder.AutoMode == GrinderAutoMode.Grind ? GrinderProgram.Grind : GrinderProgram.Juice;
+                DoWork(uid, reagentGrinder, program);
+            }
         }
 
         private void OnInteractUsing(Entity<ReagentGrinderComponent> entity, ref InteractUsingEvent args)
@@ -185,6 +199,10 @@ private void OnInteractUsing(Entity<ReagentGrinderComponent> entity, ref Interac
 
         private void UpdateUiState(EntityUid uid)
         {
+            ReagentGrinderComponent? grinderComp = null;
+            if (!Resolve(uid, ref grinderComp))
+                return;
+
             var inputContainer = _containerSystem.EnsureContainer<Container>(uid, SharedReagentGrinder.InputContainerId);
             var outputContainer = _itemSlotsSystem.GetItemOrNull(uid, SharedReagentGrinder.BeakerSlotId);
             Solution? containerSolution = null;
@@ -206,6 +224,7 @@ private void UpdateUiState(EntityUid uid)
                 this.IsPowered(uid, EntityManager),
                 canJuice,
                 canGrind,
+                grinderComp.AutoMode,
                 GetNetEntityArray(inputContainer.ContainedEntities.ToArray()),
                 containerSolution?.Contents.ToArray()
             );
diff --git a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
index 2c5f88baec7..35adf6f4b57 100644
--- a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
@@ -1,5 +1,7 @@
 using Content.Server.Body.Systems;
 using Content.Server.Kitchen.Components;
+using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Body.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Components;
 using Content.Shared.Database;
@@ -11,9 +13,14 @@
 using Content.Shared.Verbs;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
+using Content.Shared.Interaction;
 using Content.Shared.Kitchen;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Popups;
+using Content.Shared.Storage;
+using Content.Shared.Verbs;
 using Robust.Server.Containers;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
@@ -35,7 +42,7 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SharpComponent, AfterInteractEvent>(OnAfterInteract, before: new[] { typeof(UtensilSystem) });
+        SubscribeLocalEvent<SharpComponent, AfterInteractEvent>(OnAfterInteract, before: [typeof(UtensilSystem)]);
         SubscribeLocalEvent<SharpComponent, SharpDoAfterEvent>(OnDoAfter);
 
         SubscribeLocalEvent<ButcherableComponent, GetVerbsEvent<InteractionVerb>>(OnGetInteractionVerbs);
@@ -43,16 +50,14 @@ public override void Initialize()
 
     private void OnAfterInteract(EntityUid uid, SharpComponent component, AfterInteractEvent args)
     {
-        if (args.Handled)
-            return;
-
-        if (args.Target is null || !args.CanReach)
+        if (args.Handled || args.Target is null || !args.CanReach)
             return;
 
-        args.Handled = TryStartButcherDoAfter(uid, args.Target.Value, args.User);
+        if (TryStartButcherDoafter(uid, args.Target.Value, args.User))
+            args.Handled = true;
     }
 
-    private bool TryStartButcherDoAfter(EntityUid knife, EntityUid target, EntityUid user)
+    private bool TryStartButcherDoafter(EntityUid knife, EntityUid target, EntityUid user)
     {
         if (!TryComp<ButcherableComponent>(target, out var butcher))
             return false;
@@ -66,11 +71,11 @@ private bool TryStartButcherDoAfter(EntityUid knife, EntityUid target, EntityUid
         if (butcher.Type != ButcheringType.Knife && target != user)
         {
             _popupSystem.PopupEntity(Loc.GetString("butcherable-different-tool", ("target", target)), knife, user);
-            return true;
+            return false;
         }
 
         if (!sharp.Butchering.Add(target))
-            return true;
+            return false;
 
         var doAfter =
             new DoAfterArgs(EntityManager, user, sharp.ButcherDelayModifier * butcher.ButcherDelay, new SharpDoAfterEvent(), knife, target: target, used: knife)
@@ -166,7 +171,7 @@ private void OnGetInteractionVerbs(EntityUid uid, ButcherableComponent component
             Act = () =>
             {
                 if (!disabled)
-                    TryStartButcherDoAfter(args.Using!.Value, args.Target, args.User);
+                    TryStartButcherDoafter(args.Using!.Value, args.Target, args.User);
             },
             Message = message,
             Disabled = disabled,
diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs
index f45eac8eabc..52184fb58f2 100644
--- a/Content.Server/Labels/Label/LabelSystem.cs
+++ b/Content.Server/Labels/Label/LabelSystem.cs
@@ -90,10 +90,7 @@ private void OnComponentInit(EntityUid uid, PaperLabelComponent component, Compo
         {
             _itemSlotsSystem.AddItemSlot(uid, ContainerName, component.LabelSlot);
 
-            if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
-                return;
-
-            _appearance.SetData(uid, PaperLabelVisuals.HasLabel, false, appearance);
+            UpdateAppearance((uid, component));
         }
 
         private void OnComponentRemove(EntityUid uid, PaperLabelComponent component, ComponentRemove args)
@@ -137,10 +134,18 @@ private void OnContainerModified(EntityUid uid, PaperLabelComponent label, Conta
             if (args.Container.ID != label.LabelSlot.ID)
                 return;
 
-            if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+            UpdateAppearance((uid, label));
+        }
+
+        private void UpdateAppearance(Entity<PaperLabelComponent, AppearanceComponent?> ent)
+        {
+            if (!Resolve(ent, ref ent.Comp2, false))
                 return;
 
-            _appearance.SetData(uid, PaperLabelVisuals.HasLabel, label.LabelSlot.HasItem, appearance);
+            var slot = ent.Comp1.LabelSlot;
+            _appearance.SetData(ent, PaperLabelVisuals.HasLabel, slot.HasItem, ent.Comp2);
+            if (TryComp<PaperLabelTypeComponent>(slot.Item, out var type))
+                _appearance.SetData(ent, PaperLabelVisuals.LabelType, type.PaperType, ent.Comp2);
         }
     }
 }
diff --git a/Content.Server/Language/Commands/ListLanguagesCommand.cs b/Content.Server/Language/Commands/ListLanguagesCommand.cs
index 6698e1b6453..e5787cba48c 100644
--- a/Content.Server/Language/Commands/ListLanguagesCommand.cs
+++ b/Content.Server/Language/Commands/ListLanguagesCommand.cs
@@ -1,5 +1,5 @@
-using System.Linq;
 using Content.Shared.Administration;
+using Content.Shared.Language;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 
@@ -30,10 +30,29 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         }
 
         var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
+        var currentLang = languages.GetLanguage(playerEntity).ID;
 
-        var (spokenLangs, knownLangs) = languages.GetAllLanguages(playerEntity);
+        shell.WriteLine(Loc.GetString("command-language-spoken"));
+        var spoken = languages.GetSpokenLanguages(playerEntity);
+        for (int i = 0; i < spoken.Count; i++)
+        {
+            var lang = spoken[i];
+            shell.WriteLine(lang == currentLang
+                ? Loc.GetString("command-language-current-entry", ("id", i + 1), ("language", lang), ("name", LanguageName(lang)))
+                : Loc.GetString("command-language-entry", ("id", i + 1), ("language", lang), ("name", LanguageName(lang))));
+        }
 
-        shell.WriteLine("Spoken:\n" + string.Join("\n", spokenLangs));
-        shell.WriteLine("Understood:\n" + string.Join("\n", knownLangs));
+        shell.WriteLine(Loc.GetString("command-language-understood"));
+        var understood = languages.GetUnderstoodLanguages(playerEntity);
+        for (int i = 0; i < understood.Count; i++)
+        {
+            var lang = understood[i];
+            shell.WriteLine(Loc.GetString("command-language-entry", ("id", i + 1), ("language", lang), ("name", LanguageName(lang))));
+        }
+    }
+
+    private string LanguageName(string id)
+    {
+        return Loc.GetString($"language-{id}-name");
     }
 }
diff --git a/Content.Server/Language/Commands/SayLanguageCommand.cs b/Content.Server/Language/Commands/SayLanguageCommand.cs
index 2e4a27b1dcc..2304781fa04 100644
--- a/Content.Server/Language/Commands/SayLanguageCommand.cs
+++ b/Content.Server/Language/Commands/SayLanguageCommand.cs
@@ -32,7 +32,6 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         if (args.Length < 2)
             return;
 
-        var languageId = args[0];
         var message = string.Join(" ", args, startIndex: 1, count: args.Length - 1).Trim();
 
         if (string.IsNullOrEmpty(message))
@@ -41,10 +40,9 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
         var chats = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
 
-        var language = languages.GetLanguagePrototype(languageId);
-        if (language == null || !languages.CanSpeak(playerEntity, language.ID))
+        if (!SelectLanguageCommand.TryParseLanguageArgument(languages, playerEntity, args[0], out var failReason, out var language))
         {
-            shell.WriteError($"Language {languageId} is invalid or you cannot speak it!");
+            shell.WriteError(failReason);
             return;
         }
 
diff --git a/Content.Server/Language/Commands/SelectLanguageCommand.cs b/Content.Server/Language/Commands/SelectLanguageCommand.cs
index e3363846539..d340135925d 100644
--- a/Content.Server/Language/Commands/SelectLanguageCommand.cs
+++ b/Content.Server/Language/Commands/SelectLanguageCommand.cs
@@ -1,5 +1,7 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Administration;
+using Content.Shared.Language;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 
@@ -32,17 +34,55 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         if (args.Length < 1)
             return;
 
-        var languageId = args[0];
-
         var languages = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
 
-        var language = languages.GetLanguagePrototype(languageId);
-        if (language == null || !languages.CanSpeak(playerEntity, language.ID))
+        if (!TryParseLanguageArgument(languages, playerEntity, args[0], out var failReason, out var language))
         {
-            shell.WriteError($"Language {languageId} is invalid or you cannot speak it!");
+            shell.WriteError(failReason);
             return;
         }
 
         languages.SetLanguage(playerEntity, language.ID);
     }
+
+    // TODO: find a better place for this method
+    /// <summary>
+    ///     Tries to parse the input argument as either a language ID or the position of the language in the list of languages
+    ///     the entity can speak. Returns true if sucessful.
+    /// </summary>
+    public static bool TryParseLanguageArgument(
+        LanguageSystem languageSystem,
+        EntityUid speaker,
+        string input,
+        [NotNullWhen(false)] out string? failureReason,
+        [NotNullWhen(true)] out LanguagePrototype? language)
+    {
+        failureReason = null;
+        language = null;
+
+        if (int.TryParse(input, out var num))
+        {
+            // The argument is a number
+            var spoken = languageSystem.GetSpokenLanguages(speaker);
+            if (num > 0 && num - 1 < spoken.Count)
+                language = languageSystem.GetLanguagePrototype(spoken[num - 1]);
+
+            if (language != null) // the ability to speak it is implied
+                return true;
+
+            failureReason = Loc.GetString("command-language-invalid-number", ("total", spoken.Count));
+            return false;
+        }
+        else
+        {
+            // The argument is a language ID
+            language = languageSystem.GetLanguagePrototype(input);
+
+            if (language != null && languageSystem.CanSpeak(speaker, language.ID))
+                return true;
+
+            failureReason = Loc.GetString("command-language-invalid-language", ("id", input));
+            return false;
+        }
+    }
 }
diff --git a/Content.Server/Language/DetermineEntityLanguagesEvent.cs b/Content.Server/Language/DetermineEntityLanguagesEvent.cs
index 13ab2cac279..8d6b868d070 100644
--- a/Content.Server/Language/DetermineEntityLanguagesEvent.cs
+++ b/Content.Server/Language/DetermineEntityLanguagesEvent.cs
@@ -1,29 +1,25 @@
+using Content.Shared.Language;
+
 namespace Content.Server.Language;
 
 /// <summary>
-///   Raised in order to determine the language an entity speaks at the current moment,
-///   as well as the list of all languages the entity may speak and understand.
+///     Raised in order to determine the list of languages the entity can speak and understand at the given moment.
+///     Typically raised on an entity after a language agent (e.g. a translator) has been added to or removed from them.
 /// </summary>
-public sealed class DetermineEntityLanguagesEvent : EntityEventArgs
+[ByRefEvent]
+public record struct DetermineEntityLanguagesEvent
 {
     /// <summary>
-    ///   The default language of this entity. If empty, remain unchanged.
-    ///   This field has no effect if the entity decides to speak in a concrete language.
-    /// </summary>
-    public string CurrentLanguage;
-    /// <summary>
-    ///   The list of all languages the entity may speak. Must NOT be held as a reference!
+    ///     The list of all languages the entity may speak.
+    ///     By default, contains the languages this entity speaks intrinsically.
     /// </summary>
-    public List<string> SpokenLanguages;
+    public HashSet<string> SpokenLanguages = new();
+
     /// <summary>
-    ///   The list of all languages the entity may understand. Must NOT be held as a reference!
+    ///     The list of all languages the entity may understand.
+    ///     By default, contains the languages this entity understands intrinsically.
     /// </summary>
-    public List<string> UnderstoodLanguages;
+    public HashSet<string> UnderstoodLanguages = new();
 
-    public DetermineEntityLanguagesEvent(string currentLanguage, List<string> spokenLanguages, List<string> understoodLanguages)
-    {
-        CurrentLanguage = currentLanguage;
-        SpokenLanguages = spokenLanguages;
-        UnderstoodLanguages = understoodLanguages;
-    }
+    public DetermineEntityLanguagesEvent() {}
 }
diff --git a/Content.Server/Language/LanguageSystem.Networking.cs b/Content.Server/Language/LanguageSystem.Networking.cs
index 7517b4185e3..daadf28ffd6 100644
--- a/Content.Server/Language/LanguageSystem.Networking.cs
+++ b/Content.Server/Language/LanguageSystem.Networking.cs
@@ -1,17 +1,15 @@
+using Content.Server.Language.Events;
 using Content.Server.Mind;
 using Content.Shared.Language;
+using Content.Shared.Language.Components;
 using Content.Shared.Language.Events;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Robust.Shared.Player;
+using LanguagesUpdateEvent = Content.Server.Language.Events.LanguagesUpdateEvent;
 
 namespace Content.Server.Language;
 
-/// <summary>
-///   LanguageSystem Networking
-///   This is used to update client state when mind change entity.
-/// </summary>
-
 public sealed partial class LanguageSystem
 {
     [Dependency] private readonly MindSystem _mind = default!;
@@ -19,6 +17,11 @@ public sealed partial class LanguageSystem
 
     public void InitializeNet()
     {
+        SubscribeNetworkEvent<LanguagesSetMessage>(OnClientSetLanguage);
+        SubscribeNetworkEvent<RequestLanguagesMessage>((_, session) => SendLanguageStateToClient(session.SenderSession));
+
+        SubscribeLocalEvent<LanguageSpeakerComponent, LanguagesUpdateEvent>((uid, comp, _) => SendLanguageStateToClient(uid, comp));
+
         // Refresh the client's state when its mind hops to a different entity
         SubscribeLocalEvent<MindContainerComponent, MindAddedMessage>((uid, _, _) => SendLanguageStateToClient(uid));
         SubscribeLocalEvent<MindComponent, MindGotRemovedEvent>((_, _, args) =>
@@ -26,12 +29,21 @@ public void InitializeNet()
             if (args.Mind.Comp.Session != null)
                 SendLanguageStateToClient(args.Mind.Comp.Session);
         });
-
-        SubscribeLocalEvent<LanguageSpeakerComponent, LanguagesUpdateEvent>((uid, comp, _) => SendLanguageStateToClient(uid, comp));
-        SubscribeNetworkEvent<RequestLanguagesMessage>((_, session) => SendLanguageStateToClient(session.SenderSession));
     }
 
 
+    private void OnClientSetLanguage(LanguagesSetMessage message, EntitySessionEventArgs args)
+    {
+        if (args.SenderSession.AttachedEntity is not { Valid: true } uid)
+            return;
+
+        var language = GetLanguagePrototype(message.CurrentLanguage);
+        if (language == null || !CanSpeak(uid, language.ID))
+            return;
+
+        SetLanguage(uid, language.ID);
+    }
+
     private void SendLanguageStateToClient(EntityUid uid, LanguageSpeakerComponent? comp = null)
     {
         // Try to find a mind inside the entity and notify its session
@@ -50,10 +62,18 @@ private void SendLanguageStateToClient(ICommonSession session, LanguageSpeakerCo
         SendLanguageStateToClient(entity, session, comp);
     }
 
+    // TODO this is really stupid and can be avoided if we just make everything shared...
     private void SendLanguageStateToClient(EntityUid uid, ICommonSession session, LanguageSpeakerComponent? component = null)
     {
-        var langs = GetLanguages(uid, component);
-        var message = new LanguagesUpdatedMessage(langs.CurrentLanguage, langs.SpokenLanguages, langs.UnderstoodLanguages);
+        var isUniversal = HasComp<UniversalLanguageSpeakerComponent>(uid);
+        if (!isUniversal)
+            Resolve(uid, ref component, logMissing: false);
+
+        // I really don't want to call 3 getter methods here, so we'll just have this slightly hardcoded solution
+        var message = isUniversal || component == null
+            ? new LanguagesUpdatedMessage(UniversalPrototype, [UniversalPrototype], [UniversalPrototype])
+            : new LanguagesUpdatedMessage(component.CurrentLanguage, component.SpokenLanguages, component.UnderstoodLanguages);
+
         RaiseNetworkEvent(message, session);
     }
 }
diff --git a/Content.Server/Language/LanguageSystem.cs b/Content.Server/Language/LanguageSystem.cs
index f1bf44c1f4f..da313b2ed64 100644
--- a/Content.Server/Language/LanguageSystem.cs
+++ b/Content.Server/Language/LanguageSystem.cs
@@ -1,289 +1,213 @@
 using System.Linq;
-using System.Text;
-using Content.Server.GameTicking.Events;
+using Content.Server.Language.Events;
 using Content.Shared.Language;
+using Content.Shared.Language.Components;
 using Content.Shared.Language.Events;
 using Content.Shared.Language.Systems;
-using Robust.Shared.Random;
+using LanguagesUpdateEvent = Content.Server.Language.Events.LanguagesUpdateEvent;
 using UniversalLanguageSpeakerComponent = Content.Shared.Language.Components.UniversalLanguageSpeakerComponent;
 
 namespace Content.Server.Language;
 
 public sealed partial class LanguageSystem : SharedLanguageSystem
 {
-    // Static and re-used event instances used to minimize memory allocations during language processing, which can happen many times per tick.
-    // These are used in the method GetLanguages and returned from it. They should never be mutated outside of that method or returned outside this system.
-    private readonly DetermineEntityLanguagesEvent
-        _determineLanguagesEvent = new(string.Empty, new(), new()),
-        _universalLanguagesEvent = new(UniversalPrototype, [UniversalPrototype], [UniversalPrototype]); // Returned for universal speakers only
-
-    /// <summary>
-    ///   A random number added to each pseudo-random number's seed. Changes every round.
-    /// </summary>
-    public int RandomRoundSeed { get; private set; }
-
-
     public override void Initialize()
     {
         base.Initialize();
+        InitializeNet();
 
-        SubscribeNetworkEvent<LanguagesSetMessage>(OnClientSetLanguage);
         SubscribeLocalEvent<LanguageSpeakerComponent, ComponentInit>(OnInitLanguageSpeaker);
-        SubscribeLocalEvent<RoundStartingEvent>(_ => RandomRoundSeed = _random.Next());
-
-        InitializeNet();
     }
 
 
     #region public api
-    /// <summary>
-    ///   Obfuscate a message using an entity's default language.
-    /// </summary>
-    public string ObfuscateSpeech(EntityUid source, string message)
-    {
-        var language = GetLanguage(source) ?? Universal;
-        return ObfuscateSpeech(message, language);
-    }
 
-    /// <summary>
-    ///     Obfuscate a message using the given language.
-    /// </summary>
-    public string ObfuscateSpeech(string message, LanguagePrototype language)
+    public bool CanUnderstand(EntityUid listener, string language, LanguageSpeakerComponent? component = null)
     {
-        var builder = new StringBuilder();
-        if (language.ObfuscateSyllables)
-            ObfuscateSyllables(builder, message, language);
-        else
-            ObfuscatePhrases(builder, message, language);
+        if (language == UniversalPrototype || HasComp<UniversalLanguageSpeakerComponent>(listener))
+            return true;
 
-        return builder.ToString();
+        if (!Resolve(listener, ref component, logMissing: false))
+            return false;
+
+        return component.UnderstoodLanguages.Contains(language);
     }
 
-    public bool CanUnderstand(EntityUid listener, LanguagePrototype language, LanguageSpeakerComponent? listenerLanguageComp = null)
+    public bool CanSpeak(EntityUid speaker, string language, LanguageSpeakerComponent? component = null)
     {
-        if (language.ID == UniversalPrototype || HasComp<UniversalLanguageSpeakerComponent>(listener))
+        if (HasComp<UniversalLanguageSpeakerComponent>(speaker))
             return true;
 
-        var listenerLanguages = GetLanguages(listener, listenerLanguageComp)?.UnderstoodLanguages;
+        if (!Resolve(speaker, ref component, logMissing: false))
+            return false;
 
-        return listenerLanguages?.Contains(language.ID, StringComparer.Ordinal) ?? false;
+        return component.SpokenLanguages.Contains(language);
     }
 
-    public bool CanSpeak(EntityUid speaker, string language, LanguageSpeakerComponent? speakerComp = null)
+    /// <summary>
+    ///     Returns the current language of the given entity, assumes Universal if it's not a language speaker.
+    /// </summary>
+    public LanguagePrototype GetLanguage(EntityUid speaker, LanguageSpeakerComponent? component = null)
     {
-        if (HasComp<UniversalLanguageSpeakerComponent>(speaker))
-            return true;
+        if (HasComp<UniversalLanguageSpeakerComponent>(speaker) || !Resolve(speaker, ref component, logMissing: false))
+            return Universal; // Serves both as a fallback and uhhh something (TODO: fix this comment)
+
+        if (string.IsNullOrEmpty(component.CurrentLanguage) || !_prototype.TryIndex<LanguagePrototype>(component.CurrentLanguage, out var proto))
+            return Universal;
 
-        var langs = GetLanguages(speaker, speakerComp)?.UnderstoodLanguages;
-        return langs?.Contains(language, StringComparer.Ordinal) ?? false;
+        return proto;
     }
 
     /// <summary>
-    ///     Returns the current language of the given entity.
-    ///     Assumes Universal if not specified.
+    ///     Returns the list of languages this entity can speak.
     /// </summary>
-    public LanguagePrototype GetLanguage(EntityUid speaker, LanguageSpeakerComponent? languageComp = null)
+    /// <remarks>Typically, checking <see cref="LanguageSpeakerComponent.SpokenLanguages"/> is sufficient.</remarks>
+    public List<string> GetSpokenLanguages(EntityUid uid)
     {
-        var id = GetLanguages(speaker, languageComp)?.CurrentLanguage;
-        if (id == null)
-            return Universal; // Fallback
+        if (HasComp<UniversalLanguageSpeakerComponent>(uid))
+            return [UniversalPrototype];
 
-        _prototype.TryIndex(id, out LanguagePrototype? proto);
+        if (TryComp<LanguageSpeakerComponent>(uid, out var component))
+            return component.SpokenLanguages;
 
-        return proto ?? Universal;
+        return [];
     }
 
-    public void SetLanguage(EntityUid speaker, string language, LanguageSpeakerComponent? languageComp = null)
+    /// <summary>
+    ///     Returns the list of languages this entity can understand.
+    /// </summary>
+    /// <remarks>Typically, checking <see cref="LanguageSpeakerComponent.UnderstoodLanguages"/> is sufficient.</remarks>
+    public List<string> GetUnderstoodLanguages(EntityUid uid)
     {
-        if (!CanSpeak(speaker, language) || HasComp<UniversalLanguageSpeakerComponent>(speaker))
-            return;
+        if (HasComp<UniversalLanguageSpeakerComponent>(uid))
+            return [UniversalPrototype]; // This one is tricky because... well, they understand all of them, not just one.
 
-        if (languageComp == null && !TryComp(speaker, out languageComp))
-            return;
+        if (TryComp<LanguageSpeakerComponent>(uid, out var component))
+            return component.UnderstoodLanguages;
+
+        return [];
+    }
 
-        if (languageComp.CurrentLanguage == language)
+    public void SetLanguage(EntityUid speaker, string language, LanguageSpeakerComponent? component = null)
+    {
+        if (!CanSpeak(speaker, language) || (HasComp<UniversalLanguageSpeakerComponent>(speaker) && language != UniversalPrototype))
             return;
 
-        languageComp.CurrentLanguage = language;
+        if (!Resolve(speaker, ref component) || component.CurrentLanguage == language)
+            return;
 
+        component.CurrentLanguage = language;
         RaiseLocalEvent(speaker, new LanguagesUpdateEvent(), true);
     }
 
     /// <summary>
-    ///   Adds a new language to the lists of understood and/or spoken languages of the given component.
+    ///     Adds a new language to the respective lists of intrinsically known languages of the given entity.
     /// </summary>
-    public void AddLanguage(LanguageSpeakerComponent comp, string language, bool addSpoken = true, bool addUnderstood = true)
+    public void AddLanguage(
+        EntityUid uid,
+        string language,
+        bool addSpoken = true,
+        bool addUnderstood = true,
+        LanguageKnowledgeComponent? knowledge = null,
+        LanguageSpeakerComponent? speaker = null)
     {
-        if (addSpoken && !comp.SpokenLanguages.Contains(language))
-            comp.SpokenLanguages.Add(language);
+        if (knowledge == null)
+            knowledge = EnsureComp<LanguageKnowledgeComponent>(uid);
 
-        if (addUnderstood && !comp.UnderstoodLanguages.Contains(language))
-            comp.UnderstoodLanguages.Add(language);
+        if (addSpoken && !knowledge.SpokenLanguages.Contains(language))
+            knowledge.SpokenLanguages.Add(language);
 
-        RaiseLocalEvent(comp.Owner, new LanguagesUpdateEvent(), true);
-    }
+        if (addUnderstood && !knowledge.UnderstoodLanguages.Contains(language))
+            knowledge.UnderstoodLanguages.Add(language);
 
-    public (List<string> spoken, List<string> understood) GetAllLanguages(EntityUid speaker)
-    {
-        var languages = GetLanguages(speaker);
-        // The lists need to be copied because the internal ones are re-used for performance reasons.
-        return (new List<string>(languages.SpokenLanguages), new List<string>(languages.UnderstoodLanguages));
+        UpdateEntityLanguages(uid, speaker);
     }
 
     /// <summary>
-    ///   Ensures the given entity has a valid language as its current language.
-    ///   If not, sets it to the first entry of its SpokenLanguages list, or universal if it's empty.
+    ///     Removes a language from the respective lists of intrinsically known languages of the given entity.
     /// </summary>
-    public void EnsureValidLanguage(EntityUid entity, LanguageSpeakerComponent? comp = null)
+    public void RemoveLanguage(
+        EntityUid uid,
+        string language,
+        bool removeSpoken = true,
+        bool removeUnderstood = true,
+        LanguageKnowledgeComponent? knowledge = null,
+        LanguageSpeakerComponent? speaker = null)
     {
-        if (comp == null && !TryComp(entity, out comp))
-            return;
+        if (knowledge == null)
+            knowledge = EnsureComp<LanguageKnowledgeComponent>(uid);
 
-        var langs = GetLanguages(entity, comp);
-        if (!langs.SpokenLanguages.Contains(comp!.CurrentLanguage, StringComparer.Ordinal))
-        {
-            comp.CurrentLanguage = langs.SpokenLanguages.FirstOrDefault(UniversalPrototype);
-            RaiseLocalEvent(comp.Owner, new LanguagesUpdateEvent(), true);
-        }
-    }
-    #endregion
+        if (removeSpoken)
+            knowledge.SpokenLanguages.Remove(language);
 
-    #region event handling
-    private void OnInitLanguageSpeaker(EntityUid uid, LanguageSpeakerComponent component, ComponentInit args)
-    {
-        if (string.IsNullOrEmpty(component.CurrentLanguage))
-            component.CurrentLanguage = component.SpokenLanguages.FirstOrDefault(UniversalPrototype);
-    }
-    #endregion
+        if (removeUnderstood)
+            knowledge.UnderstoodLanguages.Remove(language);
 
-    #region internal api - obfuscation
-    private void ObfuscateSyllables(StringBuilder builder, string message, LanguagePrototype language)
-    {
-        // Go through each word. Calculate its hash sum and count the number of letters.
-        // Replicate it with pseudo-random syllables of pseudo-random (but similar) length. Use the hash code as the seed.
-        // This means that identical words will be obfuscated identically. Simple words like "hello" or "yes" in different langs can be memorized.
-        var wordBeginIndex = 0;
-        var hashCode = 0;
-        for (var i = 0; i < message.Length; i++)
-        {
-            var ch = char.ToLower(message[i]);
-            // A word ends when one of the following is found: a space, a sentence end, or EOM
-            if (char.IsWhiteSpace(ch) || IsSentenceEnd(ch) || i == message.Length - 1)
-            {
-                var wordLength = i - wordBeginIndex;
-                if (wordLength > 0)
-                {
-                    var newWordLength = PseudoRandomNumber(hashCode, 1, 4);
-
-                    for (var j = 0; j < newWordLength; j++)
-                    {
-                        var index = PseudoRandomNumber(hashCode + j, 0, language.Replacement.Count);
-                        builder.Append(language.Replacement[index]);
-                    }
-                }
-
-                builder.Append(ch);
-                hashCode = 0;
-                wordBeginIndex = i + 1;
-            }
-            else
-                hashCode = hashCode * 31 + ch;
-        }
+        UpdateEntityLanguages(uid, speaker);
     }
 
-    private void ObfuscatePhrases(StringBuilder builder, string message, LanguagePrototype language)
+    /// <summary>
+    ///   Ensures the given entity has a valid language as its current language.
+    ///   If not, sets it to the first entry of its SpokenLanguages list, or universal if it's empty.
+    /// </summary>
+    /// <returns>True if the current language was modified, false otherwise.</returns>
+    public bool EnsureValidLanguage(EntityUid entity, LanguageSpeakerComponent? comp = null)
     {
-        // In a similar manner, each phrase is obfuscated with a random number of conjoined obfuscation phrases.
-        // However, the number of phrases depends on the number of characters in the original phrase.
-        var sentenceBeginIndex = 0;
-        for (var i = 0; i < message.Length; i++)
+        if (!Resolve(entity, ref comp))
+            return false;
+
+        if (!comp.SpokenLanguages.Contains(comp.CurrentLanguage))
         {
-            var ch = char.ToLower(message[i]);
-            if (IsSentenceEnd(ch) || i == message.Length - 1)
-            {
-                var length = i - sentenceBeginIndex;
-                if (length > 0)
-                {
-                    var newLength = (int) Math.Clamp(Math.Cbrt(length) - 1, 1, 4); // 27+ chars for 2 phrases, 64+ for 3, 125+ for 4.
-
-                    for (var j = 0; j < newLength; j++)
-                    {
-                        var phrase = _random.Pick(language.Replacement);
-                        builder.Append(phrase);
-                    }
-                }
-                sentenceBeginIndex = i + 1;
-
-                if (IsSentenceEnd(ch))
-                    builder.Append(ch).Append(" ");
-            }
+            comp.CurrentLanguage = comp.SpokenLanguages.FirstOrDefault(UniversalPrototype);
+            RaiseLocalEvent(entity, new LanguagesUpdateEvent());
+            return true;
         }
-    }
 
-    private static bool IsSentenceEnd(char ch)
-    {
-        return ch is '.' or '!' or '?';
+        return false;
     }
-    #endregion
 
-    #region internal api - misc
     /// <summary>
-    ///   Dynamically resolves the current language of the entity and the list of all languages it speaks.
-    ///
-    ///   If the entity is not a language speaker, or is a universal language speaker, then it's assumed to speak Universal,
-    ///   aka all languages at once and none at the same time.
+    ///     Immediately refreshes the cached lists of spoken and understood languages for the given entity.
     /// </summary>
-    /// <remarks>
-    ///   The returned event is reused and thus must not be held as a reference anywhere but inside the caller function.
-    /// </remarks>
-    private DetermineEntityLanguagesEvent GetLanguages(EntityUid speaker, LanguageSpeakerComponent? comp = null)
+    public void UpdateEntityLanguages(EntityUid entity, LanguageSpeakerComponent? languages = null)
     {
-        // This is a shortcut for ghosts and entities that should not speak normally (admemes)
-        if (HasComp<UniversalLanguageSpeakerComponent>(speaker) || !TryComp(speaker, out comp))
-            return _universalLanguagesEvent;
+        if (!Resolve(entity, ref languages))
+            return;
 
-        var ev = _determineLanguagesEvent;
-        ev.SpokenLanguages.Clear();
-        ev.UnderstoodLanguages.Clear();
+        var ev = new DetermineEntityLanguagesEvent();
+        // We add the intrinsically known languages first so other systems can manipulate them easily
+        if (TryComp<LanguageKnowledgeComponent>(entity, out var knowledge))
+        {
+            foreach (var spoken in knowledge.SpokenLanguages)
+                ev.SpokenLanguages.Add(spoken);
 
-        ev.CurrentLanguage = comp.CurrentLanguage;
-        ev.SpokenLanguages.AddRange(comp.SpokenLanguages);
-        ev.UnderstoodLanguages.AddRange(comp.UnderstoodLanguages);
+            foreach (var understood in knowledge.UnderstoodLanguages)
+                ev.UnderstoodLanguages.Add(understood);
+        }
 
-        RaiseLocalEvent(speaker, ev, true);
+        RaiseLocalEvent(entity, ref ev);
 
-        if (ev.CurrentLanguage.Length == 0)
-            ev.CurrentLanguage = !string.IsNullOrEmpty(comp.CurrentLanguage) ? comp.CurrentLanguage : UniversalPrototype; // Fall back to account for admemes like admins possessing a bread
-        return ev;
-    }
+        languages.SpokenLanguages.Clear();
+        languages.UnderstoodLanguages.Clear();
 
-    /// <summary>
-    ///   Generates a stable pseudo-random number in the range (min, max) for the given seed.
-    ///   Each input seed corresponds to exactly one random number.
-    /// </summary>
-    private int PseudoRandomNumber(int seed, int min, int max)
-    {
-        // This is not a uniform distribution, but it shouldn't matter given there's 2^31 possible random numbers,
-        //   the bias of this function should be so tiny it will never be noticed.
-        seed += RandomRoundSeed;
-        var random = ((seed * 1103515245) + 12345) & 0x7fffffff; // Source: http://cs.uccs.edu/~cs591/bufferOverflow/glibc-2.2.4/stdlib/random_r.c
-        return random % (max - min) + min;
+        languages.SpokenLanguages.AddRange(ev.SpokenLanguages);
+        languages.UnderstoodLanguages.AddRange(ev.UnderstoodLanguages);
+
+        if (!EnsureValidLanguage(entity))
+            RaiseLocalEvent(entity, new LanguagesUpdateEvent());
     }
 
-    /// <summary>
-    ///   Set CurrentLanguage of the client, the client must be able to Understand the language requested.
-    /// </summary>
-    private void OnClientSetLanguage(LanguagesSetMessage message, EntitySessionEventArgs args)
-    {
-        if (args.SenderSession.AttachedEntity is not {Valid: true} speaker)
-            return;
+    #endregion
 
-        var language = GetLanguagePrototype(message.CurrentLanguage);
+    #region event handling
 
-        if (language == null || !CanSpeak(speaker, language.ID))
-            return;
+    private void OnInitLanguageSpeaker(EntityUid uid, LanguageSpeakerComponent component, ComponentInit args)
+    {
+        if (string.IsNullOrEmpty(component.CurrentLanguage))
+            component.CurrentLanguage = component.SpokenLanguages.FirstOrDefault(UniversalPrototype);
 
-        SetLanguage(speaker, language.ID);
+        UpdateEntityLanguages(uid, component);
     }
+
     #endregion
 }
diff --git a/Content.Server/Language/LanguagesUpdateEvent.cs b/Content.Server/Language/LanguagesUpdateEvent.cs
new file mode 100644
index 00000000000..88ea09916bb
--- /dev/null
+++ b/Content.Server/Language/LanguagesUpdateEvent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server.Language.Events;
+
+/// <summary>
+///     Raised on an entity when its list of languages changes.
+/// </summary>
+public sealed class LanguagesUpdateEvent : EntityEventArgs
+{
+}
diff --git a/Content.Server/Language/TranslatorImplantSystem.cs b/Content.Server/Language/TranslatorImplantSystem.cs
new file mode 100644
index 00000000000..4d58144481d
--- /dev/null
+++ b/Content.Server/Language/TranslatorImplantSystem.cs
@@ -0,0 +1,66 @@
+using Content.Shared.Implants.Components;
+using Content.Shared.Language;
+using Content.Shared.Language.Components;
+using Robust.Shared.Containers;
+
+namespace Content.Server.Language;
+
+public sealed class TranslatorImplantSystem : EntitySystem
+{
+    [Dependency] private readonly LanguageSystem _language = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<TranslatorImplantComponent, EntGotInsertedIntoContainerMessage>(OnImplant);
+        SubscribeLocalEvent<TranslatorImplantComponent, EntGotRemovedFromContainerMessage>(OnDeImplant);
+        SubscribeLocalEvent<ImplantedComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
+    }
+
+    private void OnImplant(EntityUid uid, TranslatorImplantComponent component, EntGotInsertedIntoContainerMessage args)
+    {
+        if (args.Container.ID != ImplanterComponent.ImplantSlotId)
+            return;
+
+        var implantee = Transform(uid).ParentUid;
+        if (implantee is not { Valid: true } || !TryComp<LanguageKnowledgeComponent>(implantee, out var knowledge))
+            return;
+
+        component.Enabled = true;
+        // To operate an implant, you need to know its required language intrinsically, because like... it connects to your brain or something.
+        // So external translators or other implants can't help you operate it.
+        component.SpokenRequirementSatisfied = TranslatorSystem.CheckLanguagesMatch(
+            component.RequiredLanguages, knowledge.SpokenLanguages, component.RequiresAllLanguages);
+
+        component.UnderstoodRequirementSatisfied = TranslatorSystem.CheckLanguagesMatch(
+            component.RequiredLanguages, knowledge.UnderstoodLanguages, component.RequiresAllLanguages);
+
+        _language.UpdateEntityLanguages(implantee);
+    }
+
+    private void OnDeImplant(EntityUid uid, TranslatorImplantComponent component, EntGotRemovedFromContainerMessage args)
+    {
+        // Even though the description of this event says it gets raised BEFORE reparenting, that's actually false...
+        component.Enabled = component.SpokenRequirementSatisfied = component.UnderstoodRequirementSatisfied = false;
+
+        if (TryComp<SubdermalImplantComponent>(uid, out var subdermal) && subdermal.ImplantedEntity is { Valid: true} implantee)
+            _language.UpdateEntityLanguages(implantee);
+    }
+
+    private void OnDetermineLanguages(EntityUid uid, ImplantedComponent component, ref DetermineEntityLanguagesEvent args)
+    {
+        // TODO: might wanna find a better solution, i just can't come up with something viable
+        foreach (var implant in component.ImplantContainer.ContainedEntities)
+        {
+            if (!TryComp<TranslatorImplantComponent>(implant, out var translator) || !translator.Enabled)
+                continue;
+
+            if (translator.SpokenRequirementSatisfied)
+                foreach (var language in translator.SpokenLanguages)
+                    args.SpokenLanguages.Add(language);
+
+            if (translator.UnderstoodRequirementSatisfied)
+                foreach (var language in translator.UnderstoodLanguages)
+                    args.UnderstoodLanguages.Add(language);
+        }
+    }
+}
diff --git a/Content.Server/Language/TranslatorImplanterSystem.cs b/Content.Server/Language/TranslatorImplanterSystem.cs
deleted file mode 100644
index 1e0c13375e4..00000000000
--- a/Content.Server/Language/TranslatorImplanterSystem.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System.Linq;
-using Content.Server.Administration.Logs;
-using Content.Server.Popups;
-using Content.Shared.Database;
-using Content.Shared.Interaction;
-using Content.Shared.Language;
-using Content.Shared.Language.Components;
-using Content.Shared.Language.Events;
-using Content.Shared.Language.Systems;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Language.Components.Translators;
-
-namespace Content.Server.Language;
-
-public sealed class TranslatorImplanterSystem : SharedTranslatorImplanterSystem
-{
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly LanguageSystem _language = default!;
-
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<TranslatorImplanterComponent, AfterInteractEvent>(OnImplant);
-    }
-
-
-    private void OnImplant(EntityUid implanter, TranslatorImplanterComponent component, AfterInteractEvent args)
-    {
-        if (component.Used || !args.CanReach || args.Target is not { Valid: true } target)
-            return;
-
-        if (!TryComp<LanguageSpeakerComponent>(target, out var speaker))
-            return;
-
-        if (component.MobsOnly && !HasComp<MobStateComponent>(target))
-        {
-            _popup.PopupEntity("translator-implanter-refuse", component.Owner);
-            return;
-        }
-
-        var understood = _language.GetAllLanguages(target).understood;
-        if (component.RequiredLanguages.Count > 0 && !component.RequiredLanguages.Any(lang => understood.Contains(lang)))
-        {
-            _popup.PopupEntity(Loc.GetString("translator-implanter-refuse",
-                ("implanter", implanter), ("target", target)), implanter);
-            return;
-        }
-
-        var intrinsic = EnsureComp<ImplantedTranslatorComponent>(target);
-        intrinsic.Enabled = true;
-
-        foreach (var lang in component.SpokenLanguages.Where(lang => !intrinsic.SpokenLanguages.Contains(lang)))
-            intrinsic.SpokenLanguages.Add(lang);
-
-        foreach (var lang in component.UnderstoodLanguages.Where(lang => !intrinsic.UnderstoodLanguages.Contains(lang)))
-            intrinsic.UnderstoodLanguages.Add(lang);
-
-        component.Used = true;
-        _popup.PopupEntity(Loc.GetString("translator-implanter-success",
-            ("implanter", implanter), ("target", target)), implanter);
-
-        _adminLogger.Add(LogType.Action, LogImpact.Medium,
-            $"{ToPrettyString(args.User):player} used {ToPrettyString(implanter):implanter} to give {ToPrettyString(target):target} the following languages:"
-            + $"\nSpoken: {string.Join(", ", component.SpokenLanguages)}; Understood: {string.Join(", ", component.UnderstoodLanguages)}");
-
-        OnAppearanceChange(implanter, component);
-        RaiseLocalEvent(target, new LanguagesUpdateEvent(), true);
-    }
-}
diff --git a/Content.Server/Language/TranslatorSystem.cs b/Content.Server/Language/TranslatorSystem.cs
index 3b7704b9a71..adbfe2d681f 100644
--- a/Content.Server/Language/TranslatorSystem.cs
+++ b/Content.Server/Language/TranslatorSystem.cs
@@ -4,7 +4,6 @@
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Language;
-using Content.Shared.Language.Events;
 using Content.Shared.Language.Systems;
 using Content.Shared.PowerCell;
 using Content.Shared.Language.Components.Translators;
@@ -23,7 +22,6 @@ public override void Initialize()
     {
         base.Initialize();
 
-        // I wanna die. But my death won't help us discover polymorphism.
         SubscribeLocalEvent<IntrinsicTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
         SubscribeLocalEvent<HoldsTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
         SubscribeLocalEvent<ImplantedTranslatorComponent, DetermineEntityLanguagesEvent>(OnDetermineLanguages);
@@ -31,67 +29,36 @@ public override void Initialize()
         SubscribeLocalEvent<HandheldTranslatorComponent, ActivateInWorldEvent>(OnTranslatorToggle);
         SubscribeLocalEvent<HandheldTranslatorComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
 
-        // TODO: why does this use InteractHandEvent??
         SubscribeLocalEvent<HandheldTranslatorComponent, InteractHandEvent>(OnTranslatorInteract);
         SubscribeLocalEvent<HandheldTranslatorComponent, DroppedEvent>(OnTranslatorDropped);
     }
 
-    private void OnDetermineLanguages(EntityUid uid, IntrinsicTranslatorComponent component,
-        DetermineEntityLanguagesEvent ev)
+    private void OnDetermineLanguages(EntityUid uid, IntrinsicTranslatorComponent component, DetermineEntityLanguagesEvent ev)
     {
-        if (!component.Enabled)
+        if (!component.Enabled || !TryComp<LanguageSpeakerComponent>(uid, out var speaker))
             return;
 
         if (!_powerCell.HasActivatableCharge(uid))
             return;
 
-        var addUnderstood = true;
-        var addSpoken = true;
-        if (component.RequiredLanguages.Count > 0)
-        {
-            if (component.RequiresAllLanguages)
-            {
-                // Add langs when the wielder has all of the required languages
-                foreach (var language in component.RequiredLanguages)
-                {
-                    if (!ev.SpokenLanguages.Contains(language, StringComparer.Ordinal))
-                        addSpoken = false;
-
-                    if (!ev.UnderstoodLanguages.Contains(language, StringComparer.Ordinal))
-                        addUnderstood = false;
-                }
-            }
-            else
-            {
-                // Add langs when the wielder has at least one of the required languages
-                addUnderstood = false;
-                addSpoken = false;
-                foreach (var language in component.RequiredLanguages)
-                {
-                    if (ev.SpokenLanguages.Contains(language, StringComparer.Ordinal))
-                        addSpoken = true;
-
-                    if (ev.UnderstoodLanguages.Contains(language, StringComparer.Ordinal))
-                        addUnderstood = true;
-                }
-            }
-        }
+        // The idea here is as follows:
+        // Required languages are languages that are required to operate the translator.
+        // The translator has a limited number of languages it can translate to and translate from.
+        // If the wielder understands the language of the translator, they will be able to understand translations provided by it
+        // If the wielder also speaks that language, they will be able to use it to translate their own speech by "speaking" in that language
+        var addSpoken = CheckLanguagesMatch(component.RequiredLanguages, speaker.SpokenLanguages, component.RequiresAllLanguages);
+        var addUnderstood = CheckLanguagesMatch(component.RequiredLanguages, speaker.UnderstoodLanguages, component.RequiresAllLanguages);
 
         if (addSpoken)
-        {
             foreach (var language in component.SpokenLanguages)
-                AddIfNotExists(ev.SpokenLanguages, language);
-
-            if (component.DefaultLanguageOverride != null && ev.CurrentLanguage.Length == 0)
-                ev.CurrentLanguage = component.DefaultLanguageOverride;
-        }
+                ev.SpokenLanguages.Add(language);
 
         if (addUnderstood)
             foreach (var language in component.UnderstoodLanguages)
-                AddIfNotExists(ev.UnderstoodLanguages, language);
+                ev.UnderstoodLanguages.Add(language);
     }
 
-    private void OnTranslatorInteract( EntityUid translator, HandheldTranslatorComponent component, InteractHandEvent args)
+    private void OnTranslatorInteract(EntityUid translator, HandheldTranslatorComponent component, InteractHandEvent args)
     {
         var holder = args.User;
         if (!EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
@@ -100,7 +67,7 @@ private void OnTranslatorInteract( EntityUid translator, HandheldTranslatorCompo
         var intrinsic = EnsureComp<HoldsTranslatorComponent>(holder);
         UpdateBoundIntrinsicComp(component, intrinsic, component.Enabled);
 
-        RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+        _language.UpdateEntityLanguages(holder);
     }
 
     private void OnTranslatorDropped(EntityUid translator, HandheldTranslatorComponent component, DroppedEvent args)
@@ -115,59 +82,63 @@ private void OnTranslatorDropped(EntityUid translator, HandheldTranslatorCompone
             RemCompDeferred(holder, intrinsic);
         }
 
-        _language.EnsureValidLanguage(holder);
-
-        RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+        _language.UpdateEntityLanguages(holder);
     }
 
-    private void OnTranslatorToggle(EntityUid translator, HandheldTranslatorComponent component, ActivateInWorldEvent args)
+    private void OnTranslatorToggle(EntityUid translator, HandheldTranslatorComponent translatorComp, ActivateInWorldEvent args)
     {
-        if (!component.ToggleOnInteract)
+        if (!translatorComp.ToggleOnInteract)
             return;
 
+        // This will show a popup if false
         var hasPower = _powerCell.HasDrawCharge(translator);
 
         if (Transform(args.Target).ParentUid is { Valid: true } holder
-            && EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
+            && TryComp<LanguageSpeakerComponent>(holder, out var languageComp))
         {
             // This translator is held by a language speaker and thus has an intrinsic counterpart bound to it.
             // Make sure it's up-to-date.
             var intrinsic = EnsureComp<HoldsTranslatorComponent>(holder);
-            var isEnabled = !component.Enabled;
-            if (intrinsic.Issuer != component)
+            var isEnabled = !translatorComp.Enabled;
+            if (intrinsic.Issuer != translatorComp)
             {
-                // The intrinsic comp wasn't owned by this handheld component, so this comp wasn't the active translator.
-                // Thus it needs to be turned on regardless of its previous state.
-                intrinsic.Issuer = component;
+                // The intrinsic comp wasn't owned by this handheld translator, so this wasn't the active translator.
+                // Thus, the intrinsic comp needs to be turned on regardless of its previous state.
+                intrinsic.Issuer = translatorComp;
                 isEnabled = true;
             }
-
             isEnabled &= hasPower;
-            UpdateBoundIntrinsicComp(component, intrinsic, isEnabled);
-            component.Enabled = isEnabled;
+
+            UpdateBoundIntrinsicComp(translatorComp, intrinsic, isEnabled);
+            translatorComp.Enabled = isEnabled;
             _powerCell.SetPowerCellDrawEnabled(translator, isEnabled);
 
-            _language.EnsureValidLanguage(holder);
-            RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+            // The first new spoken language added by this translator, or null
+            var firstNewLanguage = translatorComp.SpokenLanguages.FirstOrDefault(it => !languageComp.SpokenLanguages.Contains(it));
+
+            _language.UpdateEntityLanguages(holder, languageComp);
+
+            // Update the current language of the entity if necessary
+            if (isEnabled && translatorComp.SetLanguageOnInteract && firstNewLanguage is {})
+                _language.SetLanguage(holder, firstNewLanguage, languageComp);
         }
         else
         {
             // This is a standalone translator (e.g. lying on the ground), toggle its state.
-            component.Enabled = !component.Enabled && hasPower;
-            _powerCell.SetPowerCellDrawEnabled(translator, !component.Enabled && hasPower);
+            translatorComp.Enabled = !translatorComp.Enabled && hasPower;
+            _powerCell.SetPowerCellDrawEnabled(translator, !translatorComp.Enabled && hasPower);
         }
 
-        OnAppearanceChange(translator, component);
+        OnAppearanceChange(translator, translatorComp);
 
-        // HasPower shows a popup when there's no power, so we do not proceed in that case
         if (hasPower)
         {
             var message = Loc.GetString(
-                component.Enabled
+                translatorComp.Enabled
                     ? "translator-component-turnon"
                     : "translator-component-shutoff",
-                ("translator", component.Owner));
-            _popup.PopupEntity(message, component.Owner, args.User);
+                ("translator", translatorComp.Owner));
+            _popup.PopupEntity(message, translatorComp.Owner, args.User);
         }
     }
 
@@ -178,7 +149,7 @@ private void OnPowerCellSlotEmpty(EntityUid translator, HandheldTranslatorCompon
         OnAppearanceChange(translator, component);
 
         if (Transform(translator).ParentUid is { Valid: true } holder
-            && EntityManager.HasComponent<LanguageSpeakerComponent>(holder))
+            && TryComp<LanguageSpeakerComponent>(holder, out var languageComp))
         {
             if (!EntityManager.TryGetComponent<HoldsTranslatorComponent>(holder, out var intrinsic))
                 return;
@@ -186,11 +157,10 @@ private void OnPowerCellSlotEmpty(EntityUid translator, HandheldTranslatorCompon
             if (intrinsic.Issuer == component)
             {
                 intrinsic.Enabled = false;
-                EntityManager.RemoveComponent(holder, intrinsic);
+                RemComp(holder, intrinsic);
             }
 
-            _language.EnsureValidLanguage(holder);
-            RaiseLocalEvent(holder, new LanguagesUpdateEvent(), true);
+            _language.UpdateEntityLanguages(holder, languageComp);
         }
     }
 
@@ -201,25 +171,29 @@ private void UpdateBoundIntrinsicComp(HandheldTranslatorComponent comp, HoldsTra
     {
         if (isEnabled)
         {
-            intrinsic.SpokenLanguages = new List<string>(comp.SpokenLanguages);
-            intrinsic.UnderstoodLanguages = new List<string>(comp.UnderstoodLanguages);
-            intrinsic.DefaultLanguageOverride = comp.DefaultLanguageOverride;
+            intrinsic.SpokenLanguages = [..comp.SpokenLanguages];
+            intrinsic.UnderstoodLanguages = [..comp.UnderstoodLanguages];
         }
         else
         {
             intrinsic.SpokenLanguages.Clear();
             intrinsic.UnderstoodLanguages.Clear();
-            intrinsic.DefaultLanguageOverride = null;
         }
 
         intrinsic.Enabled = isEnabled;
         intrinsic.Issuer = comp;
     }
 
-    private static void AddIfNotExists(List<string> list, string item)
+    /// <summary>
+    ///     Checks whether any OR all required languages are provided. Used for utility purposes.
+    /// </summary>
+    public static bool CheckLanguagesMatch(ICollection<string> required, ICollection<string> provided, bool requireAll)
     {
-        if (list.Contains(item))
-            return;
-        list.Add(item);
+        if (required.Count == 0)
+            return true;
+
+        return requireAll
+            ? required.All(provided.Contains)
+            : required.Any(provided.Contains);
     }
 }
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 621c583a558..06d1b463ec3 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -88,7 +88,11 @@ public override void Update(float frameTime)
 
                 if (xform.GridUid != null)
                 {
-                    _environments.AddRange(_atmosphere.GetAdjacentTileMixtures(xform.GridUid.Value, position, false, true));
+                    var enumerator = _atmosphere.GetAdjacentTileMixtures(xform.GridUid.Value, position, false, true);
+                    while (enumerator.MoveNext(out var mix))
+                    {
+                        _environments.Add(mix);
+                    }
                 }
 
                 if (_environments.Count > 0)
diff --git a/Content.Server/Lube/LubeSystem.cs b/Content.Server/Lube/LubeSystem.cs
index 5285cb389c5..06d6456a57c 100644
--- a/Content.Server/Lube/LubeSystem.cs
+++ b/Content.Server/Lube/LubeSystem.cs
@@ -1,12 +1,12 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Glue;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
 using Content.Shared.Lube;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio;
diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index 92cd794ce2c..86555924712 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -21,6 +21,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Spawners;
@@ -217,7 +218,7 @@ private List<EntityCoordinates> GetSpawnPositions(TransformComponent casterXform
                 // This is shit but you get the idea.
                 var directionPos = casterXform.Coordinates.Offset(casterXform.LocalRotation.ToWorldVec().Normalized());
 
-                if (!_mapManager.TryGetGrid(casterXform.GridUid, out var mapGrid))
+                if (!TryComp<MapGridComponent>(casterXform.GridUid, out var mapGrid))
                     return new List<EntityCoordinates>();
 
                 if (!directionPos.TryGetTileRef(out var tileReference, EntityManager, _mapManager))
diff --git a/Content.Server/Mapping/MappingCommand.cs b/Content.Server/Mapping/MappingCommand.cs
index 08ba0de8334..08f3dcccf9f 100644
--- a/Content.Server/Mapping/MappingCommand.cs
+++ b/Content.Server/Mapping/MappingCommand.cs
@@ -1,17 +1,14 @@
-// ReSharper disable once RedundantUsingDirective
-// Used to warn the player in big red letters in debug mode
-
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.GameTicking;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
-using Robust.Server.Player;
+using Robust.Server.GameObjects;
+using Robust.Server.Maps;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Map;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Mapping
 {
@@ -19,6 +16,8 @@ namespace Content.Server.Mapping
     sealed class MappingCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entities = default!;
+        [Dependency] private readonly IMapManager _map = default!;
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
 
         public string Command => "mapping";
         public string Description => Loc.GetString("cmd-mapping-desc");
@@ -57,13 +56,13 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             shell.WriteError(Loc.GetString("cmd-mapping-warning"));
 #endif
 
-            var mapManager = IoCManager.Resolve<IMapManager>();
             MapId mapId;
+            string? toLoad = null;
+            var mapSys = _entities.System<SharedMapSystem>();
 
             // Get the map ID to use
             if (args.Length is 1 or 2)
             {
-
                 if (!int.TryParse(args[0], out var intMapId))
                 {
                     shell.WriteError(Loc.GetString("cmd-mapping-failure-integer", ("arg", args[0])));
@@ -79,35 +78,33 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                     return;
                 }
 
-                if (mapManager.MapExists(mapId))
+                if (_map.MapExists(mapId))
                 {
                     shell.WriteError(Loc.GetString("cmd-mapping-exists", ("mapId", mapId)));
                     return;
                 }
 
-            }
-            else
-            {
-                mapId = mapManager.NextMapId();
-            }
+                // either load a map or create a new one.
+                if (args.Length <= 1)
+                {
+                    mapSys.CreateMap(mapId, runMapInit: false);
+                }
+                else
+                {
+                    var loadOptions = new MapLoadOptions {StoreMapUids = true};
+                    _entities.System<MapLoaderSystem>().TryLoad(mapId, args[1], out _, loadOptions);
+                }
 
-            string? toLoad = null;
-            // either load a map or create a new one.
-            if (args.Length <= 1)
-            {
-                shell.ExecuteCommand($"addmap {mapId} false");
+                // was the map actually created or did it fail somehow?
+                if (!_map.MapExists(mapId))
+                {
+                    shell.WriteError(Loc.GetString("cmd-mapping-error"));
+                    return;
+                }
             }
             else
             {
-                toLoad = CommandParsing.Escape(args[1]);
-                shell.ExecuteCommand($"loadmap {mapId} \"{toLoad}\" 0 0 0 true");
-            }
-
-            // was the map actually created?
-            if (!mapManager.MapExists(mapId))
-            {
-                shell.WriteError(Loc.GetString("cmd-mapping-error"));
-                return;
+                mapSys.CreateMap(out mapId, runMapInit: false);
             }
 
             // map successfully created. run misc helpful mapping commands
@@ -117,17 +114,15 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 shell.ExecuteCommand("aghost");
             }
 
-            var cfg = IoCManager.Resolve<IConfigurationManager>();
-
             // don't interrupt mapping with events or auto-shuttle
             shell.ExecuteCommand("sudo cvar events.enabled false");
             shell.ExecuteCommand("sudo cvar shuttle.auto_call_time 0");
 
-            if (cfg.GetCVar(CCVars.AutosaveEnabled))
+            if (_cfg.GetCVar(CCVars.AutosaveEnabled))
                 shell.ExecuteCommand($"toggleautosave {mapId} {toLoad ?? "NEWMAP"}");
             shell.ExecuteCommand($"tp 0 0 {mapId}");
             shell.RemoteExecuteCommand("mappingclientsidesetup");
-            mapManager.SetMapPaused(mapId, true);
+            _map.SetMapPaused(mapId, true);
 
             if (args.Length == 2)
                 shell.WriteLine(Loc.GetString("cmd-mapping-success-load",("mapId",mapId),("path", args[1])));
diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index 8920daf60d0..aa24fde44b7 100644
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -1,8 +1,6 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.GameTicking;
-using Content.Server.Nutrition.EntitySystems;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Stack;
@@ -10,11 +8,13 @@
 using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Materials;
 using Content.Shared.Mind;
+using Content.Shared.Nutrition.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs
index 1012b9727df..976c3867a9c 100644
--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -20,7 +20,6 @@
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
-using Robust.Shared.Map;
 using Robust.Shared.Player;
 
 namespace Content.Server.Mech.Systems;
@@ -33,8 +32,6 @@ public sealed partial class MechSystem : SharedMechSystem
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly IMapManager _map = default!;
-    [Dependency] private readonly MapSystem _mapSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
@@ -410,14 +407,17 @@ private void OnExpose(EntityUid uid, MechPilotComponent component, ref AtmosExpo
         if (args.Handled)
             return;
 
-        if (!TryComp<MechComponent>(component.Mech, out var mech) ||
-            !TryComp<MechAirComponent>(component.Mech, out var mechAir))
+        if (!TryComp(component.Mech, out MechComponent? mech))
+            return;
+
+        if (mech.Airtight && TryComp(component.Mech, out MechAirComponent? air))
         {
+            args.Handled = true;
+            args.Gas = air.Air;
             return;
         }
 
-        args.Gas = mech.Airtight ? mechAir.Air : _atmosphere.GetContainingMixture(component.Mech);
-
+        args.Gas =  _atmosphere.GetContainingMixture(component.Mech, excite: args.Excite);
         args.Handled = true;
     }
 
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 4ab94c72b9f..bcacd2f5051 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -258,10 +258,7 @@ private void OnPowerChanged(Entity<CryoPodComponent> entity, ref PowerChangedEve
 
     private void OnCryoPodUpdateAtmosphere(Entity<CryoPodComponent> entity, ref AtmosDeviceUpdateEvent args)
     {
-        if (!TryComp(entity, out NodeContainerComponent? nodeContainer))
-            return;
-
-        if (!_nodeContainer.TryGetNode(nodeContainer, entity.Comp.PortName, out PortablePipeNode? portNode))
+        if (!_nodeContainer.TryGetNode(entity.Owner, entity.Comp.PortName, out PortablePipeNode? portNode))
             return;
 
         if (!TryComp(entity, out CryoPodAirComponent? cryoPodAir))
@@ -280,14 +277,10 @@ private void OnGasAnalyzed(Entity<CryoPodComponent> entity, ref GasAnalyzerScanE
         if (!TryComp(entity, out CryoPodAirComponent? cryoPodAir))
             return;
 
-        var gasMixDict = new Dictionary<string, GasMixture?> { { Name(entity.Owner), cryoPodAir.Air } };
+        args.GasMixtures ??= new Dictionary<string, GasMixture?> { { Name(entity.Owner), cryoPodAir.Air } };
         // If it's connected to a port, include the port side
-        if (TryComp(entity, out NodeContainerComponent? nodeContainer))
-        {
-            if (_nodeContainer.TryGetNode(nodeContainer, entity.Comp.PortName, out PipeNode? port))
-                gasMixDict.Add(entity.Comp.PortName, port.Air);
-        }
-        args.GasMixtures = gasMixDict;
+        if (_nodeContainer.TryGetNode(entity.Owner, entity.Comp.PortName, out PipeNode? port))
+            args.GasMixtures.Add(entity.Comp.PortName, port.Air);
     }
 
     private void OnEjected(Entity<CryoPodComponent> cryoPod, ref EntRemovedFromContainerMessage args)
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 0e893c41145..489ba9ac81c 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -49,6 +49,12 @@ public override void Update(float frameTime)
             if (component.ScannedEntity is not {} patient)
                 continue;
 
+            if (Deleted(patient))
+            {
+                StopAnalyzingEntity((uid, component), patient);
+                continue;
+            }
+
             component.NextUpdate = _timing.CurTime + component.UpdateInterval;
 
             //Get distance between health analyzer and the scanned entity
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index f19b3d5b814..0c4f1ec5463 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -9,7 +9,6 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Damage;
 using Content.Shared.DeviceNetwork;
-using Content.Shared.Emp;
 using Content.Shared.Examine;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Medical.SuitSensor;
@@ -27,7 +26,6 @@ public sealed class SuitSensorSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly CrewMonitoringServerSystem _monitoringServerSystem = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
     [Dependency] private readonly IdCardSystem _idCardSystem = default!;
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
@@ -35,6 +33,7 @@ public sealed class SuitSensorSystem : EntitySystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
     [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!;
+    [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
 
     public override void Initialize()
     {
@@ -351,6 +350,11 @@ public void SetSensor(EntityUid uid, SuitSensorMode mode, EntityUid? userUid = n
         if (TryComp<DamageableComponent>(sensor.User.Value, out var damageable))
             totalDamage = damageable.TotalDamage.Int();
 
+        // Get mob total damage crit threshold
+        int? totalDamageThreshold = null;
+        if (_mobThresholdSystem.TryGetThresholdForState(sensor.User.Value, Shared.Mobs.MobState.Critical, out var critThreshold))
+            totalDamageThreshold = critThreshold.Value.Int();
+
         // finally, form suit sensor status
         var status = new SuitSensorStatus(GetNetEntity(uid), userName, userJob, userJobIcon, userJobDepartments);
         switch (sensor.Mode)
@@ -361,10 +365,12 @@ public void SetSensor(EntityUid uid, SuitSensorMode mode, EntityUid? userUid = n
             case SuitSensorMode.SensorVitals:
                 status.IsAlive = isAlive;
                 status.TotalDamage = totalDamage;
+                status.TotalDamageThreshold = totalDamageThreshold;
                 break;
             case SuitSensorMode.SensorCords:
                 status.IsAlive = isAlive;
                 status.TotalDamage = totalDamage;
+                status.TotalDamageThreshold = totalDamageThreshold;
                 EntityCoordinates coordinates;
                 var xformQuery = GetEntityQuery<TransformComponent>();
 
@@ -409,6 +415,8 @@ public NetworkPayload SuitSensorToPacket(SuitSensorStatus status)
 
         if (status.TotalDamage != null)
             payload.Add(SuitSensorConstants.NET_TOTAL_DAMAGE, status.TotalDamage);
+        if (status.TotalDamageThreshold != null)
+            payload.Add(SuitSensorConstants.NET_TOTAL_DAMAGE_THRESHOLD, status.TotalDamageThreshold);
         if (status.Coordinates != null)
             payload.Add(SuitSensorConstants.NET_COORDINATES, status.Coordinates);
 
@@ -436,12 +444,14 @@ public NetworkPayload SuitSensorToPacket(SuitSensorStatus status)
 
         // try get total damage and cords (optionals)
         payload.TryGetValue(SuitSensorConstants.NET_TOTAL_DAMAGE, out int? totalDamage);
+        payload.TryGetValue(SuitSensorConstants.NET_TOTAL_DAMAGE_THRESHOLD, out int? totalDamageThreshold);
         payload.TryGetValue(SuitSensorConstants.NET_COORDINATES, out NetCoordinates? coords);
 
         var status = new SuitSensorStatus(suitSensorUid, name, job, jobIcon, jobDepartments)
         {
             IsAlive = isAlive.Value,
             TotalDamage = totalDamage,
+            TotalDamageThreshold = totalDamageThreshold,
             Coordinates = coords,
         };
         return status;
diff --git a/Content.Server/Mind/Commands/MakeSentientCommand.cs b/Content.Server/Mind/Commands/MakeSentientCommand.cs
index cacd499ab8d..b58d782d9c5 100644
--- a/Content.Server/Mind/Commands/MakeSentientCommand.cs
+++ b/Content.Server/Mind/Commands/MakeSentientCommand.cs
@@ -61,10 +61,11 @@ public static void MakeSentient(EntityUid uid, IEntityManager entityManager, boo
 
                 var language = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
                 var speaker = entityManager.EnsureComponent<LanguageSpeakerComponent>(uid);
-                // If the speaker knows any language (like monkey or robot), they keep those
-                // Otherwise, we give them the fallback
+
+                // If the entity already speaks some language (like monkey or robot), we do nothing else
+                // Otherwise, we give them the fallback language
                 if (speaker.SpokenLanguages.Count == 0)
-                    language.AddLanguage(speaker, SharedLanguageSystem.FallbackLanguagePrototype);
+                    language.AddLanguage(uid, SharedLanguageSystem.FallbackLanguagePrototype);
             }
 
             entityManager.EnsureComponent<ExaminerComponent>(uid);
diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs
index 4035fa0f864..dc12836d904 100644
--- a/Content.Server/Mind/MindSystem.cs
+++ b/Content.Server/Mind/MindSystem.cs
@@ -357,16 +357,17 @@ public override void SetUserId(EntityUid mindId, NetUserId? userId, MindComponen
         mind.UserId = userId;
         mind.OriginalOwnerUserId ??= userId;
 
+        // The UserId may not have a current session, but user data may still exist for disconnected players.
+        // So we cannot combine this with the TryGetSessionById() check below.
+        if (_players.GetPlayerData(userId.Value).ContentData() is { } data)
+            data.Mind = mindId;
+
         if (_players.TryGetSessionById(userId.Value, out var ret))
         {
             mind.Session = ret;
             _pvsOverride.AddSessionOverride(netMind, ret);
             _players.SetAttachedEntity(ret, mind.CurrentEntity);
         }
-
-        // session may be null, but user data may still exist for disconnected players.
-        if (_players.GetPlayerData(userId.Value).ContentData() is { } data)
-            data.Mind = mindId;
     }
 
     public void ControlMob(EntityUid user, EntityUid target)
diff --git a/Content.Server/NPC/HTN/Preconditions/PulledPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/PulledPrecondition.cs
index 64a72b13cfa..d276be72187 100644
--- a/Content.Server/NPC/HTN/Preconditions/PulledPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/PulledPrecondition.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Pulling;
+using PullingSystem = Content.Shared.Movement.Pulling.Systems.PullingSystem;
 
 namespace Content.Server.NPC.HTN.Preconditions;
 
@@ -7,14 +8,14 @@ namespace Content.Server.NPC.HTN.Preconditions;
 /// </summary>
 public sealed partial class PulledPrecondition : HTNPrecondition
 {
-    private SharedPullingSystem _pulling = default!;
+    private PullingSystem _pulling = default!;
 
     [ViewVariables(VVAccess.ReadWrite)] [DataField("isPulled")] public bool IsPulled = true;
 
     public override void Initialize(IEntitySystemManager sysManager)
     {
         base.Initialize(sysManager);
-        _pulling = sysManager.GetEntitySystem<SharedPullingSystem>();
+        _pulling = sysManager.GetEntitySystem<PullingSystem>();
     }
 
     public override bool IsMet(NPCBlackboard blackboard)
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/MoveToOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/MoveToOperator.cs
index dd35d2112c9..e64343fdd8a 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/MoveToOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/MoveToOperator.cs
@@ -4,6 +4,7 @@
 using Content.Server.NPC.Pathfinding;
 using Content.Server.NPC.Systems;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
@@ -14,7 +15,6 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
 public sealed partial class MoveToOperator : HTNOperator, IHtnConditionalShutdown
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     private NPCSteeringSystem _steering = default!;
     private PathfindingSystem _pathfind = default!;
     private SharedTransformSystem _transform = default!;
@@ -85,8 +85,8 @@ public override void Initialize(IEntitySystemManager sysManager)
             !_entManager.TryGetComponent<PhysicsComponent>(owner, out var body))
             return (false, null);
 
-        if (!_mapManager.TryGetGrid(xform.GridUid, out var ownerGrid) ||
-            !_mapManager.TryGetGrid(targetCoordinates.GetGridUid(_entManager), out var targetGrid))
+        if (!_entManager.TryGetComponent<MapGridComponent>(xform.GridUid, out var ownerGrid) ||
+            !_entManager.TryGetComponent<MapGridComponent>(targetCoordinates.GetGridUid(_entManager), out var targetGrid))
         {
             return (false, null);
         }
diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
index 10ec54c8954..efb85b23ae3 100644
--- a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
+++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
@@ -203,6 +203,7 @@ private void UpdateRanged(float frameTime)
                 return;
             }
 
+            _gun.SetTarget(gun, comp.Target);
             _gun.AttemptShoot(uid, gunUid, gun, targetCordinates);
         }
     }
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
index e7af2c91073..ce10d4f5d5e 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
@@ -58,7 +58,7 @@ private bool IsFreeSpace(
 
         // TODO: Ideally for "FreeSpace" we check all entities on the tile and build flags dynamically (pathfinder refactor in future).
         var ents = _entSetPool.Get();
-        _lookup.GetLocalEntitiesIntersecting(node.GraphUid, node.ChunkOrigin, ents, flags: LookupFlags.Static);
+        _lookup.GetLocalEntitiesIntersecting(node.GraphUid, node.Box.Enlarged(-0.04f), ents, flags: LookupFlags.Static);
         var result = true;
 
         if (ents.Count > 0)
@@ -158,42 +158,42 @@ private bool TrySeek(
             }
         }
 
+        // Check if mapids match.
+        var targetMap = targetCoordinates.ToMap(EntityManager, _transform);
+        var ourMap = ourCoordinates.ToMap(EntityManager, _transform);
+
+        if (targetMap.MapId != ourMap.MapId)
+        {
+            steering.Status = SteeringStatus.NoPath;
+            return false;
+        }
+
+        var direction = targetMap.Position - ourMap.Position;
+
         // Need to be pretty close if it's just a node to make sure LOS for door bashes or the likes.
-        float arrivalDistance;
+        bool arrived;
 
         if (targetCoordinates.Equals(steering.Coordinates))
         {
             // What's our tolerance for arrival.
             // If it's a pathfinding node it might be different to the destination.
-            arrivalDistance = steering.Range;
+            arrived = direction.Length() <= steering.Range;
         }
         // If next node is a free tile then get within its bounds.
         // This is to avoid popping it too early
         else if (steering.CurrentPath.TryPeek(out var node) && IsFreeSpace(uid, steering, node))
         {
-            arrivalDistance = MathF.Max(0.05f, MathF.Min(node.Box.Width / 2f, node.Box.Height / 2f) - 0.05f);
+            arrived = node.Box.Contains(ourCoordinates.Position);
         }
         // Try getting into blocked range I guess?
         // TODO: Consider melee range or the likes.
         else
         {
-            arrivalDistance = SharedInteractionSystem.InteractionRange - 0.05f;
+            arrived = direction.Length() <= SharedInteractionSystem.InteractionRange - 0.05f;
         }
 
-        // Check if mapids match.
-        var targetMap = targetCoordinates.ToMap(EntityManager, _transform);
-        var ourMap = ourCoordinates.ToMap(EntityManager, _transform);
-
-        if (targetMap.MapId != ourMap.MapId)
-        {
-            steering.Status = SteeringStatus.NoPath;
-            return false;
-        }
-
-        var direction = targetMap.Position - ourMap.Position;
-
         // Are we in range
-        if (direction.Length() <= arrivalDistance)
+        if (arrived)
         {
             // Node needs some kind of special handling like access or smashing.
             if (steering.CurrentPath.TryPeek(out var node) && !IsFreeSpace(uid, steering, node))
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
index 70d1e89bc4f..3bc4eae9e49 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
@@ -6,6 +6,7 @@
 using Content.Shared.DoAfter;
 using Content.Shared.Doors.Components;
 using Content.Shared.NPC;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Utility;
@@ -201,7 +202,7 @@ private SteeringObstacleStatus TryHandleFlags(EntityUid uid, NPCSteeringComponen
     private void GetObstacleEntities(PathPoly poly, int mask, int layer, List<EntityUid> ents)
     {
         // TODO: Can probably re-use this from pathfinding or something
-        if (!_mapManager.TryGetGrid(poly.GraphUid, out var grid))
+        if (!TryComp<MapGridComponent>(poly.GraphUid, out var grid))
         {
             return;
         }
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
index c00375d6488..447792b6ff2 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -45,7 +45,6 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
     [Dependency] private readonly IAdminManager _admin = default!;
     [Dependency] private readonly IConfigurationManager _configManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ClimbSystem _climb = default!;
     [Dependency] private readonly DoAfterSystem _doAfter = default!;
@@ -273,6 +272,8 @@ private void SetDirection(InputMoverComponent component, NPCSteeringComponent st
         if (clear && value.Equals(Vector2.Zero))
         {
             steering.CurrentPath.Clear();
+            Array.Clear(steering.Interest);
+            Array.Clear(steering.Danger);
         }
 
         component.CurTickSprintMovement = value;
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 33941be9292..8650c1343a6 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -13,6 +13,7 @@
 using Content.Shared.Inventory;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Tools.Systems;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged.Components;
diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs
index 636037060a9..970ca78e2cc 100644
--- a/Content.Server/Ninja/Systems/StunProviderSystem.cs
+++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs
@@ -1,14 +1,11 @@
 using Content.Server.Ninja.Events;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
 using Content.Shared.Interaction;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Ninja.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Stunnable;
-using Content.Shared.Whitelist;
-using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
@@ -23,7 +20,6 @@ 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 IPrototypeManager _proto = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
diff --git a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
index 99d18aeb3f9..c0603949be5 100644
--- a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
+++ b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
@@ -14,6 +14,7 @@ namespace Content.Server.NodeContainer.EntitySystems
     public sealed class NodeContainerSystem : EntitySystem
     {
         [Dependency] private readonly NodeGroupSystem _nodeGroupSystem = default!;
+        private EntityQuery<NodeContainerComponent> _query;
 
         public override void Initialize()
         {
@@ -26,6 +27,8 @@ public override void Initialize()
             SubscribeLocalEvent<NodeContainerComponent, ReAnchorEvent>(OnReAnchor);
             SubscribeLocalEvent<NodeContainerComponent, MoveEvent>(OnMoveEvent);
             SubscribeLocalEvent<NodeContainerComponent, ExaminedEvent>(OnExamine);
+
+            _query = GetEntityQuery<NodeContainerComponent>();
         }
 
         public bool TryGetNode<T>(NodeContainerComponent component, string? identifier, [NotNullWhen(true)] out T? node) where T : Node
@@ -46,6 +49,77 @@ public bool TryGetNode<T>(NodeContainerComponent component, string? identifier,
             return false;
         }
 
+        public bool TryGetNode<T>(Entity<NodeContainerComponent?> ent, string identifier, [NotNullWhen(true)] out T? node) where T : Node
+        {
+            if (_query.Resolve(ent, ref ent.Comp, false)
+                && ent.Comp.Nodes.TryGetValue(identifier, out var n)
+                && n is T t)
+            {
+                node = t;
+                return true;
+            }
+
+            node = null;
+            return false;
+        }
+
+        public bool TryGetNodes<T1, T2>(
+            Entity<NodeContainerComponent?> ent,
+            string id1,
+            string id2,
+            [NotNullWhen(true)] out T1? node1,
+            [NotNullWhen(true)] out T2? node2)
+            where T1 : Node
+            where T2 : Node
+        {
+            if (_query.Resolve(ent, ref ent.Comp, false)
+                && ent.Comp.Nodes.TryGetValue(id1, out var n1)
+                && n1 is T1 t1
+                && ent.Comp.Nodes.TryGetValue(id2, out var n2)
+                && n2 is T2 t2)
+            {
+                node1 = t1;
+                node2 = t2;
+                return true;
+            }
+
+            node1 = null;
+            node2 = null;
+            return false;
+        }
+
+        public bool TryGetNodes<T1, T2, T3>(
+            Entity<NodeContainerComponent?> ent,
+            string id1,
+            string id2,
+            string id3,
+            [NotNullWhen(true)] out T1? node1,
+            [NotNullWhen(true)] out T2? node2,
+            [NotNullWhen(true)] out T3? node3)
+            where T1 : Node
+            where T2 : Node
+            where T3 : Node
+        {
+            if (_query.Resolve(ent, ref ent.Comp, false)
+                && ent.Comp.Nodes.TryGetValue(id1, out var n1)
+                && n1 is T1 t1
+                && ent.Comp.Nodes.TryGetValue(id2, out var n2)
+                && n2 is T2 t2
+                && ent.Comp.Nodes.TryGetValue(id3, out var n3)
+                && n3 is T3 t3)
+            {
+                node1 = t1;
+                node2 = t2;
+                node3 = t3;
+                return true;
+            }
+
+            node1 = null;
+            node2 = null;
+            node3 = null;
+            return false;
+        }
+
         private void OnInitEvent(EntityUid uid, NodeContainerComponent component, ComponentInit args)
         {
             foreach (var (key, node) in component.Nodes)
diff --git a/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs
index 5e31bd68722..2296de2eb6a 100644
--- a/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs
+++ b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs
@@ -8,7 +8,7 @@
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
-using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
@@ -25,7 +25,6 @@ public sealed class NodeGroupSystem : EntitySystem
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly INodeGroupFactory _nodeGroupFactory = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
 
         private readonly List<int> _visDeletes = new();
         private readonly List<BaseNodeGroup> _visSends = new();
@@ -343,7 +342,7 @@ private List<Node> FloodFillNode(Node rootNode)
         private IEnumerable<Node> GetCompatibleNodes(Node node, EntityQuery<TransformComponent> xformQuery, EntityQuery<NodeContainerComponent> nodeQuery)
         {
             var xform = xformQuery.GetComponent(node.Owner);
-            _mapManager.TryGetGrid(xform.GridUid, out var grid);
+            TryComp<MapGridComponent>(xform.GridUid, out var grid);
 
             if (!node.Connectable(EntityManager, xform))
                 yield break;
diff --git a/Content.Server/Nuke/NukeCodePaperSystem.cs b/Content.Server/Nuke/NukeCodePaperSystem.cs
index 8df25feebfa..36268d5648d 100644
--- a/Content.Server/Nuke/NukeCodePaperSystem.cs
+++ b/Content.Server/Nuke/NukeCodePaperSystem.cs
@@ -7,6 +7,8 @@
 using Content.Shared.Paper;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
+using Content.Server.Announcements.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.Nuke
 {
@@ -17,6 +19,7 @@ public sealed class NukeCodePaperSystem : EntitySystem
         [Dependency] private readonly StationSystem _station = default!;
         [Dependency] private readonly PaperSystem _paper = default!;
         [Dependency] private readonly FaxSystem _faxSystem = default!;
+        [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
         public override void Initialize()
         {
@@ -57,9 +60,7 @@ public bool SendNukeCodes(EntityUid station)
             while (faxes.MoveNext(out var faxEnt, out var fax))
             {
                 if (!fax.ReceiveNukeCodes || !TryGetRelativeNukeCode(faxEnt, out var paperContent, station))
-                {
                     continue;
-                }
 
                 var printout = new FaxPrintout(
                     paperContent,
@@ -77,10 +78,8 @@ public bool SendNukeCodes(EntityUid station)
             }
 
             if (wasSent)
-            {
-                var msg = Loc.GetString("nuke-component-announcement-send-codes");
-                _chatSystem.DispatchStationAnnouncement(station, msg, colorOverride: Color.Red);
-            }
+                _announcer.SendAnnouncement(_announcer.GetAnnouncementId("NukeCodes"), Filter.Broadcast(),
+                    "nuke-component-announcement-send-codes", colorOverride: Color.Red);
 
             return wasSent;
         }
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index d6767cd2de8..5a7219fdf15 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -18,8 +18,11 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
+using Robust.Shared.Utility;
+using Content.Server.Announcements.Systems;
 
 namespace Content.Server.Nuke;
 
@@ -28,7 +31,6 @@ public sealed class NukeSystem : EntitySystem
     [Dependency] private readonly AlertLevelSystem _alertLevel = default!;
     [Dependency] private readonly ChatSystem _chatSystem = default!;
     [Dependency] private readonly ExplosionSystem _explosions = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
@@ -42,6 +44,7 @@ public sealed class NukeSystem : EntitySystem
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly AppearanceSystem _appearance = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     /// <summary>
     ///     Used to calculate when the nuke song should start playing for maximum kino with the nuke sfx
@@ -175,7 +178,7 @@ private async void OnAnchorButtonPressed(EntityUid uid, NukeComponent component,
         }
         else
         {
-            if (!_mapManager.TryGetGrid(xform.GridUid, out var grid))
+            if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
                 return;
 
             var worldPos = _transform.GetWorldPosition(xform);
@@ -461,11 +464,15 @@ public void ArmBomb(EntityUid uid, NukeComponent? component = null)
         // We are collapsing the randomness here, otherwise we would get separate random song picks for checking duration and when actually playing the song afterwards
         _selectedNukeSong = _audio.GetSound(component.ArmMusic);
 
-        // warn a crew
-        var announcement = Loc.GetString("nuke-component-announcement-armed",
-            ("time", (int) component.RemainingTime), ("position", posText));
-        var sender = Loc.GetString("nuke-component-announcement-sender");
-        _chatSystem.DispatchStationAnnouncement(stationUid ?? uid, announcement, sender, false, null, Color.Red);
+        _announcer.SendAnnouncementMessage(
+            _announcer.GetAnnouncementId("NukeArm"),
+            "nuke-component-announcement-armed",
+            Loc.GetString("nuke-component-announcement-sender"),
+            Color.Red,
+            stationUid ?? uid,
+            null,
+            ("time", (int) component.RemainingTime), ("position", posText)
+        );
 
         _sound.PlayGlobalOnStation(uid, _audio.GetSound(component.ArmSound));
         _nukeSongLength = (float) _audio.GetAudioLength(_selectedNukeSong).TotalSeconds;
@@ -502,10 +509,12 @@ public void DisarmBomb(EntityUid uid, NukeComponent? component = null)
         if (stationUid != null)
             _alertLevel.SetLevel(stationUid.Value, component.AlertLevelOnDeactivate, true, true, true);
 
-        // warn a crew
-        var announcement = Loc.GetString("nuke-component-announcement-unarmed");
-        var sender = Loc.GetString("nuke-component-announcement-sender");
-        _chatSystem.DispatchStationAnnouncement(uid, announcement, sender, false);
+        _announcer.SendAnnouncementMessage(
+            _announcer.GetAnnouncementId("NukeDisarm"),
+            "nuke-component-announcement-unarmed",
+            Loc.GetString("nuke-component-announcement-sender"),
+            station: stationUid ?? uid
+        );
 
         component.PlayedNukeSong = false;
         _sound.PlayGlobalOnStation(uid, _audio.GetSound(component.DisarmSound));
@@ -647,4 +656,3 @@ public sealed class NukeDisarmSuccessEvent : EntityEventArgs
 {
 
 }
-
diff --git a/Content.Server/NukeOps/WarDeclaratorSystem.cs b/Content.Server/NukeOps/WarDeclaratorSystem.cs
index bcc0b9c0ea6..dee0c10c40e 100644
--- a/Content.Server/NukeOps/WarDeclaratorSystem.cs
+++ b/Content.Server/NukeOps/WarDeclaratorSystem.cs
@@ -10,6 +10,8 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Timing;
+using Content.Server.Announcements.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.NukeOps;
 
@@ -25,6 +27,7 @@ public sealed class WarDeclaratorSystem : EntitySystem
     [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     public override void Initialize()
     {
@@ -74,7 +77,7 @@ private void OnActivated(Entity<WarDeclaratorComponent> ent, ref WarDeclaratorAc
         if (ev.Status == WarConditionStatus.WarReady)
         {
             var title = Loc.GetString(ent.Comp.SenderTitle);
-            _chat.DispatchGlobalAnnouncement(ent.Comp.Message, title, true, ent.Comp.Sound, ent.Comp.Color);
+            _announcer.SendAnnouncement("war", Filter.Broadcast(), ent.Comp.Message, title, ent.Comp.Color);
             _adminLogger.Add(LogType.Chat, LogImpact.Low, $"{ToPrettyString(playerEntity):player} has declared war with this text: {ent.Comp.Message}");
         }
 
diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
index f8d781bcfff..a28679ddbc9 100644
--- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
@@ -1,12 +1,11 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Explosion.Components;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Explosion.Components;
-using Content.Shared.Interaction;
+using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Rejuvenate;
@@ -32,7 +31,10 @@ public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<CreamPieComponent, InteractUsingEvent>(OnInteractUsing);
+            // activate BEFORE entity is deleted and trash is spawned
+            SubscribeLocalEvent<CreamPieComponent, ConsumeDoAfterEvent>(OnConsume, before: [typeof(FoodSystem)]);
+            SubscribeLocalEvent<CreamPieComponent, SliceFoodEvent>(OnSlice);
+
             SubscribeLocalEvent<CreamPiedComponent, RejuvenateEvent>(OnRejuvenate);
         }
 
@@ -56,7 +58,12 @@ protected override void SplattedCreamPie(EntityUid uid, CreamPieComponent creamP
             EntityManager.QueueDeleteEntity(uid);
         }
 
-        private void OnInteractUsing(Entity<CreamPieComponent> entity, ref InteractUsingEvent args)
+        private void OnConsume(Entity<CreamPieComponent> entity, ref ConsumeDoAfterEvent args)
+        {
+            ActivatePayload(entity);
+        }
+
+        private void OnSlice(Entity<CreamPieComponent> entity, ref SliceFoodEvent args)
         {
             ActivatePayload(entity);
         }
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index 6327cf6ae2c..47e7fa6802c 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -9,6 +9,7 @@
 using Content.Server.Popups;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Components;
+using Content.Shared.CCVar;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
@@ -24,10 +25,12 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Throwing;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -55,6 +58,7 @@ public sealed class DrinkSystem : EntitySystem
     [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly StomachSystem _stomach = default!;
     [Dependency] private readonly ForensicsSystem _forensics = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
 
     public override void Initialize()
     {
@@ -398,7 +402,7 @@ private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent ar
 
         _forensics.TransferDna(entity, args.Target.Value);
 
-        if (!forceDrink && solution.Volume > 0)
+        if (_config.GetCVar(CCVars.GameAutoEatDrinks) && !forceDrink && solution.Volume > 0)
             args.Repeat = true;
     }
 
@@ -411,6 +415,10 @@ private void AddDrinkVerb(Entity<DrinkComponent> entity, ref GetVerbsEvent<Alter
             !_body.TryGetBodyOrganComponents<StomachComponent>(ev.User, out var stomachs, body))
             return;
 
+        // Make sure the solution exists
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var solution))
+            return;
+
         // no drinking from living drinks, have to kill them first.
         if (_mobState.IsAlive(entity))
             return;
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 2b627151339..06d1c4b42d3 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -23,6 +23,7 @@
 using Content.Shared.Inventory;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Stacks;
 using Content.Shared.Storage;
 using Content.Shared.Verbs;
@@ -30,6 +31,8 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
 
 namespace Content.Server.Nutrition.EntitySystems;
 
@@ -54,6 +57,7 @@ public sealed class FoodSystem : EntitySystem
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly StomachSystem _stomach = default!;
     [Dependency] private readonly UtensilSystem _utensil = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
 
     public const float MaxFeedDistance = 1.0f;
 
@@ -286,7 +290,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
             _utensil.TryBreak(utensil, args.User);
         }
 
-        args.Repeat = !forceFeed;
+        args.Repeat = _config.GetCVar(CCVars.GameAutoEatFood) && !forceFeed;
 
         if (TryComp<StackComponent>(entity, out var stack))
         {
diff --git a/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
deleted file mode 100644
index 8037b61572a..00000000000
--- a/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Server.Chemistry.EntitySystems;
-using Content.Shared.Nutrition.EntitySystems;
-using Content.Shared.Nutrition.Components;
-
-namespace Content.Server.Nutrition.EntitySystems;
-
-/// <summary>
-/// Provides API for openable food and drinks, handles opening on use and preventing transfer when closed.
-/// </summary>
-public sealed class OpenableSystem : SharedOpenableSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<OpenableComponent, SolutionTransferAttemptEvent>(OnTransferAttempt);
-    }
-
-    private void OnTransferAttempt(EntityUid uid, OpenableComponent comp, SolutionTransferAttemptEvent args)
-    {
-        if (!comp.Opened)
-        {
-            // message says its just for drinks, shouldn't matter since you typically dont have a food that is openable and can be poured out
-            args.Cancel(Loc.GetString("drink-component-try-use-drink-not-open", ("owner", uid)));
-        }
-    }
-}
diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
index e92b046f2e3..abb6f393ac5 100644
--- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
@@ -1,11 +1,11 @@
 using Content.Server.Nutrition; // DeltaV
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
-using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -19,7 +19,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 SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly TransformSystem _xformSystem = default!;
 
         public override void Initialize()
@@ -67,6 +66,8 @@ private bool TrySliceFood(EntityUid uid, EntityUid user, EntityUid usedItem,
             FillSlice(sliceUid, lostSolution);
 
             _audio.PlayPvs(component.Sound, transform.Coordinates, AudioParams.Default.WithVolume(-2));
+            var ev = new SliceFoodEvent(uid, user, usedItem);
+            RaiseLocalEvent(ev);
 
             // Decrease size of item based on count - Could implement in the future
             // Bug with this currently is the size in a container is not updated
diff --git a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
index 0edd0711b67..43087214a45 100644
--- a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
@@ -1,12 +1,11 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Server.Nutrition.Components;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
 using Content.Server.Popups;
 using Content.Shared.Interaction;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 
 namespace Content.Server.Nutrition.EntitySystems
@@ -34,10 +33,7 @@ public override void Initialize()
         /// </summary>
         private void OnAfterInteract(EntityUid uid, UtensilComponent component, AfterInteractEvent ev)
         {
-            if (ev.Handled)
-                return;
-
-            if (ev.Target == null || !ev.CanReach)
+            if (ev.Handled || ev.Target == null || !ev.CanReach)
                 return;
 
             var result = TryUseUtensil(ev.User, ev.Target.Value, component);
diff --git a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs b/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs
deleted file mode 100644
index d0a399c1fea..00000000000
--- a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Server.Abilities.Borgs;
-
-[RegisterComponent]
-public sealed partial class FabricateCandyComponent : Component
-{
-    [DataField("lollipopAction")]
-    public EntityUid? LollipopAction;
-
-    [DataField("gumballAction")]
-    public EntityUid? GumballAction;
-}
diff --git a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs b/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs
deleted file mode 100644
index 6451c7cbb27..00000000000
--- a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Actions.Events;
-
-namespace Content.Server.Abilities.Borgs;
-
-public sealed partial class FabricateCandySystem : EntitySystem
-{
-    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<FabricateCandyComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<FabricateLollipopActionEvent>(OnLollipop);
-        SubscribeLocalEvent<FabricateGumballActionEvent>(OnGumball);
-    }
-
-    private void OnInit(EntityUid uid, FabricateCandyComponent component, ComponentInit args)
-    {
-        if (component.LollipopAction != null || component.GumballAction != null)
-            return;
-
-        _actionsSystem.AddAction(uid, ref component.LollipopAction, "ActionFabricateLollipop");
-        _actionsSystem.AddAction(uid, ref component.GumballAction, "ActionFabricateGumball");
-    }
-
-    private void OnLollipop(FabricateLollipopActionEvent args)
-    {
-        Spawn("FoodLollipop", Transform(args.Performer).Coordinates);
-        args.Handled = true;
-    }
-
-    private void OnGumball(FabricateGumballActionEvent args)
-    {
-        Spawn("FoodGumball", Transform(args.Performer).Coordinates);
-        args.Handled = true;
-    }
-}
diff --git a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
index 103731b1b04..ff4c097080c 100644
--- a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
+++ b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
@@ -2,12 +2,10 @@
 using System.Threading;
 using Content.Server.DoAfter;
 using Content.Server.Body.Systems;
-using Content.Server.Hands.Systems;
 using Content.Server.Resist;
 using Content.Server.Popups;
 using Content.Server.Inventory;
 using Content.Server.Nyanotrasen.Item.PseudoItem;
-using Content.Shared.Climbing; // Shared instead of Server
 using Content.Shared.Mobs;
 using Content.Shared.DoAfter;
 using Content.Shared.Buckle.Components;
@@ -20,14 +18,14 @@
 using Content.Shared.Carrying;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Systems;
-using Content.Shared.Pulling;
-using Content.Shared.Pulling.Components;
 using Content.Shared.Standing;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Item;
 using Content.Shared.Throwing;
-using Content.Shared.Physics.Pull;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Events;
+using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nyanotrasen.Item.PseudoItem;
 using Content.Shared.Storage;
@@ -38,17 +36,16 @@ namespace Content.Server.Carrying
 {
     public sealed class CarryingSystem : EntitySystem
     {
-        [Dependency] private readonly VirtualItemSystem  _virtualItemSystem = default!;
+        [Dependency] private readonly VirtualItemSystem _virtualItemSystem = default!;
         [Dependency] private readonly CarryingSlowdownSystem _slowdown = default!;
         [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
         [Dependency] private readonly StandingStateSystem _standingState = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
-        [Dependency] private readonly SharedPullingSystem _pullingSystem = default!;
+        [Dependency] private readonly PullingSystem _pullingSystem = default!;
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
         [Dependency] private readonly EscapeInventorySystem _escapeInventorySystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
-        [Dependency] private readonly RespiratorSystem _respirator = default!;
         [Dependency] private readonly PseudoItemSystem _pseudoItem = default!;
 
         public override void Initialize()
@@ -280,8 +277,8 @@ private void StartCarryDoAfter(EntityUid carrier, EntityUid carried, CarriableCo
 
         private void Carry(EntityUid carrier, EntityUid carried)
         {
-            if (TryComp<SharedPullableComponent>(carried, out var pullable))
-                _pullingSystem.TryStopPull(pullable);
+            if (TryComp<PullableComponent>(carried, out var pullable))
+                _pullingSystem.TryStopPull(carried, pullable);
 
             Transform(carrier).AttachToGridOrMap();
             Transform(carried).AttachToGridOrMap();
diff --git a/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarComponent.cs b/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarComponent.cs
index 781f2d00030..1dcbc48676a 100644
--- a/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarComponent.cs
+++ b/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarComponent.cs
@@ -2,5 +2,11 @@ namespace Content.Server.ShockCollar;
 
 [RegisterComponent]
 public sealed partial class ShockCollarComponent : Component
-{}
+{
+    [DataField]
+    public int ShockDamage = 1;
+
+    [DataField]
+    public TimeSpan ShockTime = TimeSpan.FromSeconds(2);
+}
 
diff --git a/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs b/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs
index 4b24f45401a..eeb0f59d42a 100644
--- a/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs
+++ b/Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs
@@ -33,7 +33,7 @@ private void OnTrigger(EntityUid uid, ShockCollarComponent component, TriggerEve
             && !_useDelay.TryResetDelay((uid, useDelay), true))
             return;
 
-        _electrocutionSystem.TryDoElectrocution(containerEnt, null, 5, TimeSpan.FromSeconds(2), true);
+        _electrocutionSystem.TryDoElectrocution(containerEnt, null, component.ShockDamage, component.ShockTime, true, ignoreInsulation: true);
     }
 }
 
diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
index aa6de572cee..80c38f4630e 100644
--- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
@@ -86,7 +86,7 @@ public sealed partial class DeepFryerSystem : SharedDeepfryerSystem
     private static readonly string MobFlavorMeat = "meaty";
 
     private static readonly AudioParams
-        AudioParamsInsertRemove = new(0.5f, 1f, "Master", 5f, 1.5f, 1f, false, 0f, 0.2f);
+        AudioParamsInsertRemove = new(0.5f, 1f, 5f, 1.5f, 1f, false, 0f, 0.2f);
 
     private ISawmill _sawmill = default!;
 
diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs
index 19f9b3e7b5e..ac73388d6c7 100644
--- a/Content.Server/Nyanotrasen/Mail/MailSystem.cs
+++ b/Content.Server/Nyanotrasen/Mail/MailSystem.cs
@@ -26,6 +26,7 @@
 using Content.Server.Power.Components;
 using Content.Server.Station.Systems;
 using Content.Server.Spawners.EntitySystems;
+using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Chemistry.EntitySystems;
@@ -42,6 +43,7 @@
 using Content.Shared.Mail;
 using Content.Shared.Maps;
 using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.PDA;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Roles;
@@ -712,21 +714,17 @@ private void UpdateMailTrashState(EntityUid uid, bool isTrash)
         }
     }
 
-    public struct MailRecipient
+    public struct MailRecipient(
+        string name,
+        string job,
+        string jobIcon,
+        HashSet<ProtoId<AccessLevelPrototype>> accessTags,
+        bool mayReceivePriorityMail)
     {
-        public string Name;
-        public string Job;
-        public string JobIcon;
-        public HashSet<String> AccessTags;
-        public bool MayReceivePriorityMail;
-
-        public MailRecipient(string name, string job, string jobIcon, HashSet<String> accessTags, bool mayReceivePriorityMail)
-        {
-            Name = name;
-            Job = job;
-            JobIcon = jobIcon;
-            AccessTags = accessTags;
-            MayReceivePriorityMail = mayReceivePriorityMail;
-        }
+        public string Name = name;
+        public string Job = job;
+        public string JobIcon = jobIcon;
+        public HashSet<ProtoId<AccessLevelPrototype>> AccessTags = accessTags;
+        public bool MayReceivePriorityMail = mayReceivePriorityMail;
     }
 }
diff --git a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
index 2bd8538af16..888a365a5dd 100644
--- a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
+++ b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Objectives.Components;
 using Content.Server.Warps;
 using Content.Shared.Objectives.Components;
-using Content.Shared.Mind;
 using Content.Shared.Ninja.Components;
 using Robust.Shared.Random;
 using Content.Server.Roles;
@@ -16,7 +15,6 @@ public sealed class NinjaConditionsSystem : EntitySystem
 {
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly NumberObjectiveSystem _number = default!;
-    [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
diff --git a/Content.Server/Objectives/Systems/StealConditionSystem.cs b/Content.Server/Objectives/Systems/StealConditionSystem.cs
index 02d4ee010b5..0fe6f0947c8 100644
--- a/Content.Server/Objectives/Systems/StealConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/StealConditionSystem.cs
@@ -6,11 +6,10 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Content.Shared.Pulling.Components;
-using Content.Shared.Objectives;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Mobs.Components;
+using Content.Shared.Movement.Pulling.Components;
 
 namespace Content.Server.Objectives.Systems;
 
@@ -100,19 +99,19 @@ private float GetProgress(MindComponent mind, StealConditionComponent condition)
         var count = 0;
 
         //check pulling object
-        if (TryComp<SharedPullerComponent>(mind.OwnedEntity, out var pull)) //TO DO: to make the code prettier? don't like the repetition
+        if (TryComp<PullerComponent>(mind.OwnedEntity, out var pull)) //TO DO: to make the code prettier? don't like the repetition
         {
-            var pullid = pull.Pulling;
-            if (pullid != null)
+            var pulledEntity = pull.Pulling;
+            if (pulledEntity != null)
             {
                 // check if this is the item
-                if (CheckStealTarget(pullid.Value, condition)) count++;
+                if (CheckStealTarget(pulledEntity.Value, condition)) count++;
 
                 //we don't check the inventories of sentient entity
-                if (!TryComp<MindContainerComponent>(pullid, out var pullMind))
+                if (!HasComp<MindContainerComponent>(pulledEntity))
                 {
                     // if it is a container check its contents
-                    if (_containerQuery.TryGetComponent(pullid, out var containerManager))
+                    if (_containerQuery.TryGetComponent(pulledEntity, out var containerManager))
                         stack.Push(containerManager);
                 }
             }
diff --git a/Content.Server/OfferItem/OfferItemSystem.cs b/Content.Server/OfferItem/OfferItemSystem.cs
new file mode 100644
index 00000000000..420df71ace7
--- /dev/null
+++ b/Content.Server/OfferItem/OfferItemSystem.cs
@@ -0,0 +1,83 @@
+using Content.Server.Popups;
+using Content.Shared.Hands.Components;
+using Content.Shared.Alert;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.OfferItem;
+using Content.Shared.IdentityManagement;
+using Robust.Shared.Player;
+
+namespace Content.Server.OfferItem;
+
+public sealed class OfferItemSystem : SharedOfferItemSystem
+{
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<OfferItemComponent>();
+        while (query.MoveNext(out var uid, out var offerItem))
+        {
+            if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
+                continue;
+
+            if (offerItem.Hand != null &&
+                hands.Hands[offerItem.Hand].HeldEntity == null)
+            {
+                if (offerItem.Target != null)
+                {
+                    UnReceive(offerItem.Target.Value, offerItem: offerItem);
+                    offerItem.IsInOfferMode = false;
+                    Dirty(uid, offerItem);
+                }
+                else
+                    UnOffer(uid, offerItem);
+            }
+
+            if (!offerItem.IsInReceiveMode)
+            {
+                _alertsSystem.ClearAlert(uid, AlertType.Offer);
+                continue;
+            }
+
+            _alertsSystem.ShowAlert(uid, AlertType.Offer);
+        }
+    }
+
+    /// <summary>
+    /// Accepting the offer and receive item
+    /// </summary>
+    public void Receive(EntityUid uid, OfferItemComponent? component = null)
+    {
+        if (!Resolve(uid, ref component) ||
+            !TryComp<OfferItemComponent>(component.Target, out var offerItem) ||
+            offerItem.Hand == null ||
+            component.Target == null ||
+            !TryComp<HandsComponent>(uid, out var hands))
+            return;
+
+        if (offerItem.Item != null)
+        {
+            if (!_hands.TryPickup(uid, offerItem.Item.Value, handsComp: hands))
+            {
+                _popup.PopupEntity(Loc.GetString("offer-item-full-hand"), uid, uid);
+                return;
+            }
+
+            _popup.PopupEntity(Loc.GetString("offer-item-give",
+                ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                ("target", Identity.Entity(uid, EntityManager))), component.Target.Value, component.Target.Value);
+            _popup.PopupEntity(Loc.GetString("offer-item-give-other",
+                    ("user", Identity.Entity(component.Target.Value, EntityManager)),
+                    ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                    ("target", Identity.Entity(uid, EntityManager)))
+                , component.Target.Value, Filter.PvsExcept(component.Target.Value, entityManager: EntityManager), true);
+        }
+
+        offerItem.Item = null;
+        UnReceive(uid, component, offerItem);
+    }
+}
diff --git a/Content.Server/Paint/PaintSystem.cs b/Content.Server/Paint/PaintSystem.cs
deleted file mode 100644
index c6718aced68..00000000000
--- a/Content.Server/Paint/PaintSystem.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using Content.Shared.Popups;
-using Content.Shared.Paint;
-using Content.Shared.Sprite;
-using Content.Shared.DoAfter;
-using Content.Shared.Interaction;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Robust.Shared.Audio.Systems;
-using Content.Shared.Humanoid;
-using Robust.Shared.Utility;
-using Content.Shared.Verbs;
-using Content.Shared.SubFloor;
-using Content.Server.Nutrition.Components;
-using Content.Shared.Inventory;
-using Content.Server.Nutrition.EntitySystems;
-
-namespace Content.Server.Paint;
-
-/// <summary>
-/// Colors target and consumes reagent on each color success.
-/// </summary>
-public sealed class PaintSystem : SharedPaintSystem
-{
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PaintComponent, AfterInteractEvent>(OnInteract);
-        SubscribeLocalEvent<PaintComponent, PaintDoAfterEvent>(OnPaint);
-        SubscribeLocalEvent<PaintComponent, GetVerbsEvent<UtilityVerb>>(OnPaintVerb);
-    }
-
-    private void OnInteract(EntityUid uid, PaintComponent component, AfterInteractEvent args)
-    {
-        if (!args.CanReach)
-            return;
-
-        if (args.Target is not { Valid: true } target)
-            return;
-
-        PrepPaint(uid, component, target, args.User);
-    }
-
-    private void OnPaintVerb(EntityUid uid, PaintComponent component, GetVerbsEvent<UtilityVerb> args)
-    {
-        if (!args.CanInteract || !args.CanAccess)
-            return;
-
-        var paintText = Loc.GetString("paint-verb");
-
-        var verb = new UtilityVerb()
-        {
-            Act = () =>
-            {
-                PrepPaint(uid, component, args.Target, args.User);
-            },
-
-            Text = paintText,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/paint.svg.192dpi.png"))
-        };
-        args.Verbs.Add(verb);
-    }
-    private void PrepPaint(EntityUid uid, PaintComponent component, EntityUid target, EntityUid user)
-    {
-
-        var doAfterEventArgs = new DoAfterArgs(EntityManager, user, component.Delay, new PaintDoAfterEvent(), uid, target: target, used: uid)
-        {
-            BreakOnTargetMove = true,
-            BreakOnUserMove = true,
-            BreakOnDamage = true,
-            NeedHand = true,
-            BreakOnHandChange = true
-        };
-
-        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs))
-            return;
-    }
-
-    private void OnPaint(Entity<PaintComponent> entity, ref PaintDoAfterEvent args)
-    {
-        if (args.Target == null || args.Used == null)
-            return;
-
-        if (args.Handled || args.Cancelled)
-            return;
-
-        if (args.Target is not { Valid: true } target)
-            return;
-
-        if (!_openable.IsOpen(entity))
-        {
-            _popup.PopupEntity(Loc.GetString("paint-closed", ("used", args.Used)), args.User, args.User, PopupType.Medium);
-            return;
-        }
-
-        if (HasComp<PaintedComponent>(target) || HasComp<RandomSpriteComponent>(target))
-        {
-            _popup.PopupEntity(Loc.GetString("paint-failure-painted", ("target", args.Target)), args.User, args.User, PopupType.Medium);
-            return;
-        }
-
-        if (!entity.Comp.Blacklist?.IsValid(target, EntityManager) != true || HasComp<HumanoidAppearanceComponent>(target) || HasComp<SubFloorHideComponent>(target))
-        {
-            _popup.PopupEntity(Loc.GetString("paint-failure", ("target", args.Target)), args.User, args.User, PopupType.Medium);
-            return;
-        }
-
-
-        if (TryPaint(entity, target))
-        {
-            EnsureComp<PaintedComponent>(target, out PaintedComponent? paint);
-            EnsureComp<AppearanceComponent>(target);
-
-            paint.Color = entity.Comp.Color; // set the target color to the color specified in the spray paint yml.
-            _audio.PlayPvs(entity.Comp.Spray, entity);
-            paint.Enabled = true;
-
-            if (HasComp<InventoryComponent>(target)) // Paint any clothing the target is wearing.
-            {
-                if (_inventory.TryGetSlots(target, out var slotDefinitions))
-                {
-                    foreach (var slot in slotDefinitions)
-                    {
-                        if (!_inventory.TryGetSlotEntity(target, slot.Name, out var slotEnt))
-                            continue;
-
-                        if (slotEnt == null)
-                            return;
-
-                        if (HasComp<PaintedComponent>(slotEnt.Value) || !entity.Comp.Blacklist?.IsValid(slotEnt.Value, EntityManager) != true
-                            || HasComp<RandomSpriteComponent>(slotEnt.Value) || HasComp<HumanoidAppearanceComponent>(slotEnt.Value))
-                            return;
-
-                        EnsureComp<PaintedComponent>(slotEnt.Value, out PaintedComponent? slotpaint);
-                        EnsureComp<AppearanceComponent>(slotEnt.Value);
-                        slotpaint.Color = entity.Comp.Color;
-                        _appearanceSystem.SetData(slotEnt.Value, PaintVisuals.Painted, true);
-                        Dirty(slotEnt.Value, slotpaint);
-                    }
-                }
-            }
-
-            _popup.PopupEntity(Loc.GetString("paint-success", ("target", args.Target)), args.User, args.User, PopupType.Medium);
-            _appearanceSystem.SetData(target, PaintVisuals.Painted, true);
-            Dirty(target, paint);
-            args.Handled = true;
-            return;
-        }
-
-        if (!TryPaint(entity, target))
-        {
-            _popup.PopupEntity(Loc.GetString("paint-empty", ("used", args.Used)), args.User, args.User, PopupType.Medium);
-            return;
-        }
-    }
-
-    private bool TryPaint(Entity<PaintComponent> reagent, EntityUid target)
-    {
-        if (HasComp<HumanoidAppearanceComponent>(target) || HasComp<SubFloorHideComponent>(target))
-            return false;
-
-        if (_solutionContainer.TryGetSolution(reagent.Owner, reagent.Comp.Solution, out _, out var solution))
-        {
-            var quantity = solution.RemoveReagent(reagent.Comp.Reagent, reagent.Comp.ConsumptionUnit);
-            if (quantity > 0)// checks quantity of solution is more than 0.
-                return true;
-
-            if (quantity < 1)
-                return false;
-        }
-        return false;
-    }
-}
diff --git a/Content.Server/Paper/PaperRandomStoryComponent.cs b/Content.Server/Paper/PaperRandomStoryComponent.cs
new file mode 100644
index 00000000000..7c5744f0878
--- /dev/null
+++ b/Content.Server/Paper/PaperRandomStoryComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Server.Paper;
+
+/// <summary>
+///    Adds randomly generated stories to Paper component
+/// </summary>
+[RegisterComponent, Access(typeof(PaperRandomStorySystem))]
+public sealed partial class PaperRandomStoryComponent : Component
+{
+    [DataField]
+    public List<string>? StorySegments;
+
+    [DataField]
+    public string StorySeparator = " ";
+}
diff --git a/Content.Server/Paper/PaperRandomStorySystem.cs b/Content.Server/Paper/PaperRandomStorySystem.cs
new file mode 100644
index 00000000000..e7712009c2e
--- /dev/null
+++ b/Content.Server/Paper/PaperRandomStorySystem.cs
@@ -0,0 +1,29 @@
+using Content.Server.RandomMetadata;
+
+namespace Content.Server.Paper;
+
+public sealed class PaperRandomStorySystem : EntitySystem
+{
+
+    [Dependency] private readonly RandomMetadataSystem _randomMeta = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PaperRandomStoryComponent, MapInitEvent>(OnMapinit);
+    }
+
+    private void OnMapinit(Entity<PaperRandomStoryComponent> paperStory, ref MapInitEvent ev)
+    {
+        if (!TryComp<PaperComponent>(paperStory, out var paper))
+            return;
+
+        if (paperStory.Comp.StorySegments == null)
+            return;
+
+        var story = _randomMeta.GetRandomFromSegments(paperStory.Comp.StorySegments, paperStory.Comp.StorySeparator);
+
+        paper.Content += $"\n{story}";
+    }
+}
diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.cs
index ddc7e2a0830..e9b62bc4a80 100644
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Chat.Managers;
 using Content.Server.Projectiles;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Map;
 using Robust.Shared.Timing;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
@@ -13,7 +12,6 @@ public sealed partial class ParticleAcceleratorSystem : EntitySystem
 {
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly ProjectileSystem _projectileSystem = default!;
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index c362507f19a..759b8ef29c6 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -6,17 +6,16 @@
 using Content.Shared.Movement.Systems;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
-using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 using DroneConsoleComponent = Content.Server.Shuttles.DroneConsoleComponent;
 using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Physics.Controllers
 {
     public sealed class MoverController : SharedMoverController
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly ThrusterSystem _thruster = default!;
         [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
 
@@ -276,7 +275,7 @@ private void HandleShuttleMovement(float frameTime)
 
                 var gridId = xform.GridUid;
                 // This tries to see if the grid is a shuttle and if the console should work.
-                if (!_mapManager.TryGetGrid(gridId, out var _) ||
+                if (!TryComp<MapGridComponent>(gridId, out var _) ||
                     !shuttleQuery.TryGetComponent(gridId, out var shuttleComponent) ||
                     !shuttleComponent.Enabled)
                     continue;
diff --git a/Content.Server/Physics/Controllers/PullController.cs b/Content.Server/Physics/Controllers/PullController.cs
deleted file mode 100644
index 8f58f807aae..00000000000
--- a/Content.Server/Physics/Controllers/PullController.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-using System.Numerics;
-using Content.Shared.ActionBlocker;
-using Content.Shared.Gravity;
-using Content.Shared.Pulling;
-using Content.Shared.Pulling.Components;
-using Content.Shared.Rotatable;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Controllers;
-
-namespace Content.Server.Physics.Controllers
-{
-    public sealed class PullController : VirtualController
-    {
-        // Parameterization for pulling:
-        // Speeds. Note that the speed is mass-independent (multiplied by mass).
-        // Instead, tuning to mass is done via the mass values below.
-        // Note that setting the speed too high results in overshoots (stabilized by drag, but bad)
-        private const float AccelModifierHigh = 15f;
-        private const float AccelModifierLow = 60.0f;
-        // High/low-mass marks. Curve is constant-lerp-constant, i.e. if you can even pull an item,
-        // you'll always get at least AccelModifierLow and no more than AccelModifierHigh.
-        private const float AccelModifierHighMass = 70.0f; // roundstart saltern emergency closet
-        private const float AccelModifierLowMass = 5.0f; // roundstart saltern emergency crowbar
-        // Used to control settling (turns off pulling).
-        private const float MaximumSettleVelocity = 0.1f;
-        private const float MaximumSettleDistance = 0.1f;
-        // Settle shutdown control.
-        // Mustn't be too massive, as that causes severe mispredicts *and can prevent it ever resolving*.
-        // Exists to bleed off "I pulled my crowbar" overshoots.
-        // Minimum velocity for shutdown to be necessary. This prevents stuff getting stuck b/c too much shutdown.
-        private const float SettleMinimumShutdownVelocity = 0.25f;
-        // Distance in which settle shutdown multiplier is at 0. It then scales upwards linearly with closer distances.
-        private const float SettleShutdownDistance = 1.0f;
-        // Velocity change of -LinearVelocity * frameTime * this
-        private const float SettleShutdownMultiplier = 20.0f;
-
-        // How much you must move for the puller movement check to actually hit.
-        private const float MinimumMovementDistance = 0.005f;
-
-        [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
-        [Dependency] private readonly SharedPullingSystem _pullableSystem = default!;
-        [Dependency] private readonly SharedGravitySystem _gravity = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
-
-        // TODO: Move this stuff to pullingsystem
-        /// <summary>
-        ///     If distance between puller and pulled entity lower that this threshold,
-        ///     pulled entity will not change its rotation.
-        ///     Helps with small distance jittering
-        /// </summary>
-        private const float ThresholdRotDistance = 1;
-
-        /// <summary>
-        ///     If difference between puller and pulled angle  lower that this threshold,
-        ///     pulled entity will not change its rotation.
-        ///     Helps with diagonal movement jittering
-        ///     As of further adjustments, should divide cleanly into 90 degrees
-        /// </summary>
-        private const float ThresholdRotAngle = 22.5f;
-
-        public override void Initialize()
-        {
-            UpdatesAfter.Add(typeof(MoverController));
-            SubscribeLocalEvent<SharedPullerComponent, MoveEvent>(OnPullerMove);
-
-            base.Initialize();
-        }
-
-        private void OnPullerMove(EntityUid uid, SharedPullerComponent component, ref MoveEvent args)
-        {
-            if (component.Pulling is not { } pullable || !TryComp<SharedPullableComponent>(pullable, out var pullableComponent))
-                return;
-
-            UpdatePulledRotation(uid, pullable);
-
-            if (args.NewPosition.EntityId == args.OldPosition.EntityId &&
-                (args.NewPosition.Position - args.OldPosition.Position).LengthSquared() < MinimumMovementDistance * MinimumMovementDistance)
-                return;
-
-            if (TryComp<PhysicsComponent>(pullable, out var physics))
-                PhysicsSystem.WakeBody(pullable, body: physics);
-
-            _pullableSystem.StopMoveTo(pullableComponent);
-        }
-
-        private void UpdatePulledRotation(EntityUid puller, EntityUid pulled)
-        {
-            // TODO: update once ComponentReference works with directed event bus.
-            if (!TryComp(pulled, out RotatableComponent? rotatable))
-                return;
-
-            if (!rotatable.RotateWhilePulling)
-                return;
-
-            var xforms = GetEntityQuery<TransformComponent>();
-            var pulledXform = xforms.GetComponent(pulled);
-            var pullerXform = xforms.GetComponent(puller);
-
-            var pullerData = TransformSystem.GetWorldPositionRotation(pullerXform, xforms);
-            var pulledData = TransformSystem.GetWorldPositionRotation(pulledXform, xforms);
-
-            var dir = pullerData.WorldPosition - pulledData.WorldPosition;
-            if (dir.LengthSquared() > ThresholdRotDistance * ThresholdRotDistance)
-            {
-                var oldAngle = pulledData.WorldRotation;
-                var newAngle = Angle.FromWorldVec(dir);
-
-                var diff = newAngle - oldAngle;
-                if (Math.Abs(diff.Degrees) > ThresholdRotAngle / 2f)
-                {
-                    // Ok, so this bit is difficult because ideally it would look like it's snapping to sane angles.
-                    // Otherwise PIANO DOOR STUCK! happens.
-                    // But it also needs to work with station rotation / align to the local parent.
-                    // So...
-                    var baseRotation = pulledData.WorldRotation - pulledXform.LocalRotation;
-                    var localRotation = newAngle - baseRotation;
-                    var localRotationSnapped = Angle.FromDegrees(Math.Floor((localRotation.Degrees / ThresholdRotAngle) + 0.5f) * ThresholdRotAngle);
-                    TransformSystem.SetLocalRotation(pulledXform, localRotationSnapped);
-                }
-            }
-        }
-
-        public override void UpdateBeforeSolve(bool prediction, float frameTime)
-        {
-            base.UpdateBeforeSolve(prediction, frameTime);
-
-            foreach (var pullable in _pullableSystem.Moving)
-            {
-                // There's a 1-frame delay between stopping moving something and it leaving the Moving set.
-                // This can include if leaving the Moving set due to not being pulled anymore,
-                //  or due to being deleted.
-
-                if (pullable.Deleted)
-                    continue;
-
-                if (pullable.MovingTo == null)
-                    continue;
-
-                if (pullable.Puller is not {Valid: true} puller)
-                    continue;
-
-                var pullableEnt = pullable.Owner;
-                var pullableXform = Transform(pullableEnt);
-                var pullerXform = Transform(puller);
-
-                // Now that's over with...
-
-                var pullerPosition = pullerXform.MapPosition;
-                var movingTo = pullable.MovingTo.Value.ToMap(EntityManager, _transform);
-                if (movingTo.MapId != pullerPosition.MapId)
-                {
-                    _pullableSystem.StopMoveTo(pullable);
-                    continue;
-                }
-
-                if (!TryComp<PhysicsComponent>(pullableEnt, out var physics) ||
-                    physics.BodyType == BodyType.Static ||
-                    movingTo.MapId != pullableXform.MapID)
-                {
-                    _pullableSystem.StopMoveTo(pullable);
-                    continue;
-                }
-
-                var movingPosition = movingTo.Position;
-                var ownerPosition = pullableXform.MapPosition.Position;
-
-                var diff = movingPosition - ownerPosition;
-                var diffLength = diff.Length();
-
-                if (diffLength < MaximumSettleDistance && physics.LinearVelocity.Length() < MaximumSettleVelocity)
-                {
-                    PhysicsSystem.SetLinearVelocity(pullableEnt, Vector2.Zero, body: physics);
-                    _pullableSystem.StopMoveTo(pullable);
-                    continue;
-                }
-
-                var impulseModifierLerp = Math.Min(1.0f, Math.Max(0.0f, (physics.Mass - AccelModifierLowMass) / (AccelModifierHighMass - AccelModifierLowMass)));
-                var impulseModifier = MathHelper.Lerp(AccelModifierLow, AccelModifierHigh, impulseModifierLerp);
-                var multiplier = diffLength < 1 ? impulseModifier * diffLength : impulseModifier;
-                // Note the implication that the real rules of physics don't apply to pulling control.
-                var accel = diff.Normalized() * multiplier;
-                // Now for the part where velocity gets shutdown...
-                if (diffLength < SettleShutdownDistance && physics.LinearVelocity.Length() >= SettleMinimumShutdownVelocity)
-                {
-                    // Shutdown velocity increases as we get closer to centre
-                    var scaling = (SettleShutdownDistance - diffLength) / SettleShutdownDistance;
-                    accel -= physics.LinearVelocity * SettleShutdownMultiplier * scaling;
-                }
-
-                PhysicsSystem.WakeBody(pullableEnt, body: physics);
-
-                var impulse = accel * physics.Mass * frameTime;
-                PhysicsSystem.ApplyLinearImpulse(pullableEnt, impulse, body: physics);
-
-                // if the puller is weightless or can't move, then we apply the inverse impulse (Newton's third law).
-                // doing it under gravity produces an unsatisfying wiggling when pulling.
-                // If player can't move, assume they are on a chair and we need to prevent pull-moving.
-                if ((_gravity.IsWeightless(puller) && pullerXform.GridUid == null) || !_actionBlockerSystem.CanMove(puller))
-                {
-                    PhysicsSystem.WakeBody(puller);
-                    PhysicsSystem.ApplyLinearImpulse(puller, -impulse);
-                }
-            }
-        }
-    }
-}
diff --git a/Content.Server/Pinpointer/NavMapSystem.cs b/Content.Server/Pinpointer/NavMapSystem.cs
index bf3a3b29988..aee8b901910 100644
--- a/Content.Server/Pinpointer/NavMapSystem.cs
+++ b/Content.Server/Pinpointer/NavMapSystem.cs
@@ -1,12 +1,16 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Server.Administration.Logs;
 using Content.Server.Station.Systems;
 using Content.Server.Warps;
 using Content.Shared.Database;
 using Content.Shared.Examine;
+using Content.Shared.Localizations;
 using Content.Shared.Pinpointer;
 using Content.Shared.Tag;
+using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameStates;
+using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
@@ -22,10 +26,15 @@ public sealed class NavMapSystem : SharedNavMapSystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly TagSystem _tags = default!;
     [Dependency] private readonly MapSystem _map = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     private EntityQuery<PhysicsComponent> _physicsQuery;
     private EntityQuery<TagComponent> _tagQuery;
 
+    public const float CloseDistance = 15f;
+    public const float FarDistance = 30f;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -40,6 +49,7 @@ public override void Initialize()
         SubscribeLocalEvent<NavMapComponent, ComponentGetState>(OnGetState);
         SubscribeLocalEvent<GridSplitEvent>(OnNavMapSplit);
 
+        SubscribeLocalEvent<NavMapBeaconComponent, MapInitEvent>(OnNavMapBeaconMapInit);
         SubscribeLocalEvent<NavMapBeaconComponent, ComponentStartup>(OnNavMapBeaconStartup);
         SubscribeLocalEvent<NavMapBeaconComponent, AnchorStateChangedEvent>(OnNavMapBeaconAnchor);
 
@@ -57,6 +67,16 @@ private void OnStationInit(StationGridAddedEvent ev)
         RefreshGrid(comp, Comp<MapGridComponent>(ev.GridId));
     }
 
+    private void OnNavMapBeaconMapInit(EntityUid uid, NavMapBeaconComponent component, MapInitEvent args)
+    {
+        if (component.DefaultText == null || component.Text != null)
+            return;
+
+        component.Text = Loc.GetString(component.DefaultText);
+        Dirty(uid, component);
+        RefreshNavGrid(uid);
+    }
+
     private void OnNavMapBeaconStartup(EntityUid uid, NavMapBeaconComponent component, ComponentStartup args)
     {
         RefreshNavGrid(uid);
@@ -384,4 +404,101 @@ public void ToggleBeacon(EntityUid uid, NavMapBeaconComponent? comp = null)
 
         SetBeaconEnabled(uid, !comp.Enabled, comp);
     }
+
+    /// <summary>
+    /// For a given position, tries to find the nearest configurable beacon that is marked as visible.
+    /// This is used for things like announcements where you want to find the closest "landmark" to something.
+    /// </summary>
+    [PublicAPI]
+    public bool TryGetNearestBeacon(Entity<TransformComponent?> ent,
+        [NotNullWhen(true)] out Entity<NavMapBeaconComponent>? beacon,
+        [NotNullWhen(true)] out MapCoordinates? beaconCoords)
+    {
+        beacon = null;
+        beaconCoords = null;
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        return TryGetNearestBeacon(_transform.GetMapCoordinates(ent, ent.Comp), out beacon, out beaconCoords);
+    }
+
+    /// <summary>
+    /// For a given position, tries to find the nearest configurable beacon that is marked as visible.
+    /// This is used for things like announcements where you want to find the closest "landmark" to something.
+    /// </summary>
+    public bool TryGetNearestBeacon(MapCoordinates coordinates,
+        [NotNullWhen(true)] out Entity<NavMapBeaconComponent>? beacon,
+        [NotNullWhen(true)] out MapCoordinates? beaconCoords)
+    {
+        beacon = null;
+        beaconCoords = null;
+        var minDistance = float.PositiveInfinity;
+
+        var query = EntityQueryEnumerator<ConfigurableNavMapBeaconComponent, NavMapBeaconComponent, TransformComponent>();
+        while (query.MoveNext(out var uid, out _, out var navBeacon, out var xform))
+        {
+            if (!navBeacon.Enabled)
+                continue;
+
+            if (navBeacon.Text == null)
+                continue;
+
+            if (coordinates.MapId != xform.MapID)
+                continue;
+
+            var coords = _transform.GetWorldPosition(xform);
+            var distanceSquared = (coordinates.Position - coords).LengthSquared();
+            if (!float.IsInfinity(minDistance) && distanceSquared >= minDistance)
+                continue;
+
+            minDistance = distanceSquared;
+            beacon = (uid, navBeacon);
+            beaconCoords = new MapCoordinates(coords, xform.MapID);
+        }
+
+        return beacon != null;
+    }
+
+    [PublicAPI]
+    public string GetNearestBeaconString(Entity<TransformComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return Loc.GetString("nav-beacon-pos-no-beacons");
+
+        return GetNearestBeaconString(_transform.GetMapCoordinates(ent, ent.Comp));
+    }
+
+    public string GetNearestBeaconString(MapCoordinates coordinates)
+    {
+        if (!TryGetNearestBeacon(coordinates, out var beacon, out var pos))
+            return Loc.GetString("nav-beacon-pos-no-beacons");
+
+        var gridOffset = Angle.Zero;
+        if (_mapManager.TryFindGridAt(pos.Value, out var grid, out _))
+            gridOffset = Transform(grid).LocalRotation;
+
+        // get the angle between the two positions, adjusted for the grid rotation so that
+        // we properly preserve north in relation to the grid.
+        var dir = (pos.Value.Position - coordinates.Position).ToWorldAngle();
+        var adjustedDir = (dir - gridOffset).GetDir();
+
+        var length = (pos.Value.Position - coordinates.Position).Length();
+        if (length < CloseDistance)
+        {
+            return Loc.GetString("nav-beacon-pos-format",
+                ("color", beacon.Value.Comp.Color),
+                ("marker", beacon.Value.Comp.Text!));
+        }
+
+        var modifier = length > FarDistance
+            ? Loc.GetString("nav-beacon-pos-format-direction-mod-far")
+            : string.Empty;
+
+        // we can null suppress the text being null because TRyGetNearestVisibleStationBeacon always gives us a beacon with not-null text.
+        return Loc.GetString("nav-beacon-pos-format-direction",
+            ("modifier", modifier),
+            ("direction", ContentLocalizationManager.FormatDirection(adjustedDir).ToLowerInvariant()),
+            ("color", beacon.Value.Comp.Color),
+            ("marker", beacon.Value.Comp.Text!));
+    }
 }
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
index c3b7ba05285..02d57803154 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
@@ -55,7 +55,7 @@ namespace Content.Server.Players.PlayTimeTracking;
 /// Operations like refreshing and sending play time info to clients are deferred until the next frame (note: not tick).
 /// </para>
 /// </remarks>
-public sealed partial class PlayTimeTrackingManager
+public sealed partial class PlayTimeTrackingManager : ISharedPlaytimeManager
 {
     [Dependency] private readonly IServerDbManager _db = default!;
     [Dependency] private readonly IServerNetManager _net = default!;
@@ -209,6 +209,11 @@ private static void FlushSingleTracker(PlayTimeData data, TimeSpan time)
         }
     }
 
+    public Dictionary<string, TimeSpan> GetPlayTimes(ICommonSession session)
+    {
+        return GetTrackerTimes(session);
+    }
+
     private void SendPlayTimes(ICommonSession pSession)
     {
         var roles = GetTrackerTimes(pSession);
@@ -316,11 +321,10 @@ public async Task LoadData(ICommonSession session, CancellationToken cancel)
         cancel.ThrowIfCancellationRequested();
 
         foreach (var timer in playTimes)
-        {
             data.TrackerTimes.Add(timer.Tracker, timer.TimeSpent);
-        }
 
-        session.ContentData()!.Whitelisted = await _db.GetWhitelistStatusAsync(session.UserId); // Nyanotrasen - Whitelist
+        if (session.ContentData() != null)
+            session.ContentData()!.Whitelisted = await _db.GetWhitelistStatusAsync(session.UserId);
 
         data.Initialized = true;
 
diff --git a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
index 60f0603074d..6e0e0c503a9 100644
--- a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
+++ b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
@@ -94,7 +94,7 @@ private void OnShoot(Entity<PneumaticCannonComponent> cannon, ref GunShotEvent a
             return;
 
         // this should always be possible, as we'll eject the gas tank when it no longer is
-        var environment = _atmos.GetContainingMixture(cannon, false, true);
+        var environment = _atmos.GetContainingMixture(cannon.Owner, false, true);
         var removed = _gasTank.RemoveAir(gas.Value, component.GasUsage);
         if (environment != null && removed != null)
         {
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
index 66dc9dab99d..8cae15d70df 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -32,7 +32,6 @@ public sealed partial class PolymorphSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly ActionsSystem _actions = default!;
-    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly SharedBuckleSystem _buckle = default!;
     [Dependency] private readonly ContainerSystem _container = default!;
@@ -119,7 +118,12 @@ private void OnMapInit(Entity<PolymorphedEntityComponent> ent, ref MapInitEvent
 
     private void OnPolymorphActionEvent(Entity<PolymorphableComponent> ent, ref PolymorphActionEvent args)
     {
-        PolymorphEntity(ent, args.Prototype.Configuration);
+        if (!_proto.TryIndex(args.ProtoId, out var prototype) || args.Handled)
+            return;
+
+        PolymorphEntity(ent, prototype.Configuration);
+
+        args.Handled = true;
     }
 
     private void OnRevertPolymorphActionEvent(Entity<PolymorphedEntityComponent> ent,
@@ -349,7 +353,9 @@ public void CreatePolymorphAction(ProtoId<PolymorphPrototype> id, Entity<Polymor
         if (target.Comp.PolymorphActions.ContainsKey(id))
             return;
 
-        var polyProto = _proto.Index(id);
+        if (!_proto.TryIndex(id, out var polyProto))
+            return;
+
         var entProto = _proto.Index(polyProto.Configuration.Entity);
 
         EntityUid? actionId = default!;
@@ -367,7 +373,7 @@ public void CreatePolymorphAction(ProtoId<PolymorphPrototype> id, Entity<Polymor
 
         baseAction.Icon = new SpriteSpecifier.EntityPrototype(polyProto.Configuration.Entity);
         if (baseAction is InstantActionComponent action)
-            action.Event = new PolymorphActionEvent(prototype: polyProto);
+            action.Event = new PolymorphActionEvent(id);
     }
 
     public void RemovePolymorphAction(ProtoId<PolymorphPrototype> id, Entity<PolymorphableComponent> target)
diff --git a/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs b/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs
index f741c24571e..5654c84722f 100644
--- a/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs
+++ b/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs
@@ -3,8 +3,8 @@
 using Content.Server.Polymorph.Systems;
 using Content.Shared.Administration;
 using Content.Shared.Polymorph;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Toolshed;
-using Robust.Shared.Toolshed.TypeParsers;
 
 namespace Content.Server.Polymorph.Toolshed;
 
@@ -15,22 +15,26 @@ namespace Content.Server.Polymorph.Toolshed;
 public sealed class PolymorphCommand : ToolshedCommand
 {
     private PolymorphSystem? _system;
+    [Dependency] private IPrototypeManager _proto = default!;
 
     [CommandImplementation]
     public EntityUid? Polymorph(
             [PipedArgument] EntityUid input,
-            [CommandArgument] Prototype<PolymorphPrototype> prototype
+            [CommandArgument] ProtoId<PolymorphPrototype> protoId
         )
     {
         _system ??= GetSys<PolymorphSystem>();
 
-        return _system.PolymorphEntity(input, prototype.Value.Configuration);
+        if (!_proto.TryIndex(protoId, out var prototype))
+            return null;
+
+        return _system.PolymorphEntity(input, prototype.Configuration);
     }
 
     [CommandImplementation]
     public IEnumerable<EntityUid> Polymorph(
             [PipedArgument] IEnumerable<EntityUid> input,
-            [CommandArgument] Prototype<PolymorphPrototype> prototype
+            [CommandArgument] ProtoId<PolymorphPrototype> protoId
         )
-        => input.Select(x => Polymorph(x, prototype)).Where(x => x is not null).Select(x => (EntityUid)x!);
+        => input.Select(x => Polymorph(x, protoId)).Where(x => x is not null).Select(x => (EntityUid)x!);
 }
diff --git a/Content.Server/Popups/PopupSystem.cs b/Content.Server/Popups/PopupSystem.cs
index c5eb3819b54..d1163a2be1b 100644
--- a/Content.Server/Popups/PopupSystem.cs
+++ b/Content.Server/Popups/PopupSystem.cs
@@ -88,7 +88,7 @@ public override void PopupEntity(string? message, EntityUid uid, EntityUid recip
                 RaiseNetworkEvent(new PopupEntityEvent(message, type, GetNetEntity(uid)), actor.PlayerSession);
         }
 
-        public override void PopupClient(string? message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small)
+        public override void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
         {
             // do nothing duh its for client only
         }
@@ -126,5 +126,10 @@ public override void PopupPredicted(string? message, EntityUid uid, EntityUid? r
                 RaiseNetworkEvent(new PopupEntityEvent(message, type, GetNetEntity(uid)));
             }
         }
+
+        public override void PopupPredicted(string? recipientMessage, string? othersMessage, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
+        {
+            PopupPredicted(othersMessage, uid, recipient, type);
+        }
     }
 }
diff --git a/Content.Server/Power/Components/CableVisComponent.cs b/Content.Server/Power/Components/CableVisComponent.cs
index bd9c62ba808..51d68b99fdc 100644
--- a/Content.Server/Power/Components/CableVisComponent.cs
+++ b/Content.Server/Power/Components/CableVisComponent.cs
@@ -4,7 +4,7 @@
     public sealed partial class CableVisComponent : Component
     {
         [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("node")]
-        public string? Node;
+        [DataField("node", required:true)]
+        public string Node;
     }
 }
diff --git a/Content.Server/Power/EntitySystems/CableSystem.Placer.cs b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
index c5ca36c3a15..263d626ef55 100644
--- a/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
+++ b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Maps;
 using Content.Shared.Stacks;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Power.EntitySystems;
 
@@ -25,7 +26,7 @@ private void OnCablePlacerAfterInteract(Entity<CablePlacerComponent> placer, ref
         if (component.CablePrototypeId == null)
             return;
 
-        if(!_mapManager.TryGetGrid(args.ClickLocation.GetGridUid(EntityManager), out var grid))
+        if(!TryComp<MapGridComponent>(args.ClickLocation.GetGridUid(EntityManager), out var grid))
             return;
 
         var snapPos = grid.TileIndicesFor(args.ClickLocation);
diff --git a/Content.Server/Power/EntitySystems/CableSystem.cs b/Content.Server/Power/EntitySystems/CableSystem.cs
index dd478753be3..62eb08d7cbc 100644
--- a/Content.Server/Power/EntitySystems/CableSystem.cs
+++ b/Content.Server/Power/EntitySystems/CableSystem.cs
@@ -5,10 +5,7 @@
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
-using Content.Shared.Tools;
-using Content.Shared.Tools.Components;
 using Robust.Shared.Map;
-using System.Xml.Schema;
 using CableCuttingFinishedEvent = Content.Shared.Tools.Systems.CableCuttingFinishedEvent;
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
 
@@ -16,13 +13,11 @@ namespace Content.Server.Power.EntitySystems;
 
 public sealed partial class CableSystem : EntitySystem
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly ITileDefinitionManager _tileManager = default!;
     [Dependency] private readonly SharedToolSystem _toolSystem = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!;
     [Dependency] private readonly IAdminLogManager _adminLogs = default!;
-    [Dependency] private readonly PowerMonitoringConsoleSystem _powerMonitoringSystem = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/Power/EntitySystems/CableVisSystem.cs b/Content.Server/Power/EntitySystems/CableVisSystem.cs
index fcf0ae3d58d..1a68e87ad61 100644
--- a/Content.Server/Power/EntitySystems/CableVisSystem.cs
+++ b/Content.Server/Power/EntitySystems/CableVisSystem.cs
@@ -4,15 +4,13 @@
 using Content.Server.Power.Nodes;
 using Content.Shared.Wires;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Power.EntitySystems
 {
     [UsedImplicitly]
     public sealed class CableVisSystem : EntitySystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
 
@@ -25,14 +23,11 @@ public override void Initialize()
 
         private void UpdateAppearance(EntityUid uid, CableVisComponent cableVis, ref NodeGroupsRebuilt args)
         {
-            if (!TryComp(uid, out NodeContainerComponent? nodeContainer) || !TryComp(uid, out AppearanceComponent? appearance))
-                return;
-
-            if (!_nodeContainer.TryGetNode<CableNode>(nodeContainer, cableVis.Node, out var node))
+            if (!_nodeContainer.TryGetNode(uid, cableVis.Node, out CableNode? node))
                 return;
 
             var transform = Transform(uid);
-            if (!_mapManager.TryGetGrid(transform.GridUid, out var grid))
+            if (!TryComp<MapGridComponent>(transform.GridUid, out var grid))
                 return;
 
             var mask = WireVisDirFlags.None;
@@ -57,7 +52,7 @@ private void UpdateAppearance(EntityUid uid, CableVisComponent cableVis, ref Nod
                 };
             }
 
-            _appearance.SetData(uid, WireVisVisuals.ConnectedMask, mask, appearance);
+            _appearance.SetData(uid, WireVisVisuals.ConnectedMask, mask);
         }
     }
 }
diff --git a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
index acfb8ff87b3..85e553031fc 100644
--- a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
+++ b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Power.Components;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
@@ -9,8 +8,6 @@ namespace Content.Server.Power.EntitySystems
 {
     public sealed class ExtensionCableSystem : EntitySystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
-
         public override void Initialize()
         {
             base.Initialize();
diff --git a/Content.Server/Power/Generation/Teg/TegNodeGroup.cs b/Content.Server/Power/Generation/Teg/TegNodeGroup.cs
index ed6b46e304a..3c937f8f71d 100644
--- a/Content.Server/Power/Generation/Teg/TegNodeGroup.cs
+++ b/Content.Server/Power/Generation/Teg/TegNodeGroup.cs
@@ -66,11 +66,16 @@ public override void Initialize(Node sourceNode, IEntityManager entMan)
 
     public override void LoadNodes(List<Node> groupNodes)
     {
-        DebugTools.Assert(groupNodes.Count <= 3, "The TEG has at most 3 parts");
         DebugTools.Assert(_entityManager != null);
 
         base.LoadNodes(groupNodes);
 
+        if (groupNodes.Count > 3)
+        {
+            // Somehow got more TEG parts. Probably shenanigans. Bail.
+            return;
+        }
+
         Generator = groupNodes.OfType<TegNodeGenerator>().SingleOrDefault();
         if (Generator != null)
         {
diff --git a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
index 76cf90c3693..5f79906c995 100644
--- a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
+++ b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
@@ -26,12 +26,8 @@ private void OnDeviceUpdated(EntityUid uid, GasPowerReceiverComponent component,
     {
         var timeDelta = args.dt;
 
-        if (!HasComp<AtmosDeviceComponent>(uid)
-            || !TryComp<NodeContainerComponent>(uid, out var nodeContainer)
-            || !_nodeContainer.TryGetNode<PipeNode>(nodeContainer, "pipe", out var pipe))
-        {
+        if (!_nodeContainer.TryGetNode(uid, "pipe", out PipeNode? pipe))
             return;
-        }
 
         // if we're below the max temperature, then we are simply consuming our target gas
         if (pipe.Air.Temperature <= component.MaxTemperature)
@@ -57,7 +53,7 @@ private void OnDeviceUpdated(EntityUid uid, GasPowerReceiverComponent component,
                 if (component.OffVentGas)
                 {
                     // eject the gas into the atmosphere
-                    var mix = _atmosphereSystem.GetContainingMixture(uid, false, true);
+                    var mix = _atmosphereSystem.GetContainingMixture(uid, args.Grid, args.Map, false, true);
                     if (mix is not null)
                         _atmosphereSystem.Merge(res, mix);
                 }
diff --git a/Content.Server/Power/Generator/PortableGeneratorSystem.cs b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
index e8e9c5b45e3..e7dfa351789 100644
--- a/Content.Server/Power/Generator/PortableGeneratorSystem.cs
+++ b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.DoAfter;
-using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -28,7 +27,6 @@ public sealed class PortableGeneratorSystem : SharedPortableGeneratorSystem
     [Dependency] private readonly GeneratorSystem _generator = default!;
     [Dependency] private readonly PowerSwitchableSystem _switchable = default!;
     [Dependency] private readonly ActiveGeneratorRevvingSystem _revving = default!;
-    [Dependency] private readonly PowerNetSystem _powerNet = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs
index 298e35db469..903cb7ce12e 100644
--- a/Content.Server/PowerSink/PowerSinkSystem.cs
+++ b/Content.Server/PowerSink/PowerSinkSystem.cs
@@ -8,6 +8,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Content.Server.Power.EntitySystems;
+using Content.Server.Announcements.Systems;
 
 namespace Content.Server.PowerSink
 {
@@ -33,6 +34,7 @@ public sealed class PowerSinkSystem : EntitySystem
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly StationSystem _station = default!;
         [Dependency] private readonly BatterySystem _battery = default!;
+        [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
         public override void Initialize()
         {
@@ -126,12 +128,9 @@ private void NotifyStationOfImminentExplosion(EntityUid uid, PowerSinkComponent
             if (station == null)
                 return;
 
-            _chat.DispatchStationAnnouncement(
-                station.Value,
-                Loc.GetString("powersink-immiment-explosion-announcement"),
-                playDefaultSound: true,
-                colorOverride: Color.Yellow
-            );
+            _announcer.SendAnnouncement(_announcer.GetAnnouncementId("PowerSinkExplosion"),
+                _station.GetInOwningStation(station.Value), "powersink-immiment-explosion-announcement",
+                colorOverride: Color.Yellow, station: station.Value);
         }
     }
 }
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index e489ae28d58..e262fde64d2 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
+using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
@@ -25,6 +26,7 @@ public sealed class ServerPreferencesManager : IServerPreferencesManager
         [Dependency] private readonly IServerNetManager _netManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IServerDbManager _db = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _protos = default!;
 
         // Cache player prefs on the server so we don't need as much async hell related to them.
@@ -98,8 +100,10 @@ private async void HandleUpdateCharacterMessage(MsgUpdateCharacter message)
             }
 
             var curPrefs = prefsData.Prefs!;
+            var session = _playerManager.GetSessionById(userId);
+            var collection = IoCManager.Instance!;
 
-            profile.EnsureValid(_cfg, _protos);
+            profile.EnsureValid(session, collection);
 
             var profiles = new Dictionary<int, ICharacterProfile>(curPrefs.Characters)
             {
@@ -260,17 +264,20 @@ private async Task<PlayerPreferences> GetOrCreatePreferencesAsync(NetUserId user
                 return await _db.InitPrefsAsync(userId, HumanoidCharacterProfile.Random());
             }
 
-            return SanitizePreferences(prefs);
+            var session = _playerManager.GetSessionById(userId);
+            var collection = IoCManager.Instance!;
+
+            return SanitizePreferences(session, prefs, collection);
         }
 
-        private PlayerPreferences SanitizePreferences(PlayerPreferences prefs)
+        private PlayerPreferences SanitizePreferences(ICommonSession session, PlayerPreferences prefs,
+            IDependencyCollection collection)
         {
             // Clean up preferences in case of changes to the game,
             // such as removed jobs still being selected.
-
             return new PlayerPreferences(prefs.Characters.Select(p =>
             {
-                return new KeyValuePair<int, ICharacterProfile>(p.Key, p.Value.Validated(_cfg, _protos));
+                return new KeyValuePair<int, ICharacterProfile>(p.Key, p.Value.Validated(session, collection));
             }), prefs.SelectedCharacterIndex, prefs.AdminOOCColor);
         }
 
diff --git a/Content.Server/Pulling/PullingSystem.cs b/Content.Server/Pulling/PullingSystem.cs
deleted file mode 100644
index 69bb7c93704..00000000000
--- a/Content.Server/Pulling/PullingSystem.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Shared.Input;
-using Content.Shared.Pulling;
-using Content.Shared.Pulling.Components;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Player;
-
-namespace Content.Server.Pulling
-{
-    [UsedImplicitly]
-    public sealed class PullingSystem : SharedPullingSystem
-    {
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            UpdatesAfter.Add(typeof(PhysicsSystem));
-
-            SubscribeLocalEvent<SharedPullableComponent, PullableMoveMessage>(OnPullableMove);
-            SubscribeLocalEvent<SharedPullableComponent, PullableStopMovingMessage>(OnPullableStopMove);
-
-            CommandBinds.Builder
-                .Bind(ContentKeyFunctions.ReleasePulledObject, InputCmdHandler.FromDelegate(HandleReleasePulledObject))
-                .Register<PullingSystem>();
-        }
-
-        private void HandleReleasePulledObject(ICommonSession? session)
-        {
-            if (session?.AttachedEntity is not {Valid: true} player)
-            {
-                return;
-            }
-
-            if (!TryGetPulled(player, out var pulled))
-            {
-                return;
-            }
-
-            if (!EntityManager.TryGetComponent(pulled.Value, out SharedPullableComponent? pullable))
-            {
-                return;
-            }
-
-            TryStopPull(pullable);
-        }
-    }
-}
diff --git a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
index 53517da6cb4..2500138a238 100644
--- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
+++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
@@ -106,7 +106,7 @@ private void OnHeadsetReceive(EntityUid uid, HeadsetComponent component, ref Rad
         var parent = Transform(uid).ParentUid;
         if (TryComp(parent, out ActorComponent? actor))
         {
-            var canUnderstand = _language.CanUnderstand(parent, args.Language);
+            var canUnderstand = _language.CanUnderstand(parent, args.Language.ID);
             var msg = new MsgChatMessage
             {
                 Message = canUnderstand ? args.OriginalChatMsg : args.LanguageObfuscatedChatMsg
diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs
index 53e0409af06..bba8c4766e6 100644
--- a/Content.Server/Radio/EntitySystems/JammerSystem.cs
+++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs
@@ -56,14 +56,10 @@ private void OnActivate(EntityUid uid, RadioJammerComponent comp, ActivateInWorl
         if (activated)
         {
             EnsureComp<ActiveRadioJammerComponent>(uid);
-            var stationId = _stationSystem.GetOwningStation(uid);
-            if (stationId != null && _singletonServerSystem.TryGetActiveServerAddress<CrewMonitoringServerComponent>(stationId.Value, out var netId))
-            {
-                EnsureComp<DeviceNetworkJammerComponent>(uid, out var jammingComp);
-                jammingComp.Range = comp.Range;
-                jammingComp.JammableNetworks.Add(netId);
-                Dirty(uid, jammingComp);
-            }
+            EnsureComp<DeviceNetworkJammerComponent>(uid, out var jammingComp);
+            jammingComp.Range = comp.Range;
+            jammingComp.JammableNetworks.Add(DeviceNetworkComponent.DeviceNetIdDefaults.Wireless.ToString());
+            Dirty(uid, jammingComp);
         }
         else
         {
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index 14a87ed310a..e4858cd3647 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -73,7 +73,7 @@ private void OnIntrinsicReceive(EntityUid uid, IntrinsicRadioReceiverComponent c
             // Einstein-Engines - languages mechanic
             var listener = component.Owner;
             var msg = args.OriginalChatMsg;
-            if (listener != null && !_language.CanUnderstand(listener, args.Language))
+            if (listener != null && !_language.CanUnderstand(listener, args.Language.ID))
                 msg = args.LanguageObfuscatedChatMsg;
 
             _netMan.ServerSendMessage(new MsgChatMessage { Message = msg}, actor.PlayerSession.Channel);
@@ -128,12 +128,12 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
             ? FormattedMessage.EscapeText(message)
             : message;
 
-        var wrappedMessage = WrapRadioMessage(messageSource, channel, name, content);
+        var wrappedMessage = WrapRadioMessage(messageSource, channel, name, content, language);
         var msg = new ChatMessage(ChatChannel.Radio, content, wrappedMessage, NetEntity.Invalid, null);
 
         // ... you guess it
         var obfuscated = _language.ObfuscateSpeech(content, language);
-        var obfuscatedWrapped = WrapRadioMessage(messageSource, channel, name, obfuscated);
+        var obfuscatedWrapped = WrapRadioMessage(messageSource, channel, name, obfuscated, language);
         var notUdsMsg = new ChatMessage(ChatChannel.Radio, obfuscated, obfuscatedWrapped, NetEntity.Invalid, null);
 
         var ev = new RadioReceiveEvent(messageSource, channel, msg, notUdsMsg, language);
@@ -196,17 +196,18 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
         _messages.Remove(message);
     }
 
-    private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel, string name, string message)
+    private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel, string name, string message, LanguagePrototype language)
     {
         var speech = _chat.GetSpeechVerb(source, message);
         return Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
             ("color", channel.Color),
-            ("fontType", speech.FontId),
-            ("fontSize", speech.FontSize),
+            ("languageColor", language.Color ?? channel.Color),
+            ("fontType", language.FontId ?? speech.FontId),
+            ("fontSize", language.FontSize ?? speech.FontSize),
             ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
             ("channel", $"\\[{channel.LocalizedName}\\]"),
             ("name", name),
-            ("message", FormattedMessage.EscapeText(message)));
+            ("message", message));
     }
 
     /// <inheritdoc cref="TelecomServerComponent"/>
diff --git a/Content.Server/RandomMetadata/RandomMetadataSystem.cs b/Content.Server/RandomMetadata/RandomMetadataSystem.cs
index ebec4d5249f..c088d57fd96 100644
--- a/Content.Server/RandomMetadata/RandomMetadataSystem.cs
+++ b/Content.Server/RandomMetadata/RandomMetadataSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Dataset;
+using Content.Shared.Dataset;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -48,8 +48,8 @@ public string GetRandomFromSegments(List<string> segments, string? separator)
         foreach (var segment in segments)
         {
             outputSegments.Add(_prototype.TryIndex<DatasetPrototype>(segment, out var proto)
-                ? _random.Pick(proto.Values)
-                : segment);
+                ? Loc.GetString(_random.Pick(proto.Values))
+                : Loc.GetString(segment));
         }
         return string.Join(separator, outputSegments);
     }
diff --git a/Content.Server/RatKing/RatKingSystem.cs b/Content.Server/RatKing/RatKingSystem.cs
index f676e89ac3f..4b82dba3359 100644
--- a/Content.Server/RatKing/RatKingSystem.cs
+++ b/Content.Server/RatKing/RatKingSystem.cs
@@ -11,7 +11,6 @@
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Pointing;
 using Content.Shared.RatKing;
-using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 
@@ -26,7 +25,6 @@ public sealed class RatKingSystem : SharedRatKingSystem
         [Dependency] private readonly HungerSystem _hunger = default!;
         [Dependency] private readonly NPCSystem _npc = default!;
         [Dependency] private readonly PopupSystem _popup = default!;
-        [Dependency] private readonly TransformSystem _xform = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Server/Remotes/DoorRemoteComponent.cs b/Content.Server/Remotes/DoorRemoteComponent.cs
deleted file mode 100644
index 91cb7ccad10..00000000000
--- a/Content.Server/Remotes/DoorRemoteComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace Content.Server.Remotes
-{
-    [RegisterComponent]
-    [Access(typeof(DoorRemoteSystem))]
-    public sealed partial class DoorRemoteComponent : Component
-    {
-        public OperatingMode Mode = OperatingMode.OpenClose;
-
-        public enum OperatingMode : byte
-        {
-            OpenClose,
-            ToggleBolts,
-            ToggleEmergencyAccess
-        }
-    }
-}
diff --git a/Content.Server/Remotes/DoorRemoteSystem.cs b/Content.Server/Remotes/DoorRemoteSystem.cs
index d335911901a..e42bc700912 100644
--- a/Content.Server/Remotes/DoorRemoteSystem.cs
+++ b/Content.Server/Remotes/DoorRemoteSystem.cs
@@ -1,74 +1,43 @@
 using Content.Server.Administration.Logs;
-using Robust.Shared.Player;
 using Content.Shared.Interaction;
-using Content.Shared.Popups;
 using Content.Shared.Doors.Components;
-using Content.Shared.Doors.Systems;
-using Content.Shared.Physics;
 using Content.Shared.Access.Components;
 using Content.Server.Doors.Systems;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Database;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Examine;
-using static Content.Server.Remotes.DoorRemoteComponent;
+using Content.Shared.Remotes.EntitySystems;
+using Content.Shared.Remotes.Components;
 
-namespace Content.Server.Remotes
+namespace Content.Shared.Remotes
 {
-    public sealed class DoorRemoteSystem : EntitySystem
+    public sealed class DoorRemoteSystem : SharedDoorRemoteSystem
     {
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly AirlockSystem _airlock = default!;
-        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly DoorSystem _doorSystem = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
         [Dependency] private readonly ExamineSystemShared _examine = default!;
         // I'm so sorry [Dependency] private readonly SharedAirlockSystem _sharedAirlockSystem = default!;
-
+        
         public override void Initialize()
         {
-            SubscribeLocalEvent<DoorRemoteComponent, UseInHandEvent>(OnInHandActivation);
-            SubscribeLocalEvent<DoorRemoteComponent, BeforeRangedInteractEvent>(OnBeforeInteract);
-        }
-
-        public void OnInHandActivation(EntityUid user, DoorRemoteComponent component, UseInHandEvent args)
-        {
-            string switchMessageId;
-            switch (component.Mode)
-            {
-                case OperatingMode.OpenClose:
-                    component.Mode = OperatingMode.ToggleBolts;
-                    switchMessageId = "door-remote-switch-state-toggle-bolts";
-                    break;
+            base.Initialize();
 
-                    // Skip toggle bolts mode and move on from there (to emergency access)
-                case OperatingMode.ToggleBolts:
-                    component.Mode = OperatingMode.ToggleEmergencyAccess;
-                    switchMessageId = "door-remote-switch-state-toggle-emergency-access";
-                    break;
-
-                    // Skip ToggleEmergencyAccess mode and move on from there (to door toggle)
-                case OperatingMode.ToggleEmergencyAccess:
-                    component.Mode = OperatingMode.OpenClose;
-                    switchMessageId = "door-remote-switch-state-open-close";
-                    break;
-                default:
-                    throw new InvalidOperationException(
-                        $"{nameof(DoorRemoteComponent)} had invalid mode {component.Mode}");
-            }
-            ShowPopupToUser(switchMessageId, args.User);
+            SubscribeLocalEvent<DoorRemoteComponent, BeforeRangedInteractEvent>(OnBeforeInteract);
         }
 
-        private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, BeforeRangedInteractEvent args)
+        private void OnBeforeInteract(Entity<DoorRemoteComponent> entity, ref BeforeRangedInteractEvent args)
         {
             bool isAirlock = TryComp<AirlockComponent>(args.Target, out var airlockComp);
 
             if (args.Handled
                 || args.Target == null
                 || !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
-                // Only able to control doors if they are within your vision and within your max range.
-                // Not affected by mobs or machines anymore.
+                                                                          // Only able to control doors if they are within your vision and within your max range.
+                                                                          // Not affected by mobs or machines anymore.
                 || !_examine.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
+
             {
                 return;
             }
@@ -77,7 +46,7 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
 
             if (!this.IsPowered(args.Target.Value, EntityManager))
             {
-                ShowPopupToUser("door-remote-no-power", args.User);
+                Popup.PopupEntity(Loc.GetString("door-remote-no-power"), args.User, args.User);
                 return;
             }
 
@@ -85,11 +54,11 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
                 && !_doorSystem.HasAccess(args.Target.Value, args.Used, doorComp, accessComponent))
             {
                 _doorSystem.Deny(args.Target.Value, doorComp, args.User);
-                ShowPopupToUser("door-remote-denied", args.User);
+                Popup.PopupEntity(Loc.GetString("door-remote-denied"), args.User, args.User);
                 return;
             }
 
-            switch (component.Mode)
+            switch (entity.Comp.Mode)
             {
                 case OperatingMode.OpenClose:
                     if (_doorSystem.TryToggleDoor(args.Target.Value, doorComp, args.Used))
@@ -115,11 +84,8 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
                     break;
                 default:
                     throw new InvalidOperationException(
-                        $"{nameof(DoorRemoteComponent)} had invalid mode {component.Mode}");
+                        $"{nameof(DoorRemoteComponent)} had invalid mode {entity.Comp.Mode}");
             }
         }
-
-        private void ShowPopupToUser(string messageId, EntityUid user) =>
-            _popupSystem.PopupEntity(Loc.GetString(messageId), user, user);
     }
 }
diff --git a/Content.Server/Research/Systems/ResearchStealerSystem.cs b/Content.Server/Research/Systems/ResearchStealerSystem.cs
index 5bab6048de5..d40134f1e9f 100644
--- a/Content.Server/Research/Systems/ResearchStealerSystem.cs
+++ b/Content.Server/Research/Systems/ResearchStealerSystem.cs
@@ -1,11 +1,13 @@
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Systems;
+using Robust.Shared.Random;
 
 namespace Content.Server.Research.Systems;
 
 public sealed class ResearchStealerSystem : SharedResearchStealerSystem
 {
     [Dependency] private readonly SharedResearchSystem _research = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
     {
@@ -24,16 +26,26 @@ private void OnDoAfter(EntityUid uid, ResearchStealerComponent comp, ResearchSte
         if (!TryComp<TechnologyDatabaseComponent>(target, out var database))
             return;
 
-        var ev = new ResearchStolenEvent(uid, target, database.UnlockedTechnologies);
+        var ev = new ResearchStolenEvent(uid, target, new());
+        var count = _random.Next(comp.MinToSteal, comp.MaxToSteal + 1);
+        for (var i = 0; i < count; i++)
+        {
+            if (database.UnlockedTechnologies.Count == 0)
+                break;
+
+            var toRemove = _random.Pick(database.UnlockedTechnologies);
+            if (_research.TryRemoveTechnology((target, database), toRemove))
+                ev.Techs.Add(toRemove);
+        }
         RaiseLocalEvent(uid, ref ev);
-        // oops, no more advanced lasers!
-        _research.ClearTechs(target, database);
+
+        args.Handled = true;
     }
 }
 
 /// <summary>
-/// Event raised on the user when research is stolen from a R&D server.
+/// Event raised on the user when research is stolen from a RND server.
 /// Techs contains every technology id researched.
 /// </summary>
 [ByRefEvent]
-public record struct ResearchStolenEvent(EntityUid Used, EntityUid Target, List<String> Techs);
+public record struct ResearchStolenEvent(EntityUid Used, EntityUid Target, List<string> Techs);
diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs
index 95a470e9093..a992436f07b 100644
--- a/Content.Server/Resist/EscapeInventorySystem.cs
+++ b/Content.Server/Resist/EscapeInventorySystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Popups;
+using Content.Shared.Storage.Components;
 using Content.Shared.Storage;
 using Content.Server.Carrying; // Carrying system from Nyanotrasen.
 using Content.Shared.Inventory;
diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs
index 2822c94093f..2463bcd7402 100644
--- a/Content.Server/Respawn/SpecialRespawnSystem.cs
+++ b/Content.Server/Respawn/SpecialRespawnSystem.cs
@@ -9,13 +9,13 @@
 using Content.Shared.Physics;
 using Content.Shared.Respawn;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
 
 namespace Content.Server.Respawn;
 
 public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IAdminLogManager _adminLog = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
@@ -84,7 +84,7 @@ private void OnTermination(EntityUid uid, SpecialRespawnComponent component, ref
         if (!component.Respawn || !HasComp<StationMemberComponent>(entityGridUid) || entityMapUid == null)
             return;
 
-        if (!_mapManager.TryGetGrid(entityGridUid, out var grid) || MetaData(entityGridUid.Value).EntityLifeStage >= EntityLifeStage.Terminating)
+        if (!TryComp<MapGridComponent>(entityGridUid, out var grid) || MetaData(entityGridUid.Value).EntityLifeStage >= EntityLifeStage.Terminating)
             return;
 
         if (TryFindRandomTile(entityGridUid.Value, entityMapUid.Value, 10, out var coords))
@@ -146,7 +146,7 @@ public bool TryFindRandomTile(EntityUid targetGrid, EntityUid targetMap, int max
     {
         targetCoords = EntityCoordinates.Invalid;
 
-        if (!_mapManager.TryGetGrid(targetGrid, out var grid))
+        if (!TryComp<MapGridComponent>(targetGrid, out var grid))
             return false;
 
         var xform = Transform(targetGrid);
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index eb6eb5a426f..cd64f043a08 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Damage;
 using Content.Shared.Revenant;
 using Robust.Shared.Random;
-using Robust.Shared.Map;
 using Content.Shared.Tag;
 using Content.Server.Storage.Components;
 using Content.Server.Light.Components;
@@ -15,7 +14,6 @@
 using Content.Shared.Bed.Sleep;
 using System.Linq;
 using System.Numerics;
-using Content.Server.Maps;
 using Content.Server.Revenant.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Emag.Systems;
@@ -28,12 +26,12 @@
 using Content.Shared.Revenant.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Utility;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Revenant.EntitySystems;
 
 public sealed partial class RevenantSystem
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly EntityStorageSystem _entityStorage = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
@@ -213,7 +211,7 @@ private void OnDefileAction(EntityUid uid, RevenantComponent component, Revenant
         //var coords = Transform(uid).Coordinates;
         //var gridId = coords.GetGridUid(EntityManager);
         var xform = Transform(uid);
-        if (!_mapManager.TryGetGrid(xform.GridUid, out var map))
+        if (!TryComp<MapGridComponent>(xform.GridUid, out var map))
             return;
         var tiles = map.GetTilesIntersecting(Box2.CenteredAround(xform.WorldPosition,
             new Vector2(component.DefileRadius * 2, component.DefileRadius))).ToArray();
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index b26cc4a320f..86be70c41fe 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -133,6 +133,7 @@ public bool ChangeEssenceAmount(EntityUid uid, FixedPoint2 amount, RevenantCompo
             return false;
 
         component.Essence += amount;
+        Dirty(uid, component);
 
         if (regenCap)
             FixedPoint2.Min(component.Essence, component.EssenceRegenCap);
@@ -140,7 +141,7 @@ public bool ChangeEssenceAmount(EntityUid uid, FixedPoint2 amount, RevenantCompo
         if (TryComp<StoreComponent>(uid, out var store))
             _store.UpdateUserInterface(uid, uid, store);
 
-        _alerts.ShowAlert(uid, AlertType.Essence, (short) Math.Clamp(Math.Round(component.Essence.Float() / 10f), 0, 16));
+        _alerts.ShowAlert(uid, AlertType.Essence);
 
         if (component.Essence <= 0)
         {
diff --git a/Content.Server/Roles/RemoveRoleCommand.cs b/Content.Server/Roles/RemoveRoleCommand.cs
index edb29da624f..feba63a253f 100644
--- a/Content.Server/Roles/RemoveRoleCommand.cs
+++ b/Content.Server/Roles/RemoveRoleCommand.cs
@@ -5,14 +5,12 @@
 using Content.Shared.Roles.Jobs;
 using Robust.Server.Player;
 using Robust.Shared.Console;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.Roles
 {
     [AdminCommand(AdminFlags.Admin)]
     public sealed class RemoveRoleCommand : IConsoleCommand
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
         public string Command => "rmrole";
diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs
index 3a8331f3f7a..d79fe2d2cca 100644
--- a/Content.Server/RoundEnd/RoundEndSystem.cs
+++ b/Content.Server/RoundEnd/RoundEndSystem.cs
@@ -22,6 +22,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Timer = Robust.Shared.Timing.Timer;
+using Content.Server.Announcements.Systems;
 
 namespace Content.Server.RoundEnd
 {
@@ -42,6 +43,7 @@ public sealed class RoundEndSystem : EntitySystem
         [Dependency] private readonly EmergencyShuttleSystem _shuttle = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly StationSystem _stationSystem = default!;
+        [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
         public TimeSpan DefaultCooldownDuration { get; set; } = TimeSpan.FromSeconds(30);
 
@@ -176,15 +178,16 @@ public void RequestRoundEnd(TimeSpan countdownTime, EntityUid? requester = null,
                 units = "eta-units-minutes";
             }
 
-            _chatSystem.DispatchGlobalAnnouncement(Loc.GetString(text,
-                ("time", time),
-                ("units", Loc.GetString(units))),
+            _announcer.SendAnnouncement(_announcer.GetAnnouncementId("ShuttleCalled"),
+                Filter.Broadcast(),
+                text,
                 name,
-                false,
+                Color.Gold,
                 null,
-                Color.Gold);
-
-            _audio.PlayGlobal("/Audio/Announcements/shuttlecalled.ogg", Filter.Broadcast(), true);
+                null,
+                ("time", time),
+                    ("units", Loc.GetString(units))
+            );
 
             LastCountdownStart = _gameTiming.CurTime;
             ExpectedCountdownEnd = _gameTiming.CurTime + countdownTime;
@@ -227,10 +230,13 @@ public void CancelRoundEndCountdown(EntityUid? requester = null, bool checkCoold
                 _adminLogger.Add(LogType.ShuttleRecalled, LogImpact.High, $"Shuttle recalled");
             }
 
-            _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("round-end-system-shuttle-recalled-announcement"),
-                Loc.GetString("Station"), false, colorOverride: Color.Gold);
-
-            _audio.PlayGlobal("/Audio/Announcements/shuttlerecalled.ogg", Filter.Broadcast(), true);
+            _announcer.SendAnnouncement(
+                _announcer.GetAnnouncementId("ShuttleRecalled"),
+                Filter.Broadcast(),
+                "round-end-system-shuttle-recalled-announcement",
+                Loc.GetString("Station"),
+                Color.Gold
+            );
 
             LastCountdownStart = null;
             ExpectedCountdownEnd = null;
@@ -309,9 +315,13 @@ public void DoRoundEndBehavior(RoundEndBehavior behavior,
                     // Check is shuttle called or not. We should only dispatch announcement if it's already called
                     if (IsRoundEndRequested())
                     {
-                        _chatSystem.DispatchGlobalAnnouncement(Loc.GetString(textAnnounce),
+                        _announcer.SendAnnouncement(
+                            _announcer.GetAnnouncementId("ShuttleCalled"),
+                            Filter.Broadcast(),
+                            textAnnounce,
                             Loc.GetString(sender),
-                            colorOverride: Color.Gold);
+                            Color.Gold
+                        );
                     }
                     else
                     {
diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
index f7f3718208e..61636bea7c9 100644
--- a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
+++ b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
@@ -1,10 +1,16 @@
+using Content.Shared.Shuttles.Components;
 using Content.Shared.Procedural;
 using Content.Shared.Salvage.Expeditions;
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Salvage;
 
 public sealed partial class SalvageSystem
 {
+    [ValidatePrototypeId<EntityPrototype>]
+    public const string CoordinatesDisk = "CoordinatesDisk";
+
     private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleComponent component, ClaimSalvageMessage args)
     {
         var station = _station.GetOwningStation(uid);
@@ -15,11 +21,16 @@ private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleCompon
         if (!data.Missions.TryGetValue(args.Index, out var missionparams))
             return;
 
-        SpawnMission(missionparams, station.Value);
+        var cdUid = Spawn(CoordinatesDisk, Transform(uid).Coordinates);
+        SpawnMission(missionparams, station.Value, cdUid);
 
         data.ActiveMission = args.Index;
         var mission = GetMission(_prototypeManager.Index<SalvageDifficultyPrototype>(missionparams.Difficulty), missionparams.Seed);
         data.NextOffer = _timing.CurTime + mission.Duration + TimeSpan.FromSeconds(1);
+
+        _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), missionparams.Seed));
+        _audio.PlayPvs(component.PrintSound, uid);
+
         UpdateConsoles((station.Value, data));
     }
 
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index 7e4a9c9310e..4d5d569dabd 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -8,6 +8,7 @@
 using Robust.Shared.CPUJob.JobQueues;
 using Robust.Shared.CPUJob.JobQueues.Queues;
 using Robust.Shared.GameStates;
+using Robust.Shared.Map;
 
 namespace Content.Server.Salvage;
 
@@ -148,7 +149,7 @@ private SalvageExpeditionConsoleState GetState(SalvageExpeditionDataComponent co
         return new SalvageExpeditionConsoleState(component.NextOffer, component.Claimed, component.Cooldown, component.ActiveMission, missions);
     }
 
-    private void SpawnMission(SalvageMissionParams missionParams, EntityUid station)
+    private void SpawnMission(SalvageMissionParams missionParams, EntityUid station, EntityUid? coordinatesDisk)
     {
         var cancelToken = new CancellationTokenSource();
         var job = new SpawnSalvageMissionJob(
@@ -162,7 +163,10 @@ private void SpawnMission(SalvageMissionParams missionParams, EntityUid station)
             _biome,
             _dungeon,
             _metaData,
+            _transform,
+            _mapSystem,
             station,
+            coordinatesDisk,
             missionParams,
             cancelToken.Token);
 
diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs
index a1a3b686b2f..b558f86e83a 100644
--- a/Content.Server/Salvage/SalvageSystem.cs
+++ b/Content.Server/Salvage/SalvageSystem.cs
@@ -32,6 +32,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Timing;
+using Content.Server.Labels;
 
 namespace Content.Server.Salvage
 {
@@ -39,6 +40,7 @@ public sealed partial class SalvageSystem : SharedSalvageSystem
     {
         [Dependency] private readonly IChatManager _chat = default!;
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+        [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
@@ -48,11 +50,13 @@ public sealed partial class SalvageSystem : SharedSalvageSystem
         [Dependency] private readonly BiomeSystem _biome = default!;
         [Dependency] private readonly DungeonSystem _dungeon = default!;
         [Dependency] private readonly GravitySystem _gravity = default!;
+        [Dependency] private readonly LabelSystem _labelSystem = default!;
         [Dependency] private readonly MapLoaderSystem _map = default!;
         [Dependency] private readonly MetaDataSystem _metaData = default!;
         [Dependency] private readonly RadioSystem _radioSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
+        [Dependency] private readonly SharedMapSystem _mapSystem = default!;
         [Dependency] private readonly ShuttleSystem _shuttle = default!;
         [Dependency] private readonly ShuttleConsoleSystem _shuttleConsoles = default!;
         [Dependency] private readonly StationSystem _station = default!;
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index e2b17b58724..47123e97845 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -33,6 +33,9 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Content.Server.Shuttles.Components;
+using Content.Shared.Coordinates;
+using Content.Shared.Shuttles.Components;
 
 namespace Content.Server.Salvage;
 
@@ -46,8 +49,11 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
     private readonly BiomeSystem _biome;
     private readonly DungeonSystem _dungeon;
     private readonly MetaDataSystem _metaData;
+    private readonly SharedTransformSystem _xforms;
+    private readonly SharedMapSystem _map;
 
     public readonly EntityUid Station;
+    public readonly EntityUid? CoordinatesDisk;
     private readonly SalvageMissionParams _missionParams;
 
     private readonly ISawmill _sawmill;
@@ -63,7 +69,10 @@ public SpawnSalvageMissionJob(
         BiomeSystem biome,
         DungeonSystem dungeon,
         MetaDataSystem metaData,
+        SharedTransformSystem xform,
+        SharedMapSystem map,
         EntityUid station,
+        EntityUid? coordinatesDisk,
         SalvageMissionParams missionParams,
         CancellationToken cancellation = default) : base(maxTime, cancellation)
     {
@@ -75,7 +84,10 @@ public SpawnSalvageMissionJob(
         _biome = biome;
         _dungeon = dungeon;
         _metaData = metaData;
+        _xforms = xform;
+        _map = map;
         Station = station;
+        CoordinatesDisk = coordinatesDisk;
         _missionParams = missionParams;
         _sawmill = logManager.GetSawmill("salvage_job");
 #if !DEBUG
@@ -86,14 +98,24 @@ public SpawnSalvageMissionJob(
     protected override async Task<bool> Process()
     {
         _sawmill.Debug("salvage", $"Spawning salvage mission with seed {_missionParams.Seed}");
-        var mapId = _mapManager.CreateMap();
-        var mapUid = _mapManager.GetMapEntityId(mapId);
-        _mapManager.AddUninitializedMap(mapId);
+        var mapUid = _map.CreateMap(out var mapId, runMapInit: false);
         MetaDataComponent? metadata = null;
         var grid = _entManager.EnsureComponent<MapGridComponent>(mapUid);
         var random = new Random(_missionParams.Seed);
         var destComp = _entManager.AddComponent<FTLDestinationComponent>(mapUid);
         destComp.BeaconsOnly = true;
+        destComp.RequireCoordinateDisk = true;
+        destComp.Enabled = true;
+        _metaData.SetEntityName(mapUid, SharedSalvageSystem.GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), _missionParams.Seed));
+        _entManager.AddComponent<FTLBeaconComponent>(mapUid);
+
+        // Saving the mission mapUid to a CD is made optional, in case one is somehow made in a process without a CD entity
+        if (CoordinatesDisk.HasValue)
+        {
+            var cd = _entManager.EnsureComponent<ShuttleDestinationCoordinatesComponent>(CoordinatesDisk.Value);
+            cd.Destination = mapUid;
+            _entManager.Dirty(CoordinatesDisk.Value, cd);
+        }
 
         // Setup mission configs
         // As we go through the config the rating will deplete so we'll go for most important to least important.
@@ -144,11 +166,6 @@ protected override async Task<bool> Process()
         expedition.EndTime = _timing.CurTime + mission.Duration;
         expedition.MissionParams = _missionParams;
 
-        // Don't want consoles to have the incorrect name until refreshed.
-        var ftlUid = _entManager.CreateEntityUninitialized("FTLPoint", new EntityCoordinates(mapUid, grid.TileSizeHalfVector));
-        _metaData.SetEntityName(ftlUid, SharedSalvageSystem.GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), _missionParams.Seed));
-        _entManager.InitializeAndStartEntity(ftlUid);
-
         var landingPadRadius = 24;
         var minDungeonOffset = landingPadRadius + 4;
 
diff --git a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
index 2ab29d1b2f0..6ce8edd1d84 100644
--- a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
+++ b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
@@ -11,7 +11,6 @@ namespace Content.Server.Sandbox.Commands
     [AnyCommand]
     public sealed class ColorNetworkCommand : IConsoleCommand
     {
-        [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly IEntityManager _entManager = default!;
 
         public string Command => "colornetwork";
diff --git a/Content.Server/Sandbox/SandboxSystem.cs b/Content.Server/Sandbox/SandboxSystem.cs
index b8bf1230902..30fe4e0fe95 100644
--- a/Content.Server/Sandbox/SandboxSystem.cs
+++ b/Content.Server/Sandbox/SandboxSystem.cs
@@ -14,6 +14,7 @@
 using Robust.Server.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Sandbox
 {
@@ -121,7 +122,7 @@ private void SandboxGiveAccessReceived(MsgSandboxGiveAccess message, EntitySessi
 
             var allAccess = PrototypeManager
                 .EnumeratePrototypes<AccessLevelPrototype>()
-                .Select(p => p.ID).ToArray();
+                .Select(p => new ProtoId<AccessLevelPrototype>(p.ID)).ToList();
 
             if (_inventory.TryGetSlotEntity(attached, "id", out var slotEntity))
             {
diff --git a/Content.Server/Screens/Systems/ScreenSystem.cs b/Content.Server/Screens/Systems/ScreenSystem.cs
index 19790f64d5b..782fe38c888 100644
--- a/Content.Server/Screens/Systems/ScreenSystem.cs
+++ b/Content.Server/Screens/Systems/ScreenSystem.cs
@@ -56,6 +56,7 @@ private void ScreenText(EntityUid uid, ScreenComponent component, DeviceNetworkP
             )
         {
             _appearanceSystem.SetData(uid, TextScreenVisuals.DefaultText, text);
+            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, text);
         }
     }
 
diff --git a/Content.Server/Shuttles/Components/EscapePodComponent.cs b/Content.Server/Shuttles/Components/EscapePodComponent.cs
index 72c8024e12b..d717e97441b 100644
--- a/Content.Server/Shuttles/Components/EscapePodComponent.cs
+++ b/Content.Server/Shuttles/Components/EscapePodComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Server.Shuttles.Components;
 [RegisterComponent, Access(typeof(EmergencyShuttleSystem)), AutoGenerateComponentPause]
 public sealed partial class EscapePodComponent : Component
 {
-    [DataField("launchTime", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [DataField(customTypeSerializer:typeof(TimeOffsetSerializer))]
     [AutoPausedField]
     public TimeSpan? LaunchTime;
 }
diff --git a/Content.Server/Shuttles/Components/FTLComponent.cs b/Content.Server/Shuttles/Components/FTLComponent.cs
index 077fe087489..ab40875e29a 100644
--- a/Content.Server/Shuttles/Components/FTLComponent.cs
+++ b/Content.Server/Shuttles/Components/FTLComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Shuttles.Systems;
 using Content.Shared.Tag;
+using Content.Shared.Timing;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
@@ -17,13 +18,13 @@ public sealed partial class FTLComponent : Component
     public FTLState State = FTLState.Available;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    public float StartupTime = 0f;
+    public StartEndTime StateTime;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    public float TravelTime = 0f;
+    public float StartupTime = 0f;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    public float Accumulator = 0f;
+    public float TravelTime = 0f;
 
     /// <summary>
     /// Coordinates to arrive it: May be relative to another grid (for docking) or map coordinates.
diff --git a/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs b/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
index 91cecde0445..03e262cef50 100644
--- a/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
+++ b/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
@@ -14,5 +14,11 @@ public sealed partial class ShuttleConsoleComponent : SharedShuttleConsoleCompon
         /// </summary>
         [DataField("zoom")]
         public Vector2 Zoom = new(1.5f, 1.5f);
+
+        /// <summary>
+        /// Should this console have access to restricted FTL destinations?
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite), DataField("whitelistSpecific")]
+        public List<EntityUid> FTLWhitelist = new List<EntityUid>();
     }
 }
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index f4dd502b375..ae742cf1f9e 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -1,13 +1,10 @@
 using System.Linq;
-using System.Numerics;
 using Content.Server.Administration;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Events;
 using Content.Server.Parallax;
-using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Server.Salvage;
 using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
@@ -22,7 +19,6 @@
 using Content.Shared.Parallax.Biomes;
 using Content.Shared.Salvage;
 using Content.Shared.Shuttles.Components;
-using Robust.Shared.Spawners;
 using Content.Shared.Tiles;
 using Robust.Server.GameObjects;
 using Robust.Shared.Collections;
@@ -51,7 +47,6 @@ public sealed class ArrivalsSystem : EntitySystem
     [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly MapLoaderSystem _loader = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
-    [Dependency] private readonly RestrictedRangeSystem _restricted = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly ShuttleSystem _shuttles = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
index aeb2ebdbba1..3f6eafb454c 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
@@ -209,7 +209,13 @@ private void UpdateEmergencyConsole(float frameTime)
         if (!ShuttlesLeft && _consoleAccumulator <= 0f)
         {
             ShuttlesLeft = true;
-            _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("emergency-shuttle-left", ("transitTime", $"{TransitTime:0}")));
+            _announcer.SendAnnouncement(
+                _announcer.GetAnnouncementId("ShuttleLeft"),
+                Filter.Broadcast(),
+                "emergency-shuttle-left",
+                null, null, null, null,
+                ("transitTime", $"{TransitTime:0}")
+            );
 
             Timer.Spawn((int) (TransitTime * 1000) + _bufferTime.Milliseconds, () => _roundEnd.EndRound(), _roundEndCancelToken?.Token ?? default);
         }
@@ -248,7 +254,13 @@ private void OnEmergencyRepealAll(EntityUid uid, EmergencyShuttleConsoleComponen
             return;
 
         _logger.Add(LogType.EmergencyShuttle, LogImpact.High, $"Emergency shuttle early launch REPEAL ALL by {args.Session:user}");
-        _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("emergency-shuttle-console-auth-revoked", ("remaining", component.AuthorizationsRequired)));
+        _announcer.SendAnnouncement(
+            _announcer.GetAnnouncementId("ShuttleAuthRevoked"),
+            Filter.Broadcast(),
+            "emergency-shuttle-console-auth-revoked",
+            null, null, null, null,
+            ("remaining", component.AuthorizationsRequired)
+        );
         component.AuthorizedEntities.Clear();
         UpdateAllEmergencyConsoles();
     }
@@ -271,7 +283,13 @@ private void OnEmergencyRepeal(EntityUid uid, EmergencyShuttleConsoleComponent c
 
         _logger.Add(LogType.EmergencyShuttle, LogImpact.High, $"Emergency shuttle early launch REPEAL by {args.Session:user}");
         var remaining = component.AuthorizationsRequired - component.AuthorizedEntities.Count;
-        _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("emergency-shuttle-console-auth-revoked", ("remaining", remaining)));
+        _announcer.SendAnnouncement(
+            _announcer.GetAnnouncementId("ShuttleAuthRevoked"),
+            Filter.Broadcast(),
+            "emergency-shuttle-console-auth-revoked",
+            null, null, null, null,
+            ("remaining", remaining)
+        );
         CheckForLaunch(component);
         UpdateAllEmergencyConsoles();
     }
@@ -296,9 +314,14 @@ private void OnEmergencyAuthorize(EntityUid uid, EmergencyShuttleConsoleComponen
         var remaining = component.AuthorizationsRequired - component.AuthorizedEntities.Count;
 
         if (remaining > 0)
-            _chatSystem.DispatchGlobalAnnouncement(
-                Loc.GetString("emergency-shuttle-console-auth-left", ("remaining", remaining)),
-                playSound: false, colorOverride: DangerColor);
+            _announcer.SendAnnouncement(_announcer.GetAnnouncementId("ShuttleAuthAdded"),
+                Filter.Broadcast(),
+                "emergency-shuttle-console-auth-left",
+                null,
+                DangerColor,
+                null, null,
+                ("remaining", remaining)
+            );
 
         if (!CheckForLaunch(component))
             _audio.PlayGlobal("/Audio/Misc/notice1.ogg", Filter.Broadcast(), recordReplay: true);
@@ -399,12 +422,13 @@ private void AnnounceLaunch()
         if (_announced) return;
 
         _announced = true;
-        _chatSystem.DispatchGlobalAnnouncement(
-            Loc.GetString("emergency-shuttle-launch-time", ("consoleAccumulator", $"{_consoleAccumulator:0}")),
-            playSound: false,
-            colorOverride: DangerColor);
-
-        _audio.PlayGlobal("/Audio/Misc/notice1.ogg", Filter.Broadcast(), recordReplay: true);
+        _announcer.SendAnnouncement(
+            _announcer.GetAnnouncementId("ShuttleAlmostLaunching"),
+            Filter.Broadcast(),
+            "emergency-shuttle-launch-time",
+            null, null, null, null,
+            ("consoleAccumulator", $"{_consoleAccumulator:0}")
+        );
     }
 
     public bool DelayEmergencyRoundEnd()
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index f8d995b8a4b..2df0bc148cc 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -8,6 +8,7 @@
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.GameTicking.Events;
+using Content.Server.Pinpointer;
 using Content.Server.Popups;
 using Content.Server.RoundEnd;
 using Content.Server.Screens.Components;
@@ -33,6 +34,8 @@
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+using Content.Server.Announcements.Systems;
 
 namespace Content.Server.Shuttles.Systems;
 
@@ -55,6 +58,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
     [Dependency] private readonly DockingSystem _dock = default!;
     [Dependency] private readonly EntityManager _entityManager = default!;
     [Dependency] private readonly IdCardSystem _idSystem = default!;
+    [Dependency] private readonly NavMapSystem _navMap = default!;
     [Dependency] private readonly MapLoaderSystem _map = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly RoundEndSystem _roundEnd = default!;
@@ -63,6 +67,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly TransformSystem _transformSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     private const float ShuttleSpawnBuffer = 1f;
 
@@ -268,9 +273,8 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo
         if (targetGrid == null)
         {
             _logger.Add(LogType.EmergencyShuttle, LogImpact.High, $"Emergency shuttle {ToPrettyString(stationUid)} unable to dock with station {ToPrettyString(stationUid)}");
-            _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-good-luck"), playDefaultSound: false);
-            // TODO: Need filter extensions or something don't blame me.
-            _audio.PlayGlobal("/Audio/Misc/notice1.ogg", Filter.Broadcast(), true);
+            _announcer.SendAnnouncement(_announcer.GetAnnouncementId("ShuttleGoodLuck"), Filter.Broadcast(),
+                "emergency-shuttle-good-luck", colorOverride: DangerColor);
             return;
         }
 
@@ -281,7 +285,13 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo
             if (TryComp<TransformComponent>(targetGrid.Value, out var targetXform))
             {
                 var angle = _dock.GetAngle(stationShuttle.EmergencyShuttle.Value, xform, targetGrid.Value, targetXform, xformQuery);
-                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-docked", ("time", $"{_consoleAccumulator:0}"), ("direction", angle.GetDir())), playDefaultSound: false);
+                _announcer.SendAnnouncementMessage(
+                    _announcer.GetAnnouncementId("ShuttleDock"),
+                    "emergency-shuttle-docked",
+                    null, null, null, null,
+                    ("time", $"{_consoleAccumulator:0}"),
+                        ("direction", angle.GetDir())
+                );
             }
 
             // shuttle timers
@@ -302,20 +312,20 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo
             }
 
             _logger.Add(LogType.EmergencyShuttle, LogImpact.High, $"Emergency shuttle {ToPrettyString(stationUid)} docked with stations");
-            // TODO: Need filter extensions or something don't blame me.
-            _audio.PlayGlobal("/Audio/Announcements/shuttle_dock.ogg", Filter.Broadcast(), true);
+            _announcer.SendAnnouncementAudio(_announcer.GetAnnouncementId("ShuttleDock"), Filter.Broadcast());
         }
         else
         {
-            if (TryComp<TransformComponent>(targetGrid.Value, out var targetXform))
-            {
-                var angle = _dock.GetAngle(stationShuttle.EmergencyShuttle.Value, xform, targetGrid.Value, targetXform, xformQuery);
-                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-nearby", ("direction", angle.GetDir())), playDefaultSound: false);
-            }
+            var location = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform)));
+            _announcer.SendAnnouncementMessage(
+                    _announcer.GetAnnouncementId("ShuttleNearby"),
+                    "emergency-shuttle-nearby",
+                    null, null, null, null,
+                    ("direction", location)
+                );
 
             _logger.Add(LogType.EmergencyShuttle, LogImpact.High, $"Emergency shuttle {ToPrettyString(stationUid)} unable to find a valid docking port for {ToPrettyString(stationUid)}");
-            // TODO: Need filter extensions or something don't blame me.
-            _audio.PlayGlobal("/Audio/Misc/notice1.ogg", Filter.Broadcast(), true);
+            _announcer.SendAnnouncementAudio(_announcer.GetAnnouncementId("ShuttleNearby"), Filter.Broadcast());
         }
     }
 
@@ -418,7 +428,7 @@ private void AddCentcomm(StationCentcommComponent component)
         }
 
         var mapId = _mapManager.CreateMap();
-        var grid = _map.LoadGrid(mapId, component.Map.ToString(),  new MapLoadOptions()
+        var grid = _map.LoadGrid(mapId, component.Map.ToString(), new MapLoadOptions()
         {
             LoadMap = false,
         });
@@ -492,7 +502,7 @@ private void AddEmergencyShuttle(EntityUid uid, StationEmergencyShuttleComponent
             return;
         }
 
-        centcomm.ShuttleIndex += _mapManager.GetGrid(shuttle.Value).LocalAABB.Width + ShuttleSpawnBuffer;
+        centcomm.ShuttleIndex += Comp<MapGridComponent>(shuttle.Value).LocalAABB.Width + ShuttleSpawnBuffer;
 
         // Update indices for all centcomm comps pointing to same map
         var query = AllEntityQuery<StationCentcommComponent>();
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
index 7606d190a45..c214bb015c9 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
@@ -44,6 +44,10 @@ private void OnBeaconFTLMessage(Entity<ShuttleConsoleComponent> ent, ref Shuttle
         }
 
         var nCoordinates = new NetCoordinates(GetNetEntity(targetXform.ParentUid), targetXform.LocalPosition);
+        if (targetXform.ParentUid == EntityUid.Invalid)
+        {
+            nCoordinates = new NetCoordinates(GetNetEntity(beaconEnt), targetXform.LocalPosition);
+        }
 
         // Check target exists
         if (!_shuttle.CanFTLBeacon(nCoordinates))
@@ -128,7 +132,7 @@ private void ConsoleFTL(Entity<ShuttleConsoleComponent> ent, EntityCoordinates t
         }
 
         // Check shuttle can FTL to this target.
-        if (!_shuttle.CanFTLTo(shuttleUid.Value, targetMap))
+        if (!_shuttle.CanFTLTo(shuttleUid.Value, targetMap, ent))
         {
             return;
         }
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index c47c519d5de..fac74e34c58 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -13,6 +13,7 @@
 using Content.Shared.Tag;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Shuttles.UI.MapObjects;
+using Content.Shared.Timing;
 using Robust.Server.GameObjects;
 using Robust.Shared.Collections;
 using Robust.Shared.GameStates;
@@ -257,7 +258,11 @@ private void UpdateState(EntityUid consoleUid, ref DockingInterfaceState? dockSt
         else
         {
             navState = new NavInterfaceState(0f, null, null, new Dictionary<NetEntity, List<DockingPortState>>());
-            mapState = new ShuttleMapInterfaceState(FTLState.Invalid, 0f, new List<ShuttleBeaconObject>(), new List<ShuttleExclusionObject>());
+            mapState = new ShuttleMapInterfaceState(
+                FTLState.Invalid,
+                default,
+                new List<ShuttleBeaconObject>(),
+                new List<ShuttleExclusionObject>());
         }
 
         if (_ui.TryGetUi(consoleUid, ShuttleConsoleUiKey.Key, out var bui))
@@ -408,12 +413,12 @@ public DockingInterfaceState GetDockState()
     public ShuttleMapInterfaceState GetMapState(Entity<FTLComponent?> shuttle)
     {
         FTLState ftlState = FTLState.Available;
-        float stateDuration = 0f;
+        StartEndTime stateDuration = default;
 
         if (Resolve(shuttle, ref shuttle.Comp, false) && shuttle.Comp.LifeStage < ComponentLifeStage.Stopped)
         {
             ftlState = shuttle.Comp.State;
-            stateDuration = _shuttle.GetStateDuration(shuttle.Comp);
+            stateDuration = _shuttle.GetStateTime(shuttle.Comp);
         }
 
         List<ShuttleBeaconObject>? beacons = null;
@@ -422,7 +427,8 @@ public ShuttleMapInterfaceState GetMapState(Entity<FTLComponent?> shuttle)
         GetExclusions(ref exclusions);
 
         return new ShuttleMapInterfaceState(
-            ftlState, stateDuration,
+            ftlState,
+            stateDuration,
             beacons ?? new List<ShuttleBeaconObject>(),
             exclusions ?? new List<ShuttleExclusionObject>());
     }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index e4e4534b0c5..51288691039 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
 using Content.Shared.StatusEffect;
+using Content.Shared.Timing;
 using Content.Shared.Whitelist;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
@@ -131,7 +132,7 @@ private EntityUid EnsureFTLMap()
         return mapUid;
     }
 
-    public float GetStateDuration(FTLComponent component)
+    public StartEndTime GetStateTime(FTLComponent component)
     {
         var state = component.State;
 
@@ -141,9 +142,9 @@ public float GetStateDuration(FTLComponent component)
             case FTLState.Travelling:
             case FTLState.Arriving:
             case FTLState.Cooldown:
-                return component.Accumulator;
+                return component.StateTime;
             case FTLState.Available:
-                return 0f;
+                return default;
             default:
                 throw new NotImplementedException();
         }
@@ -251,7 +252,9 @@ public void FTLToCoordinates(
 
         hyperspace.StartupTime = startupTime;
         hyperspace.TravelTime = hyperspaceTime;
-        hyperspace.Accumulator = hyperspace.StartupTime;
+        hyperspace.StateTime = StartEndTime.FromStartDuration(
+            _gameTiming.CurTime,
+            TimeSpan.FromSeconds(hyperspace.StartupTime));
         hyperspace.TargetCoordinates = coordinates;
         hyperspace.TargetAngle = angle;
         hyperspace.PriorityTag = priorityTag;
@@ -282,7 +285,9 @@ public void FTLToDock(
         var config = _dockSystem.GetDockingConfig(shuttleUid, target, priorityTag);
         hyperspace.StartupTime = startupTime;
         hyperspace.TravelTime = hyperspaceTime;
-        hyperspace.Accumulator = hyperspace.StartupTime;
+        hyperspace.StateTime = StartEndTime.FromStartDuration(
+            _gameTiming.CurTime,
+            TimeSpan.FromSeconds(hyperspace.StartupTime));
         hyperspace.PriorityTag = priorityTag;
 
         _console.RefreshShuttleConsoles(shuttleUid);
@@ -366,7 +371,7 @@ private void UpdateFTLStarting(Entity<FTLComponent, ShuttleComponent> entity)
         // Reset rotation so they always face the same direction.
         xform.LocalRotation = Angle.Zero;
         _index += width + Buffer;
-        comp.Accumulator += comp.TravelTime - DefaultArrivalTime;
+        comp.StateTime = StartEndTime.FromCurTime(_gameTiming, comp.TravelTime - DefaultArrivalTime);
 
         Enable(uid, component: body);
         _physics.SetLinearVelocity(uid, new Vector2(0f, 20f), body: body);
@@ -401,7 +406,7 @@ private void UpdateFTLTravelling(Entity<FTLComponent, ShuttleComponent> entity)
     {
         var shuttle = entity.Comp2;
         var comp = entity.Comp1;
-        comp.Accumulator += DefaultArrivalTime;
+        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.
@@ -504,7 +509,7 @@ private void UpdateFTLArriving(Entity<FTLComponent, ShuttleComponent> entity)
         }
 
         comp.State = FTLState.Cooldown;
-        comp.Accumulator += FTLCooldown;
+        comp.StateTime = StartEndTime.FromCurTime(_gameTiming, FTLCooldown);
         _console.RefreshShuttleConsoles(uid);
         _mapManager.SetMapPaused(mapId, false);
         Smimsh(uid, xform: xform);
@@ -519,15 +524,14 @@ private void UpdateFTLCooldown(Entity<FTLComponent, ShuttleComponent> entity)
         _console.RefreshShuttleConsoles(entity);
     }
 
-    private void UpdateHyperspace(float frameTime)
+    private void UpdateHyperspace()
     {
+        var curTime = _gameTiming.CurTime;
         var query = EntityQueryEnumerator<FTLComponent, ShuttleComponent>();
 
         while (query.MoveNext(out var uid, out var comp, out var shuttle))
         {
-            comp.Accumulator -= frameTime;
-
-            if (comp.Accumulator > 0f)
+            if (curTime < comp.StateTime.End)
                 continue;
 
             var entity = (uid, comp, shuttle);
@@ -559,7 +563,7 @@ private void UpdateHyperspace(float frameTime)
 
     private float GetSoundRange(EntityUid uid)
     {
-        if (!_mapManager.TryGetGrid(uid, out var grid))
+        if (!TryComp<MapGridComponent>(uid, out var grid))
             return 4f;
 
         return MathF.Max(grid.LocalAABB.Width, grid.LocalAABB.Height) + 12.5f;
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 7c42753a7de..6dc25e8d766 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -19,6 +19,7 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Shuttles.Systems;
 
@@ -30,6 +31,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private readonly IMapManager _mapManager = 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!;
@@ -68,7 +70,7 @@ public override void Initialize()
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
-        UpdateHyperspace(frameTime);
+        UpdateHyperspace();
     }
 
     private void OnGridFixtureChange(EntityUid uid, FixturesComponent manager, GridFixtureChangeEvent args)
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index 1baffd4690e..be55cd9a62a 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -1,6 +1,5 @@
 using System.Numerics;
 using Content.Server.Audio;
-using Content.Server.Construction;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Shuttles.Components;
@@ -12,6 +11,7 @@
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Temperature;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Collision.Shapes;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -24,7 +24,6 @@ namespace Content.Server.Shuttles.Systems;
 public sealed class ThrusterSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
     [Dependency] private readonly AmbientSoundSystem _ambient = default!;
     [Dependency] private readonly FixtureSystem _fixtureSystem = default!;
@@ -95,7 +94,7 @@ private void OnShuttleTileChange(EntityUid uid, ShuttleComponent component, ref
             return;
 
         var tilePos = args.NewTile.GridIndices;
-        var grid = _mapManager.GetGrid(uid);
+        var grid = Comp<MapGridComponent>(uid);
         var xformQuery = GetEntityQuery<TransformComponent>();
         var thrusterQuery = GetEntityQuery<ThrusterComponent>();
 
@@ -265,6 +264,11 @@ public void EnableThruster(EntityUid uid, ThrusterComponent component, Transform
             return;
         }
 
+        if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower))
+        {
+            apcPower.NeedsPower = true;
+        }
+
         component.IsOn = true;
 
         if (!EntityManager.TryGetComponent(xform.GridUid, out ShuttleComponent? shuttleComponent))
@@ -367,6 +371,11 @@ public void DisableThruster(EntityUid uid, ThrusterComponent component, EntityUi
         if (!EntityManager.TryGetComponent(gridId, out ShuttleComponent? shuttleComponent))
             return;
 
+        if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower))
+        {
+            apcPower.NeedsPower = false;
+        }
+
         // Logger.DebugS("thruster", $"Disabled thruster {uid}");
 
         switch (component.Type)
@@ -436,7 +445,7 @@ private bool NozzleExposed(TransformComponent xform)
             return true;
 
         var (x, y) = xform.LocalPosition + xform.LocalRotation.Opposite().ToWorldVec();
-        var tile = _mapManager.GetGrid(xform.GridUid.Value).GetTileRef(new Vector2i((int) Math.Floor(x), (int) Math.Floor(y)));
+        var tile = Comp<MapGridComponent>(xform.GridUid.Value).GetTileRef(new Vector2i((int) Math.Floor(x), (int) Math.Floor(y)));
 
         return tile.Tile.IsSpace();
     }
diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
index 4584a9e88b5..010682bc0d3 100644
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -19,7 +19,6 @@
 using Content.Shared.Stunnable;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
-using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Toolshed;
@@ -38,7 +37,6 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
     [Dependency] private readonly SharedStunSystem _stunSystem = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly SharedRoleSystem _roles = default!;
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index 7784db015d3..c74a3c49d63 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -232,7 +232,7 @@ public void ConsumeEntitiesInContainer(EntityUid hungry, BaseContainer container
     /// </summary>
     public void ConsumeTile(EntityUid hungry, TileRef tile, EventHorizonComponent eventHorizon)
     {
-        ConsumeTiles(hungry, new List<(Vector2i, Tile)>(new[] { (tile.GridIndices, Tile.Empty) }), tile.GridUid, _mapMan.GetGrid(tile.GridUid), eventHorizon);
+        ConsumeTiles(hungry, new List<(Vector2i, Tile)>(new[] { (tile.GridIndices, Tile.Empty) }), tile.GridUid, Comp<MapGridComponent>(tile.GridUid), eventHorizon);
     }
 
     /// <summary>
@@ -240,7 +240,7 @@ public void ConsumeTile(EntityUid hungry, TileRef tile, EventHorizonComponent ev
     /// </summary>
     public void AttemptConsumeTile(EntityUid hungry, TileRef tile, EventHorizonComponent eventHorizon)
     {
-        AttemptConsumeTiles(hungry, new TileRef[1] { tile }, tile.GridUid, _mapMan.GetGrid(tile.GridUid), eventHorizon);
+        AttemptConsumeTiles(hungry, new TileRef[1] { tile }, tile.GridUid, Comp<MapGridComponent>(tile.GridUid), eventHorizon);
     }
 
     /// <summary>
diff --git a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
index 92b963e2017..b26ab301c64 100644
--- a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
@@ -24,7 +24,6 @@ public sealed class RadiationCollectorSystem : EntitySystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
     [Dependency] private readonly UseDelaySystem _useDelay = default!;
-    [Dependency] private readonly BatterySystem _batterySystem = default!;
 
     private const string GasTankContainer = "gas_tank";
 
diff --git a/Content.Server/Sound/Components/SpamEmitSoundComponent.cs b/Content.Server/Sound/Components/SpamEmitSoundComponent.cs
deleted file mode 100644
index d17bbb9e8f6..00000000000
--- a/Content.Server/Sound/Components/SpamEmitSoundComponent.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.Sound.Components;
-
-namespace Content.Server.Sound.Components
-{
-    /// <summary>
-    /// Rolls to play a sound every few seconds.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class SpamEmitSoundComponent : BaseEmitSoundComponent
-    {
-        [DataField("accumulator")]
-        public float Accumulator = 0f;
-
-        [DataField("rollInterval")]
-        public float RollInterval = 2f;
-
-        [DataField("playChance")]
-        public float PlayChance = 0.5f;
-
-        // Always Pvs.
-        [DataField("popUp")]
-        public string? PopUp;
-
-        [DataField("enabled")]
-        public bool Enabled = true;
-    }
-}
diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs
index 059800c3f9d..fc10d951e76 100644
--- a/Content.Server/Sound/EmitSoundSystem.cs
+++ b/Content.Server/Sound/EmitSoundSystem.cs
@@ -2,12 +2,17 @@
 using Content.Server.Sound.Components;
 using Content.Shared.UserInterface;
 using Content.Shared.Sound;
-using Robust.Shared.Random;
+using Content.Shared.Sound.Components;
+using Robust.Shared.Timing;
+using Robust.Shared.Network;
 
 namespace Content.Server.Sound;
 
 public sealed class EmitSoundSystem : SharedEmitSoundSystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly INetManager _net = default!;
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -18,18 +23,13 @@ public override void Update(float frameTime)
             if (!soundSpammer.Enabled)
                 continue;
 
-            soundSpammer.Accumulator += frameTime;
-            if (soundSpammer.Accumulator < soundSpammer.RollInterval)
-            {
-                continue;
-            }
-            soundSpammer.Accumulator -= soundSpammer.RollInterval;
-
-            if (Random.Prob(soundSpammer.PlayChance))
+            if (_timing.CurTime >= soundSpammer.NextSound)
             {
                 if (soundSpammer.PopUp != null)
                     Popup.PopupEntity(Loc.GetString(soundSpammer.PopUp), uid);
                 TryEmitSound(uid, soundSpammer, predict: false);
+
+                SpamEmitSoundReset((uid, soundSpammer));
             }
         }
     }
@@ -40,6 +40,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<EmitSoundOnTriggerComponent, TriggerEvent>(HandleEmitSoundOnTrigger);
         SubscribeLocalEvent<EmitSoundOnUIOpenComponent, AfterActivatableUIOpenEvent>(HandleEmitSoundOnUIOpen);
+        SubscribeLocalEvent<SpamEmitSoundComponent, MapInitEvent>(HandleSpamEmitSoundMapInit);
     }
 
     private void HandleEmitSoundOnUIOpen(EntityUid uid, EmitSoundOnUIOpenComponent component, AfterActivatableUIOpenEvent args)
@@ -52,4 +53,39 @@ private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent
         TryEmitSound(uid, component, args.User, false);
         args.Handled = true;
     }
+
+    private void HandleSpamEmitSoundMapInit(Entity<SpamEmitSoundComponent> entity, ref MapInitEvent args)
+    {
+        SpamEmitSoundReset(entity);
+
+        // Prewarm so multiple entities have more variation.
+        entity.Comp.NextSound -= Random.Next(entity.Comp.MaxInterval);
+        Dirty(entity);
+    }
+
+    private void SpamEmitSoundReset(Entity<SpamEmitSoundComponent> entity)
+    {
+        if (_net.IsClient)
+            return;
+
+        entity.Comp.NextSound = _timing.CurTime + ((entity.Comp.MinInterval < entity.Comp.MaxInterval)
+            ? Random.Next(entity.Comp.MinInterval, entity.Comp.MaxInterval)
+            : entity.Comp.MaxInterval);
+
+        Dirty(entity);
+    }
+
+    public override void SetEnabled(Entity<SpamEmitSoundComponent?> entity, bool enabled)
+    {
+        if (!Resolve(entity, ref entity.Comp, false))
+            return;
+
+        if (entity.Comp.Enabled == enabled)
+            return;
+
+        entity.Comp.Enabled = enabled;
+
+        if (enabled)
+            SpamEmitSoundReset((entity, entity.Comp));
+    }
 }
diff --git a/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs b/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs
new file mode 100644
index 00000000000..9cc85060c6e
--- /dev/null
+++ b/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs
@@ -0,0 +1,33 @@
+using Content.Server.Power.Components;
+using Content.Server.Power.EntitySystems;
+using Content.Shared.Sound;
+using Content.Shared.Sound.Components;
+
+namespace Content.Server.Sound;
+
+public sealed partial class SpamEmitSoundRequirePowerSystem : SharedSpamEmitSoundRequirePowerSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SpamEmitSoundRequirePowerComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<SpamEmitSoundRequirePowerComponent, PowerNetBatterySupplyEvent>(OnPowerSupply);
+    }
+
+    private void OnPowerChanged(Entity<SpamEmitSoundRequirePowerComponent> entity, ref PowerChangedEvent args)
+    {
+        if (TryComp<SpamEmitSoundComponent>(entity.Owner, out var comp))
+        {
+            EmitSound.SetEnabled((entity, comp), args.Powered);
+        }
+    }
+
+    private void OnPowerSupply(Entity<SpamEmitSoundRequirePowerComponent> entity, ref PowerNetBatterySupplyEvent args)
+    {
+        if (TryComp<SpamEmitSoundComponent>(entity.Owner, out var comp))
+        {
+            EmitSound.SetEnabled((entity, comp), args.Supply);
+        }
+    }
+}
diff --git a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
index abbfd37c6a2..b60afbc88ba 100644
--- a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
@@ -1,40 +1,54 @@
 using System.Threading;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
-namespace Content.Server.Spawners.Components
+namespace Content.Server.Spawners.Components;
+
+/// <summary>
+/// Spawns entities at a set interval.
+/// Can configure the set of entities, spawn timing, spawn chance,
+/// and min/max number of entities to spawn.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TimedSpawnerComponent : Component, ISerializationHooks
 {
-    [RegisterComponent]
-    public sealed partial class TimedSpawnerComponent : Component, ISerializationHooks
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("prototypes", customTypeSerializer:typeof(PrototypeIdListSerializer<EntityPrototype>))]
-        public List<string> Prototypes { get; set; } = new();
+    /// <summary>
+    /// List of entities that can be spawned by this component. One will be randomly
+    /// chosen for each entity spawned. When multiple entities are spawned at once,
+    /// each will be randomly chosen separately.
+    /// </summary>
+    [DataField]
+    public List<EntProtoId> Prototypes = [];
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("chance")]
-        public float Chance { get; set; } = 1.0f;
+    /// <summary>
+    /// Chance of an entity being spawned at the end of each interval.
+    /// </summary>
+    [DataField]
+    public float Chance = 1.0f;
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("intervalSeconds")]
-        public int IntervalSeconds { get; set; } = 60;
+    /// <summary>
+    /// Length of the interval between spawn attempts.
+    /// </summary>
+    [DataField]
+    public int IntervalSeconds = 60;
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("MinimumEntitiesSpawned")]
-        public int MinimumEntitiesSpawned { get; set; } = 1;
+    /// <summary>
+    /// The minimum number of entities that can be spawned when an interval elapses.
+    /// </summary>
+    [DataField]
+    public int MinimumEntitiesSpawned = 1;
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("MaximumEntitiesSpawned")]
-        public int MaximumEntitiesSpawned { get; set; } = 1;
+    /// <summary>
+    /// The maximum number of entities that can be spawned when an interval elapses.
+    /// </summary>
+    [DataField]
+    public int MaximumEntitiesSpawned = 1;
 
-        public CancellationTokenSource? TokenSource;
+    public CancellationTokenSource? TokenSource;
 
-        void ISerializationHooks.AfterDeserialization()
-        {
-            if (MinimumEntitiesSpawned > MaximumEntitiesSpawned)
-                throw new ArgumentException("MaximumEntitiesSpawned can't be lower than MinimumEntitiesSpawned!");
-        }
+    void ISerializationHooks.AfterDeserialization()
+    {
+        if (MinimumEntitiesSpawned > MaximumEntitiesSpawned)
+            throw new ArgumentException("MaximumEntitiesSpawned can't be lower than MinimumEntitiesSpawned!");
     }
 }
diff --git a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
index 65877d4e5de..66cde5bb754 100644
--- a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
@@ -69,7 +69,7 @@ private void OnPlayerSpawning(PlayerSpawningEvent args)
             // TODO: Refactor gameticker spawning code so we don't have to do this!
             var points2 = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
 
-            if (points2.MoveNext(out var uid, out var spawnPoint, out var xform))
+            if (points2.MoveNext(out _, out var xform))
             {
                 possiblePositions.Add(xform.Coordinates);
             }
diff --git a/Content.Server/Species/Systems/NymphSystem.cs b/Content.Server/Species/Systems/NymphSystem.cs
index b7751afbf18..d491b957bfb 100644
--- a/Content.Server/Species/Systems/NymphSystem.cs
+++ b/Content.Server/Species/Systems/NymphSystem.cs
@@ -19,10 +19,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<NymphComponent, RemovedFromPartInBodyEvent>(OnRemovedFromPart);
+        SubscribeLocalEvent<NymphComponent, OrganRemovedFromBodyEvent>(OnRemovedFromPart);
     }
 
-    private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, RemovedFromPartInBodyEvent args)
+    private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, ref OrganRemovedFromBodyEvent args)
     {
         if (!_timing.IsFirstTimePredicted)
             return;
diff --git a/Content.Server/Speech/Components/SouthernAccentComponent.cs b/Content.Server/Speech/Components/SouthernAccentComponent.cs
new file mode 100644
index 00000000000..0c44290086f
--- /dev/null
+++ b/Content.Server/Speech/Components/SouthernAccentComponent.cs
@@ -0,0 +1,8 @@
+using Content.Server.Speech.EntitySystems;
+
+namespace Content.Server.Speech.Components;
+
+[RegisterComponent]
+[Access(typeof(SouthernAccentSystem))]
+public sealed partial class SouthernAccentComponent : Component
+{ }
diff --git a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
new file mode 100644
index 00000000000..4d401367cca
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
@@ -0,0 +1,28 @@
+using System.Text.RegularExpressions;
+using Content.Server.Speech.Components;
+
+namespace Content.Server.Speech.EntitySystems;
+
+public sealed class SouthernAccentSystem : EntitySystem
+{
+    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+    
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SouthernAccentComponent, AccentGetEvent>(OnAccent);
+    }
+
+    private void OnAccent(EntityUid uid, SouthernAccentComponent component, AccentGetEvent args)
+    {
+        var message = args.Message;
+
+        message = _replacement.ApplyReplacements(message, "southern");
+
+        //They shoulda started runnin' an' hidin' from me!
+        message = Regex.Replace(message, @"ing\b", "in'");
+        message = Regex.Replace(message, @"\band\b", "an'");
+        message = Regex.Replace(message, "d've", "da");
+        args.Message = message;
+    }
+};
diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs
index 5b2f3298a2b..fe14d86aa1d 100644
--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -18,7 +18,6 @@ namespace Content.Server.Spreader;
 /// </summary>
 public sealed class SpreaderSystem : EntitySystem
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
@@ -232,10 +231,9 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
         // Add the normal neighbors.
         for (var i = 0; i < 4; i++)
         {
-            var direction = (Direction) (i * 2);
-            var atmosDir = direction.ToAtmosDirection();
-            var neighborPos = SharedMapSystem.GetDirection(tile, direction);
-            neighborTiles.Add((comp.GridUid.Value, grid, neighborPos, atmosDir, atmosDir.GetOpposite()));
+            var atmosDir = (AtmosDirection) (1 << i);
+            var neighborPos = tile.Offset(atmosDir);
+            neighborTiles.Add((comp.GridUid.Value, grid, neighborPos, atmosDir, i.ToOppositeDir()));
         }
 
         foreach (var (neighborEnt, neighborGrid, neighborPos, ourAtmosDir, otherAtmosDir) in neighborTiles)
diff --git a/Content.Server/Standing/LayingDownComponent.cs b/Content.Server/Standing/LayingDownComponent.cs
new file mode 100644
index 00000000000..7921749f148
--- /dev/null
+++ b/Content.Server/Standing/LayingDownComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Server.Standing;
+
+[RegisterComponent]
+public sealed partial class LayingDownComponent : Component
+{
+    [DataField]
+    public float DownedSpeedMultiplier = 0.15f;
+
+    [DataField]
+    public TimeSpan Cooldown = TimeSpan.FromSeconds(2.5f);
+
+    [DataField]
+    public TimeSpan NextToggleAttempt = TimeSpan.Zero;
+}
diff --git a/Content.Server/Standing/LayingDownSystem.cs b/Content.Server/Standing/LayingDownSystem.cs
new file mode 100644
index 00000000000..69787ae8308
--- /dev/null
+++ b/Content.Server/Standing/LayingDownSystem.cs
@@ -0,0 +1,101 @@
+using Content.Shared.ActionBlocker;
+using Content.Shared.Input;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Standing;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Standing;
+
+/// <remarks>Unfortunately cannot be shared because some standing conditions are server-side only</remarks>
+public sealed class LayingDownSystem : EntitySystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
+    [Dependency] private readonly SharedPopupSystem _popups = default!;
+    [Dependency] private readonly Shared.Standing.StandingStateSystem _standing = default!; // WHY IS THERE TWO DIFFERENT STANDING SYSTEMS?!
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+
+    public override void Initialize()
+    {
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.ToggleStanding, InputCmdHandler.FromDelegate(ToggleStanding, handle: false, outsidePrediction: false))
+            .Register<LayingDownSystem>();
+
+        SubscribeLocalEvent<LayingDownComponent, StoodEvent>(DoRefreshMovementSpeed);
+        SubscribeLocalEvent<LayingDownComponent, DownedEvent>(DoRefreshMovementSpeed);
+        SubscribeLocalEvent<LayingDownComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeed);
+        SubscribeLocalEvent<LayingDownComponent, EntParentChangedMessage>(OnParentChanged);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        CommandBinds.Unregister<LayingDownSystem>();
+    }
+
+    private void DoRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, object args)
+    {
+        _movement.RefreshMovementSpeedModifiers(uid);
+    }
+
+    private void OnRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, RefreshMovementSpeedModifiersEvent args)
+    {
+        if (TryComp<StandingStateComponent>(uid, out var standingState) && standingState.Standing)
+            return;
+
+        args.ModifySpeed(component.DownedSpeedMultiplier, component.DownedSpeedMultiplier);
+    }
+
+    private void OnParentChanged(EntityUid uid, LayingDownComponent component, EntParentChangedMessage args)
+    {
+        // If the entity is not on a grid, try to make it stand up to avoid issues
+        if (!TryComp<StandingStateComponent>(uid, out var standingState)
+            || standingState.Standing
+            || Transform(uid).GridUid != null)
+            return;
+
+        _standing.Stand(uid, standingState);
+    }
+
+    private void ToggleStanding(ICommonSession? session)
+    {
+        if (session is not { AttachedEntity: { Valid: true } uid } playerSession
+            || !Exists(uid)
+            || !TryComp<StandingStateComponent>(uid, out var standingState)
+            || !TryComp<LayingDownComponent>(uid, out var layingDown))
+            return;
+
+        // If successful, show popup to self and others. Otherwise, only to self.
+        if (ToggleStandingImpl(uid, standingState, layingDown, out var popupBranch))
+        {
+            _popups.PopupEntity(Loc.GetString($"laying-comp-{popupBranch}-other", ("entity", uid)), uid, Filter.PvsExcept(uid), true);
+            layingDown.NextToggleAttempt = _timing.CurTime + layingDown.Cooldown;
+        }
+
+        _popups.PopupEntity(Loc.GetString($"laying-comp-{popupBranch}-self", ("entity", uid)), uid, uid);
+    }
+
+    private bool ToggleStandingImpl(EntityUid uid, StandingStateComponent standingState, LayingDownComponent layingDown, out string popupBranch)
+    {
+        var success = layingDown.NextToggleAttempt <= _timing.CurTime;
+
+        if (_standing.IsDown(uid, standingState))
+        {
+            success = success && _standing.Stand(uid, standingState, force: false);
+            popupBranch = success ? "stand-success" : "stand-fail";
+        }
+        else
+        {
+            success = success && Transform(uid).GridUid != null; // Do not allow laying down when not on a surface.
+            success = success && _standing.Down(uid, standingState: standingState, playSound: true, dropHeldItems: false);
+            popupBranch = success ? "lay-success" : "lay-fail";
+        }
+
+        return success;
+    }
+}
diff --git a/Content.Server/Station/Components/StationRandomTransformComponent.cs b/Content.Server/Station/Components/StationRandomTransformComponent.cs
new file mode 100644
index 00000000000..ea0fc5f2696
--- /dev/null
+++ b/Content.Server/Station/Components/StationRandomTransformComponent.cs
@@ -0,0 +1,16 @@
+using Content.Server.Station.Systems;
+
+namespace Content.Server.Station.Components;
+
+/// <summary>
+/// Stores station parameters that can be randomized by the roundstart
+/// </summary>
+[RegisterComponent, Access(typeof(StationSystem))]
+public sealed partial class StationRandomTransformComponent : Component
+{
+    [DataField]
+    public float? MaxStationOffset = 100.0f;
+
+    [DataField]
+    public bool EnableStationRotation = true;
+}
diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs
index a3b7a573545..debac8902e2 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.cs
@@ -25,7 +25,6 @@ public sealed partial class StationJobsSystem : EntitySystem
     [Dependency] private readonly IConfigurationManager _configurationManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly GameTicker _gameTicker = default!;
-    [Dependency] private readonly StationSystem _stationSystem = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
 
     /// <inheritdoc/>
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index b7b7192f40e..7ec9a9d7981 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -89,7 +89,7 @@ public override void Initialize()
 
         if (station != null && profile != null)
         {
-            /// Try to call the character's preferred spawner first.
+            // Try to call the character's preferred spawner first.
             if (_spawnerCallbacks.TryGetValue(profile.SpawnPriority, out var preferredSpawner))
             {
                 preferredSpawner(ev);
@@ -104,7 +104,7 @@ public override void Initialize()
             }
             else
             {
-                /// Call all of them in the typical order.
+                // Call all of them in the typical order.
                 foreach (var typicalSpawner in _spawnerCallbacks.Values)
                     typicalSpawner(ev);
             }
@@ -137,7 +137,7 @@ public EntityUid SpawnPlayerMob(
         EntityUid? station,
         EntityUid? entity = null)
     {
-        _prototypeManager.TryIndex(job?.Prototype ?? string.Empty, out JobPrototype? prototype);
+        _prototypeManager.TryIndex(job?.Prototype ?? string.Empty, out var prototype);
 
         // If we're not spawning a humanoid, we're gonna exit early without doing all the humanoid stuff.
         if (prototype?.JobEntity != null)
@@ -158,13 +158,9 @@ public EntityUid SpawnPlayerMob(
             speciesId = weights.Pick(_random);
         }
         else if (profile != null)
-        {
             speciesId = profile.Species;
-        }
         else
-        {
             speciesId = SharedHumanoidAppearanceSystem.DefaultSpecies;
-        }
 
         if (!_prototypeManager.TryIndex<SpeciesPrototype>(speciesId, out var species))
             throw new ArgumentException($"Invalid species prototype was used: {speciesId}");
@@ -172,9 +168,7 @@ public EntityUid SpawnPlayerMob(
         entity ??= Spawn(species.Prototype, coordinates);
 
         if (_randomizeCharacters)
-        {
             profile = HumanoidCharacterProfile.RandomWithSpecies(speciesId);
-        }
 
         if (prototype?.StartingGear != null)
         {
diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs
index b9ff8a4339d..408b3ebc555 100644
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -1,9 +1,10 @@
 using System.Linq;
+using System.Numerics;
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
-using Content.Shared.CCVar;
+using Content.Shared.Fax;
 using Content.Shared.Station;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
@@ -29,7 +30,6 @@ public sealed class StationSystem : EntitySystem
 {
     [Dependency] private readonly IConfigurationManager _configurationManager = default!;
     [Dependency] private readonly ILogManager _logManager = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ChatSystem _chatSystem = default!;
@@ -50,17 +50,12 @@ public override void Initialize()
         _sawmill = _logManager.GetSawmill("station");
 
         SubscribeLocalEvent<GameRunLevelChangedEvent>(OnRoundEnd);
-        SubscribeLocalEvent<PreGameMapLoad>(OnPreGameMapLoad);
         SubscribeLocalEvent<PostGameMapLoad>(OnPostGameMapLoad);
         SubscribeLocalEvent<StationDataComponent, ComponentStartup>(OnStationAdd);
         SubscribeLocalEvent<StationDataComponent, ComponentShutdown>(OnStationDeleted);
         SubscribeLocalEvent<StationMemberComponent, ComponentShutdown>(OnStationGridDeleted);
         SubscribeLocalEvent<StationMemberComponent, PostGridSplitEvent>(OnStationSplitEvent);
 
-        Subs.CVar(_configurationManager, CCVars.StationOffset, x => _randomStationOffset = x, true);
-        Subs.CVar(_configurationManager, CCVars.MaxStationOffset, x => _maxRandomStationOffset = x, true);
-        Subs.CVar(_configurationManager, CCVars.StationRotation, x => _randomStationRotation = x, true);
-
         _player.PlayerStatusChanged += OnPlayerStatusChanged;
     }
 
@@ -113,19 +108,6 @@ private void OnStationDeleted(EntityUid uid, StationDataComponent component, Com
         RaiseNetworkEvent(new StationsUpdatedEvent(GetStationNames()), Filter.Broadcast());
     }
 
-    private void OnPreGameMapLoad(PreGameMapLoad ev)
-    {
-        // this is only for maps loaded during round setup!
-        if (_gameTicker.RunLevel == GameRunLevel.InRound)
-            return;
-
-        if (_randomStationOffset)
-            ev.Options.Offset += _random.NextVector2(_maxRandomStationOffset);
-
-        if (_randomStationRotation)
-            ev.Options.Rotation = _random.NextAngle();
-    }
-
     private void OnPostGameMapLoad(PostGameMapLoad ev)
     {
         var dict = new Dictionary<string, List<EntityUid>>();
@@ -312,6 +294,8 @@ public EntityUid InitializeNewStation(StationConfig stationConfig, IEnumerable<E
         // Use overrides for setup.
         var station = EntityManager.SpawnEntity(stationConfig.StationPrototype, MapCoordinates.Nullspace, stationConfig.StationComponentOverrides);
 
+
+
         if (name is not null)
             RenameStation(station, name, false);
 
@@ -320,11 +304,48 @@ public EntityUid InitializeNewStation(StationConfig stationConfig, IEnumerable<E
         var data = Comp<StationDataComponent>(station);
         name ??= MetaData(station).EntityName;
 
-        foreach (var grid in gridIds ?? Array.Empty<EntityUid>())
+        var entry = gridIds ?? Array.Empty<EntityUid>();
+
+        foreach (var grid in entry)
         {
             AddGridToStation(station, grid, null, data, name);
         }
 
+        if (TryComp<StationRandomTransformComponent>(station, out var random))
+        {
+            Angle? rotation = null;
+            Vector2? offset = null;
+
+            if (random.MaxStationOffset != null)
+                offset = _random.NextVector2(-random.MaxStationOffset.Value, random.MaxStationOffset.Value);
+
+            if (random.EnableStationRotation)
+                rotation = _random.NextAngle();
+
+            foreach (var grid in entry)
+            {
+                //planetary maps give an error when trying to change from position or rotation.
+                //This is still the case, but it will be irrelevant after the https://github.com/space-wizards/space-station-14/pull/26510
+                if (rotation != null && offset != null)
+                {
+                    var pos = _transform.GetWorldPosition(grid);
+                    _transform.SetWorldPositionRotation(grid, pos + offset.Value, rotation.Value);
+                    continue;
+                }
+                if (rotation != null)
+                {
+                    _transform.SetWorldRotation(grid, rotation.Value);
+                    continue;
+                }
+                if (offset != null)
+                {
+                    var pos = _transform.GetWorldPosition(grid);
+                    _transform.SetWorldPosition(grid, pos + offset.Value);
+                    continue;
+                }
+            }
+        }
+
         var ev = new StationPostInitEvent((station, data));
         RaiseLocalEvent(station, ref ev, true);
 
diff --git a/Content.Server/StationEvents/Components/RampingStationEventSchedulerComponent.cs b/Content.Server/StationEvents/Components/RampingStationEventSchedulerComponent.cs
index 53bc8b62a43..282ee5b612a 100644
--- a/Content.Server/StationEvents/Components/RampingStationEventSchedulerComponent.cs
+++ b/Content.Server/StationEvents/Components/RampingStationEventSchedulerComponent.cs
@@ -3,6 +3,30 @@
 [RegisterComponent, Access(typeof(RampingStationEventSchedulerSystem))]
 public sealed partial class RampingStationEventSchedulerComponent : Component
 {
+    /// <summary>
+    ///     The maximum number by which the event rate will be multiplied when shift time reaches the end time.
+    /// </summary>
+    [DataField]
+    public float ChaosModifier = 3f;
+
+    /// <summary>
+    ///     The minimum number by which the event rate will be multiplied when the shift has just begun.
+    /// </summary>
+    [DataField]
+    public float StartingChaosRatio = 0.1f;
+
+    /// <summary>
+    ///     The number by which all event delays will be multiplied. Unlike chaos, remains constant throughout the shift.
+    /// </summary>
+    [DataField]
+    public float EventDelayModifier = 1f;
+
+    /// <summary>
+    ///     The number by which average expected shift length is multiplied. Higher values lead to slower chaos growth.
+    /// </summary>
+    public float ShiftLengthModifier = 1f;
+
+    // Everything below is overridden in the RampingStationEventSchedulerSystem based on CVars
     [DataField("endTime"), ViewVariables(VVAccess.ReadWrite)]
     public float EndTime;
 
diff --git a/Content.Server/StationEvents/Components/StationEventComponent.cs b/Content.Server/StationEvents/Components/StationEventComponent.cs
index b4456a4b5b7..980034aa7b7 100644
--- a/Content.Server/StationEvents/Components/StationEventComponent.cs
+++ b/Content.Server/StationEvents/Components/StationEventComponent.cs
@@ -19,16 +19,10 @@ public sealed partial class StationEventComponent : Component
     public float Weight = WeightNormal;
 
     [DataField("startAnnouncement")]
-    public string? StartAnnouncement;
+    public bool StartAnnouncement;
 
     [DataField("endAnnouncement")]
-    public string? EndAnnouncement;
-
-    [DataField("startAudio")]
-    public SoundSpecifier? StartAudio;
-
-    [DataField("endAudio")]
-    public SoundSpecifier? EndAudio;
+    public bool EndAnnouncement;
 
     /// <summary>
     ///     In minutes, when is the first round time this event can start
diff --git a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
index 48a3b900c44..4cd94d3e719 100644
--- a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
+++ b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
@@ -2,20 +2,29 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Server.Announcements.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events;
 
 public sealed class AnomalySpawnRule : StationEventSystem<AnomalySpawnRuleComponent>
 {
     [Dependency] private readonly AnomalySystem _anomaly = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     protected override void Added(EntityUid uid, AnomalySpawnRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
         base.Added(uid, component, gameRule, args);
 
-        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"));
+        _announcer.SendAnnouncement(
+            _announcer.GetAnnouncementId(args.RuleId),
+            Filter.Broadcast(),
+            "anomaly-spawn-event-announcement",
+            null,
+            Color.FromHex("#18abf5"),
+            null, null,
+            ("sighting", Loc.GetString($"anomaly-spawn-sighting-{RobustRandom.Next(1, 6)}"))
+        );
     }
 
     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 0eed77f1543..b25c1d6561c 100644
--- a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
+++ b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
@@ -1,18 +1,28 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Robust.Shared.Random;
+using Content.Server.Announcements.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events;
 
 public sealed class BluespaceArtifactRule : StationEventSystem<BluespaceArtifactRuleComponent>
 {
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
+
     protected override void Added(EntityUid uid, BluespaceArtifactRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
         base.Added(uid, component, gameRule, args);
 
-        var str = Loc.GetString("bluespace-artifact-event-announcement",
-            ("sighting", Loc.GetString(RobustRandom.Pick(component.PossibleSighting))));
-        ChatSystem.DispatchGlobalAnnouncement(str, colorOverride: Color.FromHex("#18abf5"));
+        _announcer.SendAnnouncement(
+            _announcer.GetAnnouncementId(args.RuleId),
+            Filter.Broadcast(),
+            "bluespace-artifact-event-announcement",
+            null,
+            Color.FromHex("#18abf5"),
+            null, null,
+            ("sighting", Loc.GetString(RobustRandom.Pick(component.PossibleSighting)))
+        );
     }
 
     protected override void Started(EntityUid uid, BluespaceArtifactRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/BreakerFlipRule.cs b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
index 494779fe350..e7574f27ad5 100644
--- a/Content.Server/StationEvents/Events/BreakerFlipRule.cs
+++ b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
@@ -4,6 +4,8 @@
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using JetBrains.Annotations;
+using Content.Server.Announcements.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -11,13 +13,21 @@ namespace Content.Server.StationEvents.Events;
 public sealed class BreakerFlipRule : StationEventSystem<BreakerFlipRuleComponent>
 {
     [Dependency] private readonly ApcSystem _apcSystem = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     protected override void Added(EntityUid uid, BreakerFlipRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
         base.Added(uid, component, gameRule, args);
 
-        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);
+        _announcer.SendAnnouncement(
+            _announcer.GetAnnouncementId(args.RuleId),
+            Filter.Broadcast(),
+            "station-event-breaker-flip-announcement",
+            null,
+            Color.Gold,
+            null, null,
+            ("data", Loc.GetString($"random-sentience-event-data-{RobustRandom.Next(1, 6)}"))
+        );
     }
 
     protected override void Started(EntityUid uid, BreakerFlipRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/CargoGiftsRule.cs b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
index c174cc48c09..80af23c6fa4 100644
--- a/Content.Server/StationEvents/Events/CargoGiftsRule.cs
+++ b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
@@ -6,6 +6,8 @@
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Robust.Shared.Prototypes;
+using Content.Server.Announcements.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -14,14 +16,23 @@ public sealed class CargoGiftsRule : StationEventSystem<CargoGiftsRuleComponent>
     [Dependency] private readonly CargoSystem _cargoSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly GameTicker _ticker = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     protected override void Added(EntityUid uid, CargoGiftsRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
         base.Added(uid, component, gameRule, args);
 
-        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"));
+        _announcer.SendAnnouncement(
+            _announcer.GetAnnouncementId(args.RuleId),
+            Filter.Broadcast(),
+            component.Announce,
+            null,
+            Color.FromHex("#18abf5"),
+            null, null,
+            ("sender", Loc.GetString(component.Sender)),
+                ("description", Loc.GetString(component.Description)),
+                ("dest", Loc.GetString(component.Dest))
+        );
     }
 
     /// <summary>
diff --git a/Content.Server/StationEvents/Events/FalseAlarmRule.cs b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
index 05e9435b40a..cd434a721b1 100644
--- a/Content.Server/StationEvents/Events/FalseAlarmRule.cs
+++ b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
@@ -4,6 +4,7 @@
 using JetBrains.Annotations;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
+using Content.Server.Announcements.Systems;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -11,18 +12,26 @@ namespace Content.Server.StationEvents.Events;
 public sealed class FalseAlarmRule : StationEventSystem<FalseAlarmRuleComponent>
 {
     [Dependency] private readonly EventManagerSystem _event = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     protected override void Started(EntityUid uid, FalseAlarmRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         base.Started(uid, component, gameRule, args);
 
-        var allEv = _event.AllEvents().Select(p => p.Value).ToList();
+        var allEv = _event.AllEvents()
+            .Where(p => p.Value.StartAnnouncement)
+            .Select(p => p.Key).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);
+        _announcer.SendAnnouncement(
+            _announcer.GetAnnouncementId(picked.ID),
+            Filter.Broadcast(),
+            _announcer.GetEventLocaleString(_announcer.GetAnnouncementId(picked.ID)),
+            null,
+            Color.Gold,
+            null, null,
+            //TODO This isn't a good solution, but I can't think of something better
+            ("data", Loc.GetString($"random-sentience-event-data-{RobustRandom.Next(1, 6)}"))
+        );
     }
 }
diff --git a/Content.Server/StationEvents/Events/IonStormRule.cs b/Content.Server/StationEvents/Events/IonStormRule.cs
index e73c9a18131..cd3cd63ae86 100644
--- a/Content.Server/StationEvents/Events/IonStormRule.cs
+++ b/Content.Server/StationEvents/Events/IonStormRule.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Silicons.Laws;
 using Content.Server.Station.Components;
@@ -143,6 +144,24 @@ protected override void Started(EntityUid uid, IonStormRuleComponent comp, GameR
                 });
             }
 
+            // sets all unobfuscated laws' indentifier in order from highest to lowest priority
+            // This could technically override the Obfuscation from the code above, but it seems unlikely enough to basically never happen
+            int orderDeduction = -1;
+
+            for (int i = 0; i < laws.Laws.Count; i++)
+            {
+                string notNullIdentifier = laws.Laws[i].LawIdentifierOverride ?? (i - orderDeduction).ToString();
+
+                if (notNullIdentifier.Any(char.IsSymbol))
+                {
+                    orderDeduction += 1;
+                }
+                else
+                {
+                    laws.Laws[i].LawIdentifierOverride = (i - orderDeduction).ToString();
+                }
+            }
+
             _adminLogger.Add(LogType.Mind, LogImpact.High, $"{ToPrettyString(ent):silicon} had its laws changed by an ion storm to {laws.LoggingString()}");
 
             // laws unique to this silicon, dont use station laws anymore
diff --git a/Content.Server/StationEvents/Events/NinjaSpawnRule.cs b/Content.Server/StationEvents/Events/NinjaSpawnRule.cs
index c60f3298e74..8ad5c8602e3 100644
--- a/Content.Server/StationEvents/Events/NinjaSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/NinjaSpawnRule.cs
@@ -2,10 +2,8 @@
 using Content.Server.Ninja.Systems;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -14,7 +12,6 @@ namespace Content.Server.StationEvents.Events;
 /// </summary>
 public sealed class NinjaSpawnRule : StationEventSystem<NinjaSpawnRuleComponent>
 {
-    [Dependency] private readonly SpaceNinjaSystem _ninja = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     protected override void Started(EntityUid uid, NinjaSpawnRuleComponent comp, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
index 5503438df8a..97e89484612 100644
--- a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
+++ b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
@@ -54,13 +54,6 @@ protected override void Ended(EntityUid uid, PowerGridCheckRuleComponent compone
                 }
             }
 
-            // Can't use the default EndAudio
-            component.AnnounceCancelToken?.Cancel();
-            component.AnnounceCancelToken = new CancellationTokenSource();
-            Timer.Spawn(3000, () =>
-            {
-                Audio.PlayGlobal("/Audio/Announcements/power_on.ogg", Filter.Broadcast(), true, AudioParams.Default.WithVolume(-4f));
-            }, component.AnnounceCancelToken.Token);
             component.Unpowered.Clear();
         }
 
diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
index 4b7606d01f9..f667ad79750 100644
--- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs
+++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
@@ -2,11 +2,15 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.StationEvents.Components;
+using Content.Server.Announcements.Systems;
+using Content.Server.Station.Components;
 
 namespace Content.Server.StationEvents.Events;
 
 public sealed class RandomSentienceRule : StationEventSystem<RandomSentienceRuleComponent>
 {
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
+
     protected override void Started(EntityUid uid, RandomSentienceRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         HashSet<EntityUid> stationsToNotify = new();
@@ -53,14 +57,16 @@ protected override void Started(EntityUid uid, RandomSentienceRuleComponent comp
         }
         foreach (var station in stationsToNotify)
         {
-            ChatSystem.DispatchStationAnnouncement(
-                station,
-                Loc.GetString("station-event-random-sentience-announcement",
-                    ("kind1", kind1), ("kind2", kind2), ("kind3", kind3), ("amount", groupList.Count),
+            _announcer.SendAnnouncement(
+                _announcer.GetAnnouncementId(args.RuleId),
+                StationSystem.GetInStation(EntityManager.GetComponent<StationDataComponent>(station)),
+                "station-event-random-sentience-announcement",
+                null,
+                Color.Gold,
+                null, null,
+                ("kind1", kind1), ("kind2", kind2), ("kind3", kind3), ("amount", groupList.Count),
                     ("data", Loc.GetString($"random-sentience-event-data-{RobustRandom.Next(1, 6)}")),
-                    ("strength", Loc.GetString($"random-sentience-event-strength-{RobustRandom.Next(1, 8)}"))),
-                playDefaultSound: false,
-                colorOverride: Color.Gold
+                    ("strength", Loc.GetString($"random-sentience-event-strength-{RobustRandom.Next(1, 8)}"))
             );
         }
     }
diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs
index 7f05f8940d9..6de8024bd0a 100644
--- a/Content.Server/StationEvents/Events/StationEventSystem.cs
+++ b/Content.Server/StationEvents/Events/StationEventSystem.cs
@@ -9,6 +9,9 @@
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Content.Server.Announcements.Systems;
+using Robust.Shared.Player;
+using Content.Server.Station.Components;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -23,6 +26,7 @@ public abstract class StationEventSystem<T> : GameRuleSystem<T> where T : ICompo
     [Dependency] protected readonly ChatSystem ChatSystem = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] protected readonly StationSystem StationSystem = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!;
 
     protected ISawmill Sawmill = default!;
 
@@ -43,12 +47,6 @@ protected override void Added(EntityUid uid, T component, GameRuleComponent game
 
         AdminLogManager.Add(LogType.EventAnnounced, $"Event added / announced: {ToPrettyString(uid)}");
 
-        if (stationEvent.StartAnnouncement != null)
-        {
-            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.StartAnnouncement), playSound: false, colorOverride: Color.Gold);
-        }
-
-        Audio.PlayGlobal(stationEvent.StartAudio, Filter.Broadcast(), true);
         stationEvent.StartTime = Timing.CurTime + stationEvent.StartDelay;
     }
 
@@ -62,6 +60,16 @@ protected override void Started(EntityUid uid, T component, GameRuleComponent ga
 
         AdminLogManager.Add(LogType.EventStarted, LogImpact.High, $"Event started: {ToPrettyString(uid)}");
 
+        if (stationEvent.StartAnnouncement)
+        {
+            _announcer.SendAnnouncement(
+                _announcer.GetAnnouncementId(args.RuleId),
+                Filter.Broadcast(),
+                _announcer.GetEventLocaleString(_announcer.GetAnnouncementId(args.RuleId)),
+                colorOverride: Color.Gold
+            );
+        }
+
         if (stationEvent.Duration != null)
         {
             var duration = stationEvent.MaxDuration == null
@@ -82,12 +90,14 @@ protected override void Ended(EntityUid uid, T component, GameRuleComponent game
 
         AdminLogManager.Add(LogType.EventStopped, $"Event ended: {ToPrettyString(uid)}");
 
-        if (stationEvent.EndAnnouncement != null)
+        if (stationEvent.EndAnnouncement)
         {
-            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.EndAnnouncement), playSound: false, colorOverride: Color.Gold);
+            _announcer.SendAnnouncement(
+                _announcer.GetAnnouncementId(args.RuleId, true),
+                Filter.Broadcast(),
+                _announcer.GetEventLocaleString(_announcer.GetAnnouncementId(args.RuleId, true)),
+                colorOverride: Color.Gold);
         }
-
-        Audio.PlayGlobal(stationEvent.EndAudio, Filter.Broadcast(), true);
     }
 
     /// <summary>
diff --git a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
index 53a98e8b762..aa0c9b214b4 100644
--- a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
@@ -29,15 +29,15 @@ protected override void Started(EntityUid uid, RampingStationEventSchedulerCompo
     {
         base.Started(uid, component, gameRule, args);
 
-        var avgChaos = _cfg.GetCVar(CCVars.EventsRampingAverageChaos);
-        var avgTime = _cfg.GetCVar(CCVars.EventsRampingAverageEndTime);
+        var avgChaos = _cfg.GetCVar(CCVars.EventsRampingAverageChaos) * component.ChaosModifier;
+        var avgTime = _cfg.GetCVar(CCVars.EventsRampingAverageEndTime) * component.ShiftLengthModifier;
 
         // Worlds shittiest probability distribution
         // Got a complaint? Send them to
-        component.MaxChaos = _random.NextFloat(avgChaos - avgChaos / 4, avgChaos + avgChaos / 4);
+        component.MaxChaos = avgChaos * _random.NextFloat(0.75f, 1.25f);
         // This is in minutes, so *60 for seconds (for the chaos calc)
-        component.EndTime = _random.NextFloat(avgTime - avgTime / 4, avgTime + avgTime / 4) * 60f;
-        component.StartingChaos = component.MaxChaos / 10;
+        component.EndTime = avgTime * _random.NextFloat(0.75f, 1.25f) * 60f;
+        component.StartingChaos = component.MaxChaos * component.StartingChaosRatio;
 
         PickNextEventTime(uid, component);
     }
@@ -68,9 +68,10 @@ public override void Update(float frameTime)
 
     private void PickNextEventTime(EntityUid uid, RampingStationEventSchedulerComponent component)
     {
-        var mod = GetChaosModifier(uid, component);
+        component.TimeUntilNextEvent = _random.NextFloat(
+            _cfg.GetCVar(CCVars.GameEventsRampingMinimumTime),
+            _cfg.GetCVar(CCVars.GameEventsRampingMaximumTime));
 
-        component.TimeUntilNextEvent = _random.NextFloat(_cfg.GetCVar(CCVars.GameEventsRampingMinimumTime) / mod,
-            _cfg.GetCVar(CCVars.GameEventsRampingMaximumTime)) / mod;
+        component.TimeUntilNextEvent *= component.EventDelayModifier / GetChaosModifier(uid, component);
     }
 }
diff --git a/Content.Server/Storage/Components/SecretStashComponent.cs b/Content.Server/Storage/Components/SecretStashComponent.cs
deleted file mode 100644
index a63cb074ad2..00000000000
--- a/Content.Server/Storage/Components/SecretStashComponent.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Server.Storage.EntitySystems;
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Item;
-using Content.Shared.Toilet;
-using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.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.
-    /// </summary>
-    [RegisterComponent]
-    [Access(typeof(SecretStashSystem))]
-    public sealed partial class SecretStashComponent : Component
-    {
-        /// <summary>
-        ///     Max item size that can be fitted into secret stash.
-        /// </summary>
-        [DataField("maxItemSize")]
-        public ProtoId<ItemSizePrototype> MaxItemSize = "Small";
-
-        /// <summary>
-        ///     IC secret stash name. For example "the toilet cistern".
-        ///     If empty string, will replace it with entity name in init.
-        /// </summary>
-        [DataField("secretPartName", readOnly: true)]
-        public string SecretPartName { get; set; } = "";
-
-        /// <summary>
-        ///     Container used to keep secret stash item.
-        /// </summary>
-        [ViewVariables]
-        public ContainerSlot ItemContainer = default!;
-
-    }
-}
diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
index 356768769bb..838311c1aac 100644
--- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Resist;
 using Content.Server.Station.Components;
 using Content.Server.Storage.Components;
+using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Coordinates;
 using Content.Shared.DoAfter;
@@ -14,6 +15,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Storage.EntitySystems;
 
@@ -138,7 +140,7 @@ private bool ValidLink(EntityUid locker, EntityUid link, BluespaceLockerComponen
     }
 
     /// <returns>True if any HashSet in <paramref name="a"/> would grant access to <paramref name="b"/></returns>
-    private bool AccessMatch(IReadOnlyCollection<HashSet<string>>? a, IReadOnlyCollection<HashSet<string>>? b)
+    private bool AccessMatch(IReadOnlyCollection<HashSet<ProtoId<AccessLevelPrototype>>>? a, IReadOnlyCollection<HashSet<ProtoId<AccessLevelPrototype>>>? b)
     {
         if ((a == null || a.Count == 0) && (b == null || b.Count == 0))
             return true;
diff --git a/Content.Server/Storage/EntitySystems/SecretStashSystem.cs b/Content.Server/Storage/EntitySystems/SecretStashSystem.cs
deleted file mode 100644
index 49be0a2f880..00000000000
--- a/Content.Server/Storage/EntitySystems/SecretStashSystem.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using Content.Server.Popups;
-using Content.Server.Storage.Components;
-using Content.Shared.Destructible;
-using Content.Shared.Hands.Components;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Item;
-using Robust.Shared.Containers;
-
-namespace Content.Server.Storage.EntitySystems
-{
-    public sealed class SecretStashSystem : EntitySystem
-    {
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
-        [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-        [Dependency] private readonly SharedItemSystem _item = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<SecretStashComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<SecretStashComponent, DestructionEventArgs>(OnDestroyed);
-        }
-
-        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);
-        }
-
-        /// <summary>
-        ///     Is there something inside secret stash item container?
-        /// </summary>
-        public bool HasItemInside(EntityUid uid, SecretStashComponent? component = null)
-        {
-            if (!Resolve(uid, ref component))
-                return false;
-            return component.ItemContainer.ContainedEntity != null;
-        }
-
-        /// <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.PopupEntity(msg, uid, userUid);
-                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.PopupEntity(msg, uid, userUid);
-                return false;
-            }
-
-            // try to move item from hands to stash container
-            if (!_handsSystem.TryDropIntoContainer(userUid, itemToHideUid, container))
-            {
-                return false;
-            }
-
-            // all done, show success message
-            var successMsg = Loc.GetString("comp-secret-stash-action-hide-success",
-                ("item", itemToHideUid), ("this", GetSecretPartName(uid, component)));
-            _popupSystem.PopupEntity(successMsg, uid, userUid);
-            return true;
-        }
-
-        /// <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;
-            }
-
-            _handsSystem.PickupOrDrop(userUid, container.ContainedEntity.Value, handsComp: hands);
-
-            // show success message
-            var successMsg = Loc.GetString("comp-secret-stash-action-get-item-found-something",
-                ("stash", GetSecretPartName(uid, component)));
-            _popupSystem.PopupEntity(successMsg, uid, userUid);
-
-            return true;
-        }
-
-        private string GetSecretPartName(EntityUid uid, SecretStashComponent stash)
-        {
-            if (stash.SecretPartName != "")
-                return Loc.GetString(stash.SecretPartName);
-
-            var entityName = Loc.GetString("comp-secret-stash-secret-part-name", ("this", uid));
-
-            return entityName;
-        }
-    }
-}
diff --git a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
index 0b4b13d6e4b..c49bfdec931 100644
--- a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
+++ b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
@@ -80,6 +80,11 @@ private void OnUseInHand(EntityUid uid, SpawnItemsOnUseComponent component, UseI
                 _adminLogger.Add(LogType.EntitySpawn, LogImpact.Low, $"{ToPrettyString(args.User)} used {ToPrettyString(uid)} which spawned {ToPrettyString(entityToPlaceInHands.Value)}");
             }
 
+            if (component.Sound != null)
+            {
+                _audio.PlayPvs(component.Sound, uid);
+            }
+
             component.Uses--;
 
             // Delete entity only if component was successfully used
@@ -92,7 +97,6 @@ private void OnUseInHand(EntityUid uid, SpawnItemsOnUseComponent component, UseI
             if (entityToPlaceInHands != null)
             {
                 _hands.PickupOrDrop(args.User, entityToPlaceInHands.Value);
-                _audio.PlayPvs(component.Sound, entityToPlaceInHands.Value);
             }
         }
     }
diff --git a/Content.Server/Store/Components/StoreComponent.cs b/Content.Server/Store/Components/StoreComponent.cs
index 063e25fbf9f..0b7dbbea094 100644
--- a/Content.Server/Store/Components/StoreComponent.cs
+++ b/Content.Server/Store/Components/StoreComponent.cs
@@ -78,6 +78,13 @@ public sealed partial class StoreComponent : Component
     [ViewVariables, DataField]
     public bool RefundAllowed;
 
+    /// <summary>
+    ///     Checks if store can be opened by the account owner only.
+    ///     Not meant to be used with uplinks.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public bool OwnerOnly;
+
     /// <summary>
     ///     The map the store was originally from, used to block refunds if the map is changed
     /// </summary>
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 49db980451e..25f64ba4b64 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -5,7 +5,6 @@
 using Content.Server.Stack;
 using Content.Server.Store.Components;
 using Content.Shared.Actions;
-using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands.EntitySystems;
@@ -15,6 +14,7 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Store.Systems;
 
@@ -29,6 +29,7 @@ public sealed partial class StoreSystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     private void InitializeUi()
     {
@@ -97,13 +98,13 @@ public void UpdateUserInterface(EntityUid? user, EntityUid store, StoreComponent
         }
 
         //dictionary for all currencies, including 0 values for currencies on the whitelist
-        Dictionary<string, FixedPoint2> allCurrency = new();
+        Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> allCurrency = new();
         foreach (var supported in component.CurrencyWhitelist)
         {
             allCurrency.Add(supported, FixedPoint2.Zero);
 
-            if (component.Balance.ContainsKey(supported))
-                allCurrency[supported] = component.Balance[supported];
+            if (component.Balance.TryGetValue(supported, out var value))
+                allCurrency[supported] = value;
         }
 
         // TODO: if multiple users are supposed to be able to interact with a single BUI & see different
@@ -259,7 +260,7 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
 
         //log dat shit.
         _admin.Add(LogType.StorePurchase, LogImpact.Low,
-            $"{ToPrettyString(buyer):player} purchased listing \"{Loc.GetString(listing.Name)}\" from {ToPrettyString(uid)}");
+            $"{ToPrettyString(buyer):player} purchased listing \"{ListingLocalisationHelpers.GetLocalisedNameOrEntityName(listing, _prototypeManager)}\" from {ToPrettyString(uid)}");
 
         listing.PurchaseAmount++; //track how many times something has been purchased
         _audio.PlayEntity(component.BuySuccessSound, msg.Session, uid); //cha-ching!
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index 41da71acbff..72aeb29d195 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -10,6 +10,7 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 using System.Linq;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Store.Systems;
 
@@ -26,6 +27,7 @@ public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<StoreComponent, ActivatableUIOpenAttemptEvent>(OnStoreOpenAttempt);
         SubscribeLocalEvent<CurrencyComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<StoreComponent, BeforeActivatableUIOpenEvent>(BeforeActivatableUiOpen);
 
@@ -65,6 +67,21 @@ private void OnShutdown(EntityUid uid, StoreComponent component, ComponentShutdo
         RaiseLocalEvent(uid, ref ev, true);
     }
 
+    private void OnStoreOpenAttempt(EntityUid uid, StoreComponent component, ActivatableUIOpenAttemptEvent args)
+    {
+        if (!component.OwnerOnly)
+            return;
+
+        component.AccountOwner ??= args.User;
+        DebugTools.Assert(component.AccountOwner != null);
+
+        if (component.AccountOwner == args.User)
+            return;
+
+        _popup.PopupEntity(Loc.GetString("store-not-account-owner", ("store", uid)), uid, args.User);
+        args.Cancel();
+    }
+
     private void OnAfterInteract(EntityUid uid, CurrencyComponent component, AfterInteractEvent args)
     {
         if (args.Handled || !args.CanReach)
diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index 3b38b65a19d..d9f084252ae 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Ensnaring;
 using Content.Shared.CombatMode;
@@ -20,7 +21,6 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
-using System.Linq;
 
 namespace Content.Server.Strip
 {
@@ -36,6 +36,7 @@ public sealed class StrippableSystem : SharedStrippableSystem
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
 
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly ThievingSystem _thieving = default!;
 
         // TODO: ECS popups. Not all of these have ECS equivalents yet.
 
@@ -111,7 +112,7 @@ public override void StartOpeningStripper(EntityUid user, Entity<StrippableCompo
             if (TryComp<CombatModeComponent>(user, out var mode) && mode.IsInCombatMode && !openInCombat)
                 return;
 
-            if (TryComp<ActorComponent>(user, out var actor))
+            if (TryComp<ActorComponent>(user, out var actor) && HasComp<StrippingComponent>(user))
             {
                 if (_userInterfaceSystem.SessionHasOpenUi(strippable, StrippingUiKey.Key, actor.PlayerSession))
                     return;
@@ -251,15 +252,17 @@ private void StartStripInsertInventory(
 
             var (time, stealth) = GetStripTimeModifiers(user, target, slotDef.StripTime);
 
-            if (!stealth)
-                _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-insert", ("user", Identity.Entity(user, EntityManager)), ("item", user.Comp.ActiveHandEntity!.Value)), target, target, PopupType.Large);
+            bool hidden = stealth == ThievingStealth.Hidden;
+
+            if (!hidden)
+                StripPopup("strippable-component-alert-owner-insert", stealth, target, user: Identity.Entity(user, EntityManager), item: user.Comp.ActiveHandEntity!.Value);
 
-            var prefix = stealth ? "stealthily " : "";
+            var prefix = hidden ? "stealthily " : "";
             _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
 
             var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(true, true, slot), user, target, held)
             {
-                Hidden = stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
@@ -340,20 +343,22 @@ private void StartStripRemoveInventory(
 
             var (time, stealth) = GetStripTimeModifiers(user, target, slotDef.StripTime);
 
-            if (!stealth)
+            bool hidden = stealth == ThievingStealth.Hidden;
+
+            if (!hidden)
             {
                 if (slotDef.StripHidden)
-                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-hidden", ("slot", slot)), target, target, PopupType.Large);
+                    StripPopup("strippable-component-alert-owner-hidden", stealth, target, slot: slot);
                 else
-                    _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", item)), target, target, PopupType.Large);
+                    StripPopup("strippable-component-alert-owner", stealth, target, user: Identity.Entity(user, EntityManager), item: item);
             }
 
-            var prefix = stealth ? "stealthily " : "";
+            var prefix = hidden ? "stealthily " : "";
             _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
 
             var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(false, true, slot), user, target, item)
             {
-                Hidden = stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
@@ -374,7 +379,7 @@ private void StripRemoveInventory(
             EntityUid target,
             EntityUid item,
             string slot,
-            bool stealth)
+            bool hidden)
         {
             if (!CanStripRemoveInventory(user, target, item, slot))
                 return;
@@ -384,7 +389,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: hidden, animate: hidden);
             _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
         }
 
@@ -446,12 +451,14 @@ private void StartStripInsertHand(
 
             var (time, stealth) = GetStripTimeModifiers(user, target, targetStrippable.HandStripDelay);
 
-            var prefix = stealth ? "stealthily " : "";
+            bool hidden = stealth == ThievingStealth.Hidden;
+
+            var prefix = hidden ? "stealthily " : "";
             _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
 
             var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(true, false, handName), user, target, held)
             {
-                Hidden = stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
@@ -471,7 +478,7 @@ private void StripInsertHand(
             Entity<HandsComponent?> target,
             EntityUid held,
             string handName,
-            bool stealth)
+            bool hidden)
         {
             if (!Resolve(user, ref user.Comp) ||
                 !Resolve(target, ref target.Comp))
@@ -481,7 +488,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: hidden, animate: hidden, 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.
@@ -543,15 +550,17 @@ private void StartStripRemoveHand(
 
             var (time, stealth) = GetStripTimeModifiers(user, target, targetStrippable.HandStripDelay);
 
-            if (!stealth)
-                _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", item)), target, target);
+            bool hidden = stealth == ThievingStealth.Hidden;
+
+            if (!hidden)
+                StripPopup("strippable-component-alert-owner", stealth, target, user: Identity.Entity(user, EntityManager), item: item);
 
-            var prefix = stealth ? "stealthily " : "";
+            var prefix = hidden ? "stealthily " : "";
             _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
 
             var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new StrippableDoAfterEvent(false, false, handName), user, target, item)
             {
-                Hidden = stealth,
+                Hidden = hidden,
                 AttemptFrequency = AttemptFrequency.EveryTick,
                 BreakOnDamage = true,
                 BreakOnTargetMove = true,
@@ -572,7 +581,7 @@ private void StripRemoveHand(
             Entity<HandsComponent?> target,
             EntityUid item,
             string handName,
-            bool stealth)
+            bool hidden)
         {
             if (!Resolve(user, ref user.Comp) ||
                 !Resolve(target, ref target.Comp))
@@ -582,7 +591,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: hidden, animate: hidden, 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 5f019490b5c..c1782efabaf 100644
--- a/Content.Server/Stunnable/Systems/StunbatonSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
@@ -58,10 +58,7 @@ private void OnExamined(Entity<StunbatonComponent> entity, ref ExaminedEvent arg
 
         private void ToggleDone(Entity<StunbatonComponent> entity, ref ItemToggledEvent args)
         {
-            if (!TryComp<ItemComponent>(entity, out var item))
-                return;
-
-            _item.SetHeldPrefix(entity.Owner, args.Activated ? "on" : "off", component: item);
+            _item.SetHeldPrefix(entity.Owner, args.Activated ? "on" : "off");
         }
 
         private void TryTurnOn(Entity<StunbatonComponent> entity, ref ItemToggleActivateAttemptEvent args)
diff --git a/Content.Server/SubFloor/SubFloorHideSystem.cs b/Content.Server/SubFloor/SubFloorHideSystem.cs
index 7820badcebf..2767f500f9a 100644
--- a/Content.Server/SubFloor/SubFloorHideSystem.cs
+++ b/Content.Server/SubFloor/SubFloorHideSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Construction.Components;
 using Content.Shared.SubFloor;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.SubFloor;
 
@@ -17,7 +18,7 @@ private void OnAnchorAttempt(EntityUid uid, SubFloorHideComponent component, Anc
         // No teleporting entities through floor tiles when anchoring them.
         var xform = Transform(uid);
 
-        if (MapManager.TryGetGrid(xform.GridUid, out var grid)
+        if (TryComp<MapGridComponent>(xform.GridUid, out var grid)
             && HasFloorCover(grid, grid.TileIndicesFor(xform.Coordinates)))
         {
             args.Cancel();
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
index 7544fc376ba..0e694a801eb 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
@@ -1,10 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Speech;
 using Content.Shared.Speech;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
 namespace Content.Server.SurveillanceCamera;
@@ -18,8 +15,6 @@ public sealed class SurveillanceCameraSpeakerSystem : EntitySystem
     [Dependency] private readonly SpeechSoundSystem _speechSound = default!;
     [Dependency] private readonly ChatSystem _chatSystem = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index aef4b89d509..0f57da4b881 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -11,7 +11,6 @@
 using Content.Shared.Inventory;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Temperature;
-using Robust.Server.GameObjects;
 using Robust.Shared.Physics.Components;
 
 namespace Content.Server.Temperature.Systems;
@@ -22,7 +21,6 @@ public sealed class TemperatureSystem : EntitySystem
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly TransformSystem _transform = default!;
 
     /// <summary>
     ///     All the components that will have their damage updated at the end of the tick.
@@ -163,8 +161,9 @@ public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, P
         {
             return Atmospherics.MinimumHeatCapacity;
         }
-
-        return comp.SpecificHeat * physics.FixturesMass;
+        if (physics.Mass < 1)
+            return comp.SpecificHeat;
+        else return comp.SpecificHeat * physics.FixturesMass;
     }
 
     private void OnInit(EntityUid uid, InternalTemperatureComponent comp, MapInitEvent args)
diff --git a/Content.Server/Toilet/ToiletSystem.cs b/Content.Server/Toilet/ToiletSystem.cs
index 8bf8457e075..e184ddf0d5b 100644
--- a/Content.Server/Toilet/ToiletSystem.cs
+++ b/Content.Server/Toilet/ToiletSystem.cs
@@ -1,197 +1,8 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Buckle;
-using Content.Server.Popups;
-using Content.Server.Storage.Components;
-using Content.Server.Storage.EntitySystems;
-using Content.Shared.Audio;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Examine;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Popups;
-using Content.Shared.Toilet;
-using Content.Shared.Tools;
-using Content.Shared.Tools.Components;
-using Content.Shared.Verbs;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
-using Robust.Shared.Random;
-using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
+using Content.Shared.Toilet.Systems;
 
-namespace Content.Server.Toilet
-{
-    public sealed class ToiletSystem : EntitySystem
-    {
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly BodySystem _body = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly SecretStashSystem _secretStash = default!;
-        [Dependency] private readonly PopupSystem _popup = default!;
-        [Dependency] private readonly SharedToolSystem _tool = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<ToiletComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<ToiletComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<ToiletComponent, InteractUsingEvent>(OnInteractUsing);
-            SubscribeLocalEvent<ToiletComponent, InteractHandEvent>(OnInteractHand);
-            SubscribeLocalEvent<ToiletComponent, ExaminedEvent>(OnExamine);
-            SubscribeLocalEvent<ToiletComponent, SuicideEvent>(OnSuicide);
-            SubscribeLocalEvent<ToiletComponent, ToiletPryDoAfterEvent>(OnToiletPried);
-            SubscribeLocalEvent<ToiletComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleSeatVerb);
-        }
-
-        private void OnSuicide(EntityUid uid, ToiletComponent component, SuicideEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            // Check that victim has a head
-            // FIXME: since suiciding turns you into a ghost immediately, both messages are seen, not sure how this can be fixed
-            if (TryComp<BodyComponent>(args.Victim, out var body) &&
-                _body.BodyHasPartType(args.Victim, BodyPartType.Head, body))
-            {
-                var othersMessage = Loc.GetString("toilet-component-suicide-head-message-others",
-                    ("victim", Identity.Entity(args.Victim, EntityManager)), ("owner", uid));
-                _popup.PopupEntity(othersMessage, uid, Filter.PvsExcept(args.Victim), true, PopupType.MediumCaution);
-
-                var selfMessage = Loc.GetString("toilet-component-suicide-head-message",
-                    ("owner", uid));
-                _popup.PopupEntity(selfMessage, uid, args.Victim, PopupType.LargeCaution);
-
-                args.SetHandled(SuicideKind.Asphyxiation);
-            }
-            else
-            {
-                var othersMessage = Loc.GetString("toilet-component-suicide-message-others",
-                    ("victim", Identity.Entity(args.Victim, EntityManager)), ("owner", uid));
-                _popup.PopupEntity(othersMessage, uid, Filter.PvsExcept(uid), true, PopupType.MediumCaution);
-
-                var selfMessage = Loc.GetString("toilet-component-suicide-message",
-                    ("owner", uid));
-                _popup.PopupEntity(selfMessage, uid, args.Victim, PopupType.LargeCaution);
-
-                args.SetHandled(SuicideKind.Blunt);
-            }
-        }
-
-        private void OnInit(EntityUid uid, ToiletComponent component, ComponentInit args)
-        {
-            EnsureComp<SecretStashComponent>(uid);
-        }
-
-        private void OnMapInit(EntityUid uid, ToiletComponent component, MapInitEvent args)
-        {
-            // roll is toilet seat will be up or down
-            component.IsSeatUp = _random.Prob(0.5f);
-            UpdateSprite(uid, component);
-        }
-
-        private void OnInteractUsing(EntityUid uid, ToiletComponent component, InteractUsingEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            // are player trying place or lift of cistern lid?
-            if (_tool.UseTool(args.Used, args.User, uid, component.PryLidTime, component.PryingQuality, new ToiletPryDoAfterEvent()))
-            {
-                args.Handled = true;
-            }
-            // maybe player trying to hide something inside cistern?
-            else if (component.LidOpen)
-            {
-                args.Handled = true;
-                _secretStash.TryHideItem(uid, args.User, args.Used);
-            }
-        }
-
-        private void OnInteractHand(EntityUid uid, ToiletComponent component, InteractHandEvent args)
-        {
-            if (args.Handled)
-                return;
+namespace Content.Server.Toilet;
 
-            // trying get something from stash?
-            if (component.LidOpen)
-            {
-                var gotItem = _secretStash.TryGetItem(uid, args.User);
-                if (gotItem)
-                {
-                    args.Handled = true;
-                    return;
-                }
-            }
-
-            args.Handled = true;
-        }
-
-        private void OnToggleSeatVerb(EntityUid uid, ToiletComponent component, GetVerbsEvent<AlternativeVerb> args)
-        {
-            if (!args.CanInteract || !args.CanAccess || !CanToggle(uid))
-                return;
-
-            var alterToiletSeatText = component.IsSeatUp ? Loc.GetString("toilet-seat-close") : Loc.GetString("toilet-seat-open");
-
-            var verb = new AlternativeVerb()
-            {
-                Act = () => {
-                    if (CanToggle(uid))
-                        ToggleToiletSeat(uid, component);
-                },
-                Text = alterToiletSeatText
-            };
-
-            args.Verbs.Add(verb);
-        }
-
-        private void OnExamine(EntityUid uid, ToiletComponent component, ExaminedEvent args)
-        {
-            if (args.IsInDetailsRange && component.LidOpen)
-            {
-                if (_secretStash.HasItemInside(uid))
-                {
-                    var msg = Loc.GetString("toilet-component-on-examine-found-hidden-item");
-                    args.PushMarkup(msg);
-                }
-            }
-        }
-
-        private void OnToiletPried(EntityUid uid, ToiletComponent toilet, ToiletPryDoAfterEvent args)
-        {
-            if (args.Cancelled)
-                return;
-
-            toilet.LidOpen = !toilet.LidOpen;
-            UpdateSprite(uid, toilet);
-        }
-
-        public bool CanToggle(EntityUid uid)
-        {
-            return TryComp<StrapComponent>(uid, out var strap) && strap.BuckledEntities.Count == 0;
-        }
-
-        public void ToggleToiletSeat(EntityUid uid, ToiletComponent? component = null)
-        {
-            if (!Resolve(uid, ref component))
-                return;
-
-            component.IsSeatUp = !component.IsSeatUp;
-            _audio.PlayPvs(component.ToggleSound, uid, AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation));
-            UpdateSprite(uid, component);
-        }
-
-        private void UpdateSprite(EntityUid uid, ToiletComponent component)
-        {
-            if (!TryComp<AppearanceComponent>(uid, out var appearance))
-                return;
+public sealed class ToiletSystem : SharedToiletSystem
+{
 
-            _appearance.SetData(uid, ToiletVisuals.LidOpen, component.LidOpen, appearance);
-            _appearance.SetData(uid, ToiletVisuals.SeatUp, component.IsSeatUp, appearance);
-        }
-    }
 }
diff --git a/Content.Server/Tools/ToolSystem.Welder.cs b/Content.Server/Tools/ToolSystem.Welder.cs
index 98e29c763a8..727526b3989 100644
--- a/Content.Server/Tools/ToolSystem.Welder.cs
+++ b/Content.Server/Tools/ToolSystem.Welder.cs
@@ -7,7 +7,6 @@
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
-using Content.Shared.Item;
 using Content.Shared.Item.ItemToggle;
 using Content.Shared.Tools.Components;
 using Robust.Shared.GameStates;
@@ -32,8 +31,8 @@ public void InitializeWelders()
             SubscribeLocalEvent<WelderComponent, DoAfterAttemptEvent<ToolDoAfterEvent>>(OnWelderToolUseAttempt);
             SubscribeLocalEvent<WelderComponent, ComponentShutdown>(OnWelderShutdown);
             SubscribeLocalEvent<WelderComponent, ComponentGetState>(OnWelderGetState);
-            SubscribeLocalEvent<WelderComponent, ItemToggleActivateAttemptEvent>(TryTurnOn);
-            SubscribeLocalEvent<WelderComponent, ItemToggleDeactivateAttemptEvent>(TurnOff);
+            SubscribeLocalEvent<WelderComponent, ItemToggledEvent>(OnToggle);
+            SubscribeLocalEvent<WelderComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
         }
 
         public (FixedPoint2 fuel, FixedPoint2 capacity) GetWelderFuelAndCapacity(EntityUid uid, WelderComponent? welder = null, SolutionContainerManagerComponent? solutionContainer = null)
@@ -45,55 +44,54 @@ public void InitializeWelders()
             return (fuelSolution.GetTotalPrototypeQuantity(welder.FuelReagent), fuelSolution.MaxVolume);
         }
 
-        public void TryTurnOn(Entity<WelderComponent> entity, ref ItemToggleActivateAttemptEvent args)
+        private void OnToggle(Entity<WelderComponent> entity, ref ItemToggledEvent args)
         {
-            if (!_solutionContainer.ResolveSolution(entity.Owner, entity.Comp.FuelSolutionName, ref entity.Comp.FuelSolution, out var solution) ||
-                !TryComp<TransformComponent>(entity, out var transform))
+            if (args.Activated)
+                TurnOn(entity, args.User);
+            else
+                TurnOff(entity, args.User);
+        }
+
+        private void OnActivateAttempt(Entity<WelderComponent> entity, ref ItemToggleActivateAttemptEvent args)
+        {
+            if (!_solutionContainer.ResolveSolution(entity.Owner, entity.Comp.FuelSolutionName, ref entity.Comp.FuelSolution, out var solution))
             {
                 args.Cancelled = true;
+                args.Popup = Loc.GetString("welder-component-no-fuel-message");
                 return;
             }
 
             var fuel = solution.GetTotalPrototypeQuantity(entity.Comp.FuelReagent);
-
-            // Not enough fuel to lit welder.
             if (fuel == FixedPoint2.Zero || fuel < entity.Comp.FuelLitCost)
             {
-                if (args.User != null)
-                {
-                    _popup.PopupEntity(Loc.GetString("welder-component-no-fuel-message"), entity, (EntityUid) args.User);
-                }
+                args.Popup = Loc.GetString("welder-component-no-fuel-message");
                 args.Cancelled = true;
-                return;
             }
+        }
 
-            _solutionContainer.RemoveReagent(entity.Comp.FuelSolution.Value, entity.Comp.FuelReagent, entity.Comp.FuelLitCost);
-
-            // Logging
-            AdminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(entity.Owner):welder} on");
+        public void TurnOn(Entity<WelderComponent> entity, EntityUid? user)
+        {
+            if (!_solutionContainer.ResolveSolution(entity.Owner, entity.Comp.FuelSolutionName, ref entity.Comp.FuelSolution))
+                return;
 
-            _ignitionSource.SetIgnited(entity.Owner);
+            _solutionContainer.RemoveReagent(entity.Comp.FuelSolution.Value, entity.Comp.FuelReagent, entity.Comp.FuelLitCost);
+            AdminLogger.Add(LogType.InteractActivate, LogImpact.Low,
+                $"{ToPrettyString(user):user} toggled {ToPrettyString(entity.Owner):welder} on");
 
-            if (transform.GridUid is { } gridUid)
+            var xform = Transform(entity);
+            if (xform.GridUid is { } gridUid)
             {
-                var position = _transformSystem.GetGridOrMapTilePosition(entity.Owner, transform);
+                var position = _transformSystem.GetGridOrMapTilePosition(entity.Owner, xform);
                 _atmosphereSystem.HotspotExpose(gridUid, position, 700, 50, entity.Owner, true);
             }
 
-            Dirty(entity);
-
             _activeWelders.Add(entity);
         }
 
-        public void TurnOff(Entity<WelderComponent> entity, ref ItemToggleDeactivateAttemptEvent args)
+        public void TurnOff(Entity<WelderComponent> entity, EntityUid? user)
         {
-            // Logging
-            AdminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.User):user} toggled {ToPrettyString(entity.Owner):welder} off");
-
-            _ignitionSource.SetIgnited(entity.Owner, false);
-
-            Dirty(entity);
-
+            AdminLogger.Add(LogType.InteractActivate, LogImpact.Low,
+                $"{ToPrettyString(user):user} toggled {ToPrettyString(entity.Owner):welder} off");
             _activeWelders.Remove(entity);
         }
 
@@ -152,9 +150,9 @@ private void OnWelderAfterInteract(Entity<WelderComponent> entity, ref AfterInte
                 {
                     _popup.PopupEntity(Loc.GetString("welder-component-no-fuel-in-tank", ("owner", args.Target)), entity, args.User);
                 }
-            }
 
-            args.Handled = true;
+                args.Handled = true;
+            }
         }
 
         private void OnWelderToolUseAttempt(Entity<WelderComponent> entity, ref DoAfterAttemptEvent<ToolDoAfterEvent> args)
@@ -186,7 +184,9 @@ private void UpdateWelders(float frameTime)
             if (_welderTimer < WelderUpdateTimer)
                 return;
 
-            // TODO Use an "active welder" component instead, EntityQuery over that.
+            // TODO Serialization. _activeWelders is not serialized.
+            // Need to use some "active" component, and EntityQuery over that.
+            // Probably best to generalize it to a "ToggleableFuelDrain" component.
             foreach (var tool in _activeWelders.ToArray())
             {
                 if (!TryComp(tool, out WelderComponent? welder)
diff --git a/Content.Server/Traits/Assorted/ForeignerTraitComponent.cs b/Content.Server/Traits/Assorted/ForeignerTraitComponent.cs
new file mode 100644
index 00000000000..756f44e7429
--- /dev/null
+++ b/Content.Server/Traits/Assorted/ForeignerTraitComponent.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Language;
+using Content.Shared.Language.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Traits.Assorted;
+
+/// <summary>
+///     When applied to a not-yet-spawned player entity, removes <see cref="BaseLanguage"/> from the lists of their languages
+///     and gives them a translator instead.
+/// </summary>
+[RegisterComponent]
+public sealed partial class ForeignerTraitComponent : Component
+{
+    /// <summary>
+    ///     The "base" language that is to be removed and substituted with a translator.
+    ///     By default, equals to the fallback language, which is GalacticCommon.
+    /// </summary>
+    [DataField]
+    public ProtoId<LanguagePrototype> BaseLanguage = SharedLanguageSystem.FallbackLanguagePrototype;
+
+    /// <summary>
+    ///     Whether this trait prevents the entity from understanding the base language.
+    /// </summary>
+    [DataField]
+    public bool CantUnderstand = true;
+
+    /// <summary>
+    ///     Whether this trait prevents the entity from speaking the base language.
+    /// </summary>
+    [DataField]
+    public bool CantSpeak = true;
+
+    /// <summary>
+    ///     The base translator prototype to use when creating a translator for the entity.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<EntityPrototype> BaseTranslator = default!;
+}
diff --git a/Content.Server/Traits/Assorted/ForeignerTraitSystem.cs b/Content.Server/Traits/Assorted/ForeignerTraitSystem.cs
new file mode 100644
index 00000000000..58e974227ce
--- /dev/null
+++ b/Content.Server/Traits/Assorted/ForeignerTraitSystem.cs
@@ -0,0 +1,105 @@
+using System.Linq;
+using Content.Server.Hands.Systems;
+using Content.Server.Language;
+using Content.Server.Storage.EntitySystems;
+using Content.Shared.Clothing.Components;
+using Content.Shared.Inventory;
+using Content.Shared.Language;
+using Content.Shared.Language.Components;
+using Content.Shared.Language.Components.Translators;
+using Content.Shared.Storage;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Traits.Assorted;
+
+
+public sealed partial class ForeignerTraitSystem : EntitySystem
+{
+    [Dependency] private readonly EntityManager _entMan = default!;
+    [Dependency] private readonly HandsSystem _hands = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly LanguageSystem _languages = default!;
+    [Dependency] private readonly StorageSystem _storage = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ForeignerTraitComponent, ComponentInit>(OnSpawn); // TraitSystem adds it after PlayerSpawnCompleteEvent so it's fine
+    }
+
+    private void OnSpawn(Entity<ForeignerTraitComponent> entity, ref ComponentInit args)
+    {
+        if (entity.Comp.CantUnderstand && !entity.Comp.CantSpeak)
+            Log.Warning($"Allowing entity {entity.Owner} to speak a language but not understand it leads to undefined behavior.");
+
+        if (!TryComp<LanguageKnowledgeComponent>(entity, out var knowledge))
+        {
+            Log.Warning($"Entity {entity.Owner} does not have a LanguageKnowledge but has a ForeignerTrait!");
+            return;
+        }
+
+        var alternateLanguage = knowledge.SpokenLanguages.Find(it => it != entity.Comp.BaseLanguage);
+        if (alternateLanguage == null)
+        {
+            Log.Warning($"Entity {entity.Owner} does not have an alternative language to choose from (must have at least one non-GC for ForeignerTrait)!");
+            return;
+        }
+
+        if (TryGiveTranslator(entity.Owner, entity.Comp.BaseTranslator, entity.Comp.BaseLanguage, alternateLanguage, out var translator))
+        {
+            _languages.RemoveLanguage(entity, entity.Comp.BaseLanguage, entity.Comp.CantSpeak, entity.Comp.CantUnderstand, knowledge);
+        }
+    }
+
+    /// <summary>
+    ///     Tries to create and give the entity a translator to translator that translates speech between the two specified languages.
+    /// </summary>
+    public bool TryGiveTranslator(
+        EntityUid uid,
+        string baseTranslatorPrototype,
+        ProtoId<LanguagePrototype> translatorLanguage,
+        ProtoId<LanguagePrototype> entityLanguage,
+        out EntityUid result)
+    {
+        result = EntityUid.Invalid;
+        if (translatorLanguage == entityLanguage)
+            return false;
+
+        var translator = _entMan.SpawnNextToOrDrop(baseTranslatorPrototype, uid);
+        result = translator;
+
+        if (!TryComp<HandheldTranslatorComponent>(translator, out var handheld))
+        {
+            handheld = AddComp<HandheldTranslatorComponent>(translator);
+            handheld.ToggleOnInteract = true;
+            handheld.SetLanguageOnInteract = true;
+        }
+
+        // Allows to speak the specified language and requires entities language.
+        handheld.SpokenLanguages = [translatorLanguage];
+        handheld.UnderstoodLanguages = [translatorLanguage];
+        handheld.RequiredLanguages = [entityLanguage];
+
+        // Try to put it in entities hand
+        if (_hands.TryPickupAnyHand(uid, translator, false, false, false))
+            return true;
+
+        // Try to find a valid clothing slot on the entity and equip the translator there
+        if (TryComp<ClothingComponent>(translator, out var clothing)
+            && clothing.Slots != SlotFlags.NONE
+            && _inventory.TryGetSlots(uid, out var slots)
+            && slots.Any(it => _inventory.TryEquip(uid, translator, it.Name, true, false)))
+            return true;
+
+        // Try to put the translator into entities bag, if it has one
+        if (_inventory.TryGetSlotEntity(uid, "back", out var bag)
+            && TryComp<StorageComponent>(bag, out var storage)
+            && _storage.Insert(bag.Value, translator, out _, null, storage, false, false))
+            return true;
+
+        // If all of the above has failed, just drop it at the same location as the entity
+        // This should ideally never happen, but who knows.
+        Transform(translator).Coordinates = Transform(uid).Coordinates;
+
+        return true;
+    }
+}
diff --git a/Content.Server/Traits/Assorted/LightweightDrunkComponent.cs b/Content.Server/Traits/Assorted/LightweightDrunkComponent.cs
new file mode 100644
index 00000000000..4daff2e1338
--- /dev/null
+++ b/Content.Server/Traits/Assorted/LightweightDrunkComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.Traits.Assorted.Components;
+
+/// <summary>
+/// Used for the lightweight trait. LightweightDrunkSystem will multiply the effects of ethanol being metabolized
+/// </summary>
+[RegisterComponent]
+public sealed partial class LightweightDrunkComponent : Component
+{
+    [DataField("boozeStrengthMultiplier"), ViewVariables(VVAccess.ReadWrite)]
+    public float BoozeStrengthMultiplier = 4f;
+}
diff --git a/Content.Server/Traits/Assorted/LightweightDrunkSystem.cs b/Content.Server/Traits/Assorted/LightweightDrunkSystem.cs
new file mode 100644
index 00000000000..b5e9b877764
--- /dev/null
+++ b/Content.Server/Traits/Assorted/LightweightDrunkSystem.cs
@@ -0,0 +1,23 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Traits.Assorted.Components;
+
+namespace Content.Shared.Traits.Assorted.Systems;
+public sealed class LightweightDrunkSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<LightweightDrunkComponent, TryMetabolizeReagent>(OnTryMetabolizeReagent);
+    }
+
+    private void OnTryMetabolizeReagent(EntityUid uid, LightweightDrunkComponent comp, ref TryMetabolizeReagent args)
+    {
+        Log.Debug(args.Prototype.ID);
+        if (args.Prototype.ID != "Ethanol")
+            return;
+
+        args.Scale *= comp.BoozeStrengthMultiplier;
+        args.QuantityMultiplier *= comp.BoozeStrengthMultiplier;
+    }
+}
\ No newline at end of file
diff --git a/Content.Server/UserInterface/ActivatableUIComponent.cs b/Content.Server/UserInterface/ActivatableUIComponent.cs
index 54639dd2b05..cc0e5008e47 100644
--- a/Content.Server/UserInterface/ActivatableUIComponent.cs
+++ b/Content.Server/UserInterface/ActivatableUIComponent.cs
@@ -1,3 +1,6 @@
+using Content.Shared.Whitelist;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
@@ -34,12 +37,19 @@ public sealed partial class ActivatableUIComponent : Component
         [DataField]
         public bool RequireHands = true;
 
+        /// <summary>
+        ///     Entities that are required to open this UI.
+        /// </summary>
+        [DataField("allowedItems")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public EntityWhitelist? AllowedItems = null;
+
         /// <summary>
         ///     Whether you can activate this ui with activateinhand or not
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
-        public bool rightClickOnly = false;
+        public bool RightClickOnly;
 
         /// <summary>
         ///     Whether spectators (non-admin ghosts) should be allowed to view this UI.
@@ -63,4 +73,3 @@ public sealed partial class ActivatableUIComponent : Component
         public ICommonSession? CurrentSingleUser;
     }
 }
-
diff --git a/Content.Server/UserInterface/ActivatableUISystem.cs b/Content.Server/UserInterface/ActivatableUISystem.cs
index 387221e00ca..5f2314df90b 100644
--- a/Content.Server/UserInterface/ActivatableUISystem.cs
+++ b/Content.Server/UserInterface/ActivatableUISystem.cs
@@ -26,6 +26,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<ActivatableUIComponent, ActivateInWorldEvent>(OnActivate);
         SubscribeLocalEvent<ActivatableUIComponent, UseInHandEvent>(OnUseInHand);
+        SubscribeLocalEvent<ActivatableUIComponent, InteractUsingEvent>(OnInteractUsing);
         SubscribeLocalEvent<ActivatableUIComponent, HandDeselectedEvent>(OnHandDeselected);
         SubscribeLocalEvent<ActivatableUIComponent, GotUnequippedHandEvent>((uid, aui, _) => CloseAll(uid, aui));
         // *THIS IS A BLATANT WORKAROUND!* RATIONALE: Microwaves need it
@@ -92,6 +93,9 @@ private void OnActivate(EntityUid uid, ActivatableUIComponent component, Activat
         if (component.InHandsOnly)
             return;
 
+        if (component.AllowedItems != null)
+            return;
+
         args.Handled = InteractUI(args.User, uid, component);
     }
 
@@ -100,12 +104,23 @@ private void OnUseInHand(EntityUid uid, ActivatableUIComponent component, UseInH
         if (args.Handled)
             return;
 
-        if (component.rightClickOnly)
+        if (component.RightClickOnly)
+            return;
+
+        if (component.AllowedItems != null)
             return;
 
         args.Handled = InteractUI(args.User, uid, component);
     }
 
+    private void OnInteractUsing(EntityUid uid, ActivatableUIComponent component, InteractUsingEvent args)
+    {
+        if (args.Handled) return;
+        if (component.AllowedItems == null) return;
+        if (!component.AllowedItems.IsValid(args.Used, EntityManager)) return;
+        args.Handled = InteractUI(args.User, uid, component);
+    }
+
     private void OnParentChanged(EntityUid uid, ActivatableUIComponent aui, ref EntParentChangedMessage args)
     {
         CloseAll(uid, aui);
diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index b5fa611a396..7c9aed188fe 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -1,12 +1,11 @@
 using System.Linq;
 using System.Numerics;
 using Content.Server.Advertise;
+using Content.Server.Advertise.Components;
 using Content.Server.Cargo.Systems;
-using Content.Server.Chat.Systems;
 using Content.Server.Emp;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
-using Content.Server.UserInterface;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Actions;
@@ -25,7 +24,6 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 
 namespace Content.Server.VendingMachines
 {
@@ -39,7 +37,7 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem
         [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
         [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
-        [Dependency] private readonly AdvertiseSystem _advertise = default!;
+        [Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!;
 
         public override void Initialize()
         {
@@ -58,7 +56,6 @@ public override void Initialize()
             Subs.BuiEvents<VendingMachineComponent>(VendingMachineUiKey.Key, subs =>
             {
                 subs.Event<BoundUIOpenedEvent>(OnBoundUIOpened);
-                subs.Event<BoundUIClosedEvent>(OnBoundUIClosed);
                 subs.Event<VendingMachineEjectMessage>(OnInventoryEjectMessage);
             });
 
@@ -114,16 +111,6 @@ private void OnBoundUIOpened(EntityUid uid, VendingMachineComponent component, B
             UpdateVendingMachineInterfaceState(uid, component);
         }
 
-        private void OnBoundUIClosed(EntityUid uid, VendingMachineComponent component, BoundUIClosedEvent args)
-        {
-            // Only vendors that advertise will send message after dispensing
-            if (component.ShouldSayThankYou && TryComp<AdvertiseComponent>(uid, out var advertise))
-            {
-                _advertise.SayThankYou(uid, advertise);
-                component.ShouldSayThankYou = false;
-            }
-        }
-
         private void UpdateVendingMachineInterfaceState(EntityUid uid, VendingMachineComponent component)
         {
             var state = new VendingMachineInterfaceState(GetAllInventory(uid, component));
@@ -294,7 +281,10 @@ public void TryEjectVendorItem(EntityUid uid, InventoryType type, string itemId,
             vendComponent.Ejecting = true;
             vendComponent.NextItemToEject = entry.ID;
             vendComponent.ThrowNextItem = throwItem;
-            vendComponent.ShouldSayThankYou = true;
+
+            if (TryComp(uid, out SpeakOnUIClosedComponent? speakComponent))
+                _speakOnUIClosed.TrySetFlag((uid, speakComponent));
+
             entry.Amount--;
             UpdateVendingMachineInterfaceState(uid, vendComponent);
             TryUpdateVisualState(uid, vendComponent);
diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs b/Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
index 87b3b9ef323..bd0c40f26a1 100644
--- a/Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
+++ b/Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
@@ -21,6 +21,7 @@ private void OnEquip(EntityUid uid, VoiceMaskerComponent component, GotEquippedE
 
         var comp = EnsureComp<VoiceMaskComponent>(user);
         comp.VoiceName = component.LastSetName;
+        comp.SpeechVerb = component.LastSpeechVerb;
 
         _actions.AddAction(user, ref component.ActionEntity, component.Action, uid);
     }
@@ -30,15 +31,23 @@ private void OnUnequip(EntityUid uid, VoiceMaskerComponent compnent, GotUnequipp
         RemComp<VoiceMaskComponent>(args.Equipee);
     }
 
-    private void TrySetLastKnownName(EntityUid maskWearer, string lastName)
+    private VoiceMaskerComponent? TryGetMask(EntityUid user)
     {
-        if (!HasComp<VoiceMaskComponent>(maskWearer)
-            || !_inventory.TryGetSlotEntity(maskWearer, MaskSlot, out var maskEntity)
-            || !TryComp<VoiceMaskerComponent>(maskEntity, out var maskComp))
-        {
-            return;
-        }
+        if (!HasComp<VoiceMaskComponent>(user) || !_inventory.TryGetSlotEntity(user, MaskSlot, out var maskEntity))
+            return null;
+
+        return CompOrNull<VoiceMaskerComponent>(maskEntity);
+    }
 
-        maskComp.LastSetName = lastName;
+    private void TrySetLastKnownName(EntityUid user, string name)
+    {
+        if (TryGetMask(user) is {} comp)
+            comp.LastSetName = name;
+    }
+
+    private void TrySetLastSpeechVerb(EntityUid user, string? verb)
+    {
+        if (TryGetMask(user) is {} comp)
+            comp.LastSpeechVerb = verb;
     }
 }
diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs
index 3f11903234d..19ed156a0b4 100644
--- a/Content.Server/VoiceMask/VoiceMaskSystem.cs
+++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs
@@ -6,9 +6,11 @@
 using Content.Shared.Inventory.Events;
 using Content.Shared.Popups;
 using Content.Shared.Preferences;
+using Content.Shared.Speech;
 using Content.Shared.VoiceMask;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.VoiceMask;
 
@@ -17,11 +19,13 @@ public sealed partial class VoiceMaskSystem : EntitySystem
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
 
     public override void Initialize()
     {
         SubscribeLocalEvent<VoiceMaskComponent, TransformSpeakerNameEvent>(OnSpeakerNameTransform);
         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeNameMessage>(OnChangeName);
+        SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeVerbMessage>(OnChangeVerb);
         SubscribeLocalEvent<VoiceMaskComponent, WearerMaskToggledEvent>(OnMaskToggled);
         SubscribeLocalEvent<VoiceMaskerComponent, GotEquippedEvent>(OnEquip);
         SubscribeLocalEvent<VoiceMaskerComponent, GotUnequippedEvent>(OnUnequip);
@@ -55,6 +59,21 @@ private void OnChangeName(EntityUid uid, VoiceMaskComponent component, VoiceMask
         UpdateUI(uid, component);
     }
 
+    private void OnChangeVerb(Entity<VoiceMaskComponent> ent, ref VoiceMaskChangeVerbMessage msg)
+    {
+        if (msg.Verb is {} id && !_proto.HasIndex<SpeechVerbPrototype>(id))
+            return;
+
+        ent.Comp.SpeechVerb = msg.Verb;
+        // verb is only important to metagamers so no need to log as opposed to name
+
+        _popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-success"), ent, msg.Session);
+
+        TrySetLastSpeechVerb(ent, msg.Verb);
+
+        UpdateUI(ent, ent.Comp);
+    }
+
     private void OnSpeakerNameTransform(EntityUid uid, VoiceMaskComponent component, TransformSpeakerNameEvent args)
     {
         if (component.Enabled)
@@ -97,6 +116,6 @@ private void UpdateUI(EntityUid owner, VoiceMaskComponent? component = null)
         }
 
         if (_uiSystem.TryGetUi(owner, VoiceMaskUIKey.Key, out var bui))
-            _uiSystem.SetUiState(bui, new VoiceMaskBuiState(component.VoiceName));
+            _uiSystem.SetUiState(bui, new VoiceMaskBuiState(component.VoiceName, component.SpeechVerb));
     }
 }
diff --git a/Content.Server/VoiceMask/VoiceMaskerComponent.cs b/Content.Server/VoiceMask/VoiceMaskerComponent.cs
index c3cc29c5271..afea5877df2 100644
--- a/Content.Server/VoiceMask/VoiceMaskerComponent.cs
+++ b/Content.Server/VoiceMask/VoiceMaskerComponent.cs
@@ -1,15 +1,20 @@
+using Content.Shared.Speech;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.VoiceMask;
 
 [RegisterComponent]
 public sealed partial class VoiceMaskerComponent : Component
 {
-    [ViewVariables(VVAccess.ReadWrite)] public string LastSetName = "Unknown";
+    [DataField]
+    public string LastSetName = "Unknown";
 
-    [DataField("action", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string Action = "ActionChangeVoiceMask";
+    [DataField]
+    public ProtoId<SpeechVerbPrototype>? LastSpeechVerb;
 
-    [DataField("actionEntity")] public EntityUid? ActionEntity;
+    [DataField]
+    public EntProtoId Action = "ActionChangeVoiceMask";
+
+    [DataField]
+    public EntityUid? ActionEntity;
 }
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 31c9b0d2b86..82249bb0ccb 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -1,28 +1,24 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
 using Content.Server.Chat.Systems;
-using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.CombatMode.Disarm;
 using Content.Server.Movement.Systems;
 using Content.Shared.Actions.Events;
 using Content.Shared.Administration.Components;
 using Content.Shared.CombatMode;
+using Content.Shared.Contests;
 using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Effects;
 using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Inventory;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Speech.Components;
 using Content.Shared.StatusEffect;
-using Content.Shared.Tag;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
@@ -33,21 +29,18 @@ namespace Content.Server.Weapons.Melee;
 
 public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
 {
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly LagCompensationSystem _lag = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutions = default!;
-    [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly ContestsSystem _contests = default!;
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<MeleeChemicalInjectorComponent, MeleeHitEvent>(OnChemicalInjectorHit);
         SubscribeLocalEvent<MeleeSpeechComponent, MeleeHitEvent>(OnSpeechHit);
         SubscribeLocalEvent<MeleeWeaponComponent, DamageExamineEvent>(OnMeleeExamineDamage);
     }
@@ -138,7 +131,7 @@ protected override bool DoDisarm(EntityUid user, DisarmAttackEvent ev, EntityUid
         if (attemptEvent.Cancelled)
             return false;
 
-        var chance = CalculateDisarmChance(user, target, inTargetHand, combatMode);
+        var chance = CalculateDisarmChance(user, target, inTargetHand, combatMode) * _contests.MassContest(user, target);
 
         if (_random.Prob(chance))
         {
@@ -163,12 +156,18 @@ protected override bool DoDisarm(EntityUid user, DisarmAttackEvent ev, EntityUid
         PopupSystem.PopupEntity(msgOther, user, filterOther, true);
         PopupSystem.PopupEntity(msgUser, target, user);
 
-        Audio.PlayPvs(combatMode.DisarmSuccessSound, user, AudioParams.Default.WithVariation(0.025f).WithVolume(5f));
+        _audio.PlayPvs(combatMode.DisarmSuccessSound, user, AudioParams.Default.WithVariation(0.025f).WithVolume(5f));
         AdminLogger.Add(LogType.DisarmedAction, $"{ToPrettyString(user):user} used disarm on {ToPrettyString(target):target}");
 
         var eventArgs = new DisarmedEvent { Target = target, Source = user, PushProbability = 1 - chance };
         RaiseLocalEvent(target, eventArgs);
 
+        if (!eventArgs.Handled)
+            return false;
+
+        _audio.PlayPvs(combatMode.DisarmSuccessSound, user, AudioParams.Default.WithVariation(0.025f).WithVolume(5f));
+        AdminLogger.Add(LogType.DisarmedAction, $"{ToPrettyString(user):user} used disarm on {ToPrettyString(target):target}");
+
         return true;
     }
 
@@ -245,47 +244,4 @@ private void OnSpeechHit(EntityUid owner, MeleeSpeechComponent comp, MeleeHitEve
         }
 
     }
-
-    private void OnChemicalInjectorHit(Entity<MeleeChemicalInjectorComponent> entity, ref MeleeHitEvent args)
-    {
-        if (!args.IsHit ||
-            !args.HitEntities.Any() ||
-            !_solutions.TryGetSolution(entity.Owner, entity.Comp.Solution, out var solutionContainer))
-        {
-            return;
-        }
-
-        var hitBloodstreams = new List<(EntityUid Entity, BloodstreamComponent Component)>();
-        var bloodQuery = GetEntityQuery<BloodstreamComponent>();
-
-        foreach (var hit in args.HitEntities)
-        {
-            if (Deleted(hit))
-                continue;
-
-            // prevent deathnettles injecting through hardsuits
-            if (!entity.Comp.PierceArmor && _inventory.TryGetSlotEntity(hit, "outerClothing", out var suit) && _tag.HasTag(suit.Value, "Hardsuit"))
-            {
-                PopupSystem.PopupEntity(Loc.GetString("melee-inject-failed-hardsuit", ("weapon", entity.Owner)), args.User, args.User, PopupType.SmallCaution);
-                continue;
-            }
-
-            if (bloodQuery.TryGetComponent(hit, out var bloodstream))
-                hitBloodstreams.Add((hit, bloodstream));
-        }
-
-        if (!hitBloodstreams.Any())
-            return;
-
-        var removedSolution = _solutions.SplitSolution(solutionContainer.Value, entity.Comp.TransferAmount * hitBloodstreams.Count);
-        var removedVol = removedSolution.Volume;
-        var solutionToInject = removedSolution.SplitSolution(removedVol * entity.Comp.TransferEfficiency);
-        var volPerBloodstream = solutionToInject.Volume * (1 / hitBloodstreams.Count);
-
-        foreach (var (ent, bloodstream) in hitBloodstreams)
-        {
-            var individualInjection = solutionToInject.SplitSolution(volPerBloodstream);
-            _bloodstream.TryAddToChemicals(ent, individualInjection, bloodstream);
-        }
-    }
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 692198da009..bf60208e958 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using System.Numerics;
-using Content.Server.Administration.Logs;
 using Content.Server.Cargo.Systems;
 using Content.Server.Interaction;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stunnable;
 using Content.Server.Weapons.Ranged.Components;
+using Content.Shared.Contests;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
@@ -29,7 +29,6 @@ namespace Content.Server.Weapons.Ranged.Systems;
 
 public sealed partial class GunSystem : SharedGunSystem
 {
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
@@ -39,8 +38,9 @@ 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 ContestsSystem _contests = default!;
 
-    public const float DamagePitchVariation = SharedMeleeWeaponSystem.DamagePitchVariation;
+    private const float DamagePitchVariation = 0.05f;
     public const float GunClumsyChance = 0.5f;
 
     public override void Initialize()
@@ -97,7 +97,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         var toMap = toCoordinates.ToMapPos(EntityManager, TransformSystem);
         var mapDirection = toMap - fromMap.Position;
         var mapAngle = mapDirection.ToAngle();
-        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle());
+        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle(), user);
 
         // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
         var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out var grid)
@@ -318,7 +318,7 @@ private Angle[] LinearSpread(Angle start, Angle end, int intervals)
         return angles;
     }
 
-    private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction)
+    private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction, EntityUid? shooter)
     {
         var timeSinceLastFire = (curTime - component.LastFire).TotalSeconds;
         var newTheta = MathHelper.Clamp(component.CurrentAngle.Theta + component.AngleIncreaseModified.Theta - component.AngleDecayModified.Theta * timeSinceLastFire, component.MinAngleModified.Theta, component.MaxAngleModified.Theta);
@@ -326,7 +326,8 @@ private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle dir
         component.LastFire = component.NextFire;
 
         // Convert it so angle can go either side.
-        var random = Random.NextFloat(-0.5f, 0.5f);
+
+        var random = Random.NextFloat(-0.5f, 0.5f) / _contests.MassContest(shooter);
         var spread = component.CurrentAngle.Theta * random;
         var angle = new Angle(direction.Theta + component.CurrentAngle.Theta * random);
         DebugTools.Assert(spread <= component.MaxAngleModified.Theta);
diff --git a/Content.Server/Wires/CutWireOnMapInitComponent.cs b/Content.Server/Wires/CutWireOnMapInitComponent.cs
new file mode 100644
index 00000000000..4a4345e0536
--- /dev/null
+++ b/Content.Server/Wires/CutWireOnMapInitComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server.Wires;
+
+/// <summary>
+/// Picks a random wire on the entity's <see cref="WireComponent"/> and cuts it.
+/// Runs at MapInit and removes itself afterwards.
+/// </summary>
+[RegisterComponent]
+public sealed partial class CutWireOnMapInitComponent : Component
+{
+}
diff --git a/Content.Server/Wires/CutWireOnMapInitSystem.cs b/Content.Server/Wires/CutWireOnMapInitSystem.cs
new file mode 100644
index 00000000000..1de1d786306
--- /dev/null
+++ b/Content.Server/Wires/CutWireOnMapInitSystem.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.Random;
+
+namespace Content.Server.Wires;
+
+/// <summary>
+/// Handles cutting a random wire on devices that have <see cref="CutWireOnMapInitComponent"/>.
+/// </summary>
+public sealed partial class CutWireOnMapInitSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CutWireOnMapInitComponent, MapInitEvent>(OnMapInit, after: [typeof(WiresSystem)]);
+    }
+
+    private void OnMapInit(Entity<CutWireOnMapInitComponent> entity, ref MapInitEvent args)
+    {
+        if (TryComp<WiresComponent>(entity, out var panel) && panel.WiresList.Count > 0)
+        {
+            // Pick a random wire
+            var targetWire = _random.Pick(panel.WiresList);
+
+            // Cut the wire
+            if (targetWire.Action == null || targetWire.Action.Cut(EntityUid.Invalid, targetWire))
+                targetWire.IsCut = true;
+        }
+
+        // Our work here is done
+        RemCompDeferred(entity, entity.Comp);
+    }
+}
diff --git a/Content.Server/Wires/WiresComponent.cs b/Content.Server/Wires/WiresComponent.cs
index 51db0a18281..ee8964b7621 100644
--- a/Content.Server/Wires/WiresComponent.cs
+++ b/Content.Server/Wires/WiresComponent.cs
@@ -1,4 +1,5 @@
 using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Wires;
 
@@ -15,7 +16,7 @@ public sealed partial class WiresComponent : Component
     ///     The layout ID of this entity's wires.
     /// </summary>
     [DataField(required: true)]
-    public string LayoutId { get; set; } = default!;
+    public ProtoId<WireLayoutPrototype> LayoutId { get; set; } = default!;
 
     /// <summary>
     ///     The serial number of this board. Randomly generated upon start,
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
index 70ae7dcf0f3..647f31a8953 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
@@ -44,10 +44,10 @@ private void GenerateArtifactNodeTree(EntityUid artifact, ref List<ArtifactNode>
 
     private int GetValidNodeId()
     {
-        var id = _random.Next(10000, 100000);
+        var id = _random.Next(100, 1000);
         while (_usedNodeIds.Contains(id))
         {
-            id = _random.Next(10000, 100000);
+            id = _random.Next(100, 1000);
         }
 
         _usedNodeIds.Add(id);
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/TemperatureArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/TemperatureArtifactSystem.cs
index 163600c6ddc..f314d4a4fb2 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/TemperatureArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/TemperatureArtifactSystem.cs
@@ -28,10 +28,10 @@ private void OnActivate(EntityUid uid, TemperatureArtifactComponent component, A
 
         if (component.AffectAdjacentTiles && transform.GridUid != null)
         {
-            var adjacent = _atmosphereSystem.GetAdjacentTileMixtures(transform.GridUid.Value,
+            var enumerator = _atmosphereSystem.GetAdjacentTileMixtures(transform.GridUid.Value,
                 _transformSystem.GetGridOrMapTilePosition(uid, transform), excite: true);
 
-            foreach (var mixture in adjacent)
+            while (enumerator.MoveNext(out var mixture))
             {
                 UpdateTileTemperature(component, mixture);
             }
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
index 85783b552da..57a30a2fd9e 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
@@ -1,12 +1,10 @@
 using System.Numerics;
-using Content.Server.Maps;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Events;
-using Content.Shared.Ghost;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Throwing;
-using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
 
@@ -14,7 +12,6 @@ namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Systems;
 
 public sealed class ThrowArtifactSystem : EntitySystem
 {
-    [Dependency] private readonly IMapManager _map = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly ThrowingSystem _throwing = default!;
@@ -29,7 +26,7 @@ public override void Initialize()
     private void OnActivated(EntityUid uid, ThrowArtifactComponent component, ArtifactActivatedEvent args)
     {
         var xform = Transform(uid);
-        if (_map.TryGetGrid(xform.GridUid, out var grid))
+        if (TryComp<MapGridComponent>(xform.GridUid, out var grid))
         {
             var tiles = grid.GetTilesIntersecting(
                 Box2.CenteredAround(xform.WorldPosition, new Vector2(component.Range * 2, component.Range)));
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactGasTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactGasTriggerSystem.cs
index 96f1dc37835..00f409f5533 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactGasTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactGasTriggerSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Events;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components;
-using Robust.Server.GameObjects;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;
 
@@ -9,7 +8,6 @@ public sealed class ArtifactGasTriggerSystem : EntitySystem
 {
     [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
     [Dependency] private readonly ArtifactSystem _artifactSystem = default!;
-    [Dependency] private readonly TransformSystem _transformSystem = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactHeatTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactHeatTriggerSystem.cs
index 33d1a43c125..5525cdf3591 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactHeatTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactHeatTriggerSystem.cs
@@ -3,7 +3,6 @@
 using Content.Shared.Interaction;
 using Content.Shared.Temperature;
 using Content.Shared.Weapons.Melee.Events;
-using Robust.Server.GameObjects;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;
 
@@ -11,7 +10,6 @@ public sealed class ArtifactHeatTriggerSystem : EntitySystem
 {
     [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
     [Dependency] private readonly ArtifactSystem _artifactSystem = default!;
-    [Dependency] private readonly TransformSystem _transformSystem = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactInteractionTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactInteractionTriggerSystem.cs
index 239b6741608..9976d56da0b 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactInteractionTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactInteractionTriggerSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Physics.Pull;
+using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Weapons.Melee.Events;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;
@@ -22,7 +22,7 @@ private void OnPull(EntityUid uid, ArtifactInteractionTriggerComponent component
         if (!component.PullActivation)
             return;
 
-        _artifactSystem.TryActivateArtifact(uid, args.Puller.Owner);
+        _artifactSystem.TryActivateArtifact(uid, args.PullerUid);
     }
 
     private void OnAttack(EntityUid uid, ArtifactInteractionTriggerComponent component, AttackedEvent args)
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs
index 92a586547dd..c6f56a27508 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Salvage;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components;
 using Content.Shared.Clothing;
@@ -42,7 +42,7 @@ public override void Update(float frameTime)
                 if (!magXform.Coordinates.TryDistance(EntityManager, xform.Coordinates, out var distance))
                     continue;
 
-                if (distance > trigger.Range)
+                if (distance > trigger.MagbootRange)
                     continue;
 
                 _toActivate.Add(artifactUid);
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactPressureTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactPressureTriggerSystem.cs
index 4388756cce0..8777ab0a8c7 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactPressureTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactPressureTriggerSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components;
-using Robust.Server.GameObjects;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;
 
@@ -11,7 +10,6 @@ public sealed class ArtifactPressureTriggerSystem : EntitySystem
 {
     [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
     [Dependency] private readonly ArtifactSystem _artifactSystem = default!;
-    [Dependency] private readonly TransformSystem _transformSystem = default!;
 
     public override void Update(float frameTime)
     {
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 996d7772239..c87132cc3cb 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -26,12 +26,12 @@
 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.Nutrition.AnimalHusbandry;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
 using Content.Shared.Roles;
-using Content.Shared.Pulling.Components;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Zombies;
 using Content.Shared.Prying.Components;
@@ -59,7 +59,6 @@ public sealed partial class ZombieSystem
         [Dependency] private readonly IChatManager _chatMan = default!;
         [Dependency] private readonly MindSystem _mind = default!;
         [Dependency] private readonly SharedRoleSystem _roles = default!;
-        [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly ActionsSystem _actions = default!; // DeltaV - No psionic zombies
 
@@ -282,7 +281,9 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null)
                 RemComp(target, handsComp);
             }
 
-            RemComp<SharedPullerComponent>(target);
+            // Sloth: What the fuck?
+            // How long until compregistry lmao.
+            RemComp<PullerComponent>(target);
 
             // No longer waiting to become a zombie:
             // Requires deferral because this is (probably) the event which called ZombifyEntity in the first place.
diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index bef57eceb39..080bef44e7a 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -2,9 +2,7 @@
 using Content.Server.Body.Systems;
 using Content.Server.Chat;
 using Content.Server.Chat.Systems;
-using Content.Server.Cloning;
 using Content.Server.Emoting.Systems;
-using Content.Server.Inventory;
 using Content.Server.Speech.EntitySystems;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Cloning;
@@ -31,7 +29,6 @@ public sealed partial class ZombieSystem : SharedZombieSystem
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
         [Dependency] private readonly DamageableSystem _damageable = default!;
-        [Dependency] private readonly ServerInventorySystem _inv = default!;
         [Dependency] private readonly ChatSystem _chat = default!;
         [Dependency] private readonly AutoEmoteSystem _autoEmote = default!;
         [Dependency] private readonly EmoteOnDamageSystem _emoteOnDamage = default!;
diff --git a/Content.Shared/Access/AccessGroupPrototype.cs b/Content.Shared/Access/AccessGroupPrototype.cs
index 8d3ed8feea1..323fdb91eda 100644
--- a/Content.Shared/Access/AccessGroupPrototype.cs
+++ b/Content.Shared/Access/AccessGroupPrototype.cs
@@ -14,6 +14,6 @@ public sealed partial class AccessGroupPrototype : IPrototype
     [IdDataField]
     public string ID { get; private set; } = default!;
 
-    [DataField("tags", required: true, customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
-    public HashSet<string> Tags = default!;
+    [DataField("tags", required: true)]
+    public HashSet<ProtoId<AccessLevelPrototype>> Tags = default!;
 }
diff --git a/Content.Shared/Access/AccessLevelPrototype.cs b/Content.Shared/Access/AccessLevelPrototype.cs
index 8cc59271585..e3a3b426b09 100644
--- a/Content.Shared/Access/AccessLevelPrototype.cs
+++ b/Content.Shared/Access/AccessLevelPrototype.cs
@@ -17,5 +17,13 @@ public sealed partial class AccessLevelPrototype : IPrototype
         /// </summary>
         [DataField("name")]
         public string? Name { get; set; }
+
+        public string GetAccessLevelName()
+        {
+            if (Name is { } name)
+                return Loc.GetString(name);
+
+            return ID;
+        }
     }
 }
diff --git a/Content.Shared/Access/Components/AccessComponent.cs b/Content.Shared/Access/Components/AccessComponent.cs
index 2eacf2aa67b..00ee87b3b67 100644
--- a/Content.Shared/Access/Components/AccessComponent.cs
+++ b/Content.Shared/Access/Components/AccessComponent.cs
@@ -20,17 +20,17 @@ public sealed partial class AccessComponent : Component
     [AutoNetworkedField]
     public bool Enabled = true;
 
-    [DataField(customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
+    [DataField]
     [Access(typeof(SharedAccessSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
     [AutoNetworkedField]
-    public HashSet<string> Tags = new();
+    public HashSet<ProtoId<AccessLevelPrototype>> Tags = new();
 
     /// <summary>
     /// Access Groups. These are added to the tags during map init. After map init this will have no effect.
     /// </summary>
-    [DataField(readOnly: true, customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessGroupPrototype>))]
+    [DataField(readOnly: true)]
     [AutoNetworkedField]
-    public HashSet<string> Groups = new();
+    public HashSet<ProtoId<AccessGroupPrototype>> Groups = new();
 }
 
 /// <summary>
@@ -47,9 +47,9 @@ public GetAdditionalAccessEvent()
 }
 
 [ByRefEvent]
-public record struct GetAccessTagsEvent(HashSet<string> Tags, IPrototypeManager PrototypeManager)
+public record struct GetAccessTagsEvent(HashSet<ProtoId<AccessLevelPrototype>> Tags, IPrototypeManager PrototypeManager)
 {
-    public void AddGroup(string group)
+    public void AddGroup(ProtoId<AccessGroupPrototype> group)
     {
         if (!PrototypeManager.TryIndex<AccessGroupPrototype>(group, out var groupPrototype))
             return;
diff --git a/Content.Shared/Access/Components/AccessOverriderComponent.cs b/Content.Shared/Access/Components/AccessOverriderComponent.cs
index 92c09f1ab71..6a1bf2c831a 100644
--- a/Content.Shared/Access/Components/AccessOverriderComponent.cs
+++ b/Content.Shared/Access/Components/AccessOverriderComponent.cs
@@ -25,9 +25,9 @@ public sealed partial class AccessOverriderComponent : Component
     [Serializable, NetSerializable]
     public sealed class WriteToTargetAccessReaderIdMessage : BoundUserInterfaceMessage
     {
-        public readonly List<string> AccessList;
+        public readonly List<ProtoId<AccessLevelPrototype>> AccessList;
 
-        public WriteToTargetAccessReaderIdMessage(List<string> accessList)
+        public WriteToTargetAccessReaderIdMessage(List<ProtoId<AccessLevelPrototype>> accessList)
         {
             AccessList = accessList;
         }
@@ -48,15 +48,15 @@ public sealed class AccessOverriderBoundUserInterfaceState : BoundUserInterfaceS
         public readonly string PrivilegedIdName;
         public readonly bool IsPrivilegedIdPresent;
         public readonly bool IsPrivilegedIdAuthorized;
-        public readonly string[]? TargetAccessReaderIdAccessList;
-        public readonly string[]? AllowedModifyAccessList;
-        public readonly string[]? MissingPrivilegesList;
+        public readonly ProtoId<AccessLevelPrototype>[]? TargetAccessReaderIdAccessList;
+        public readonly ProtoId<AccessLevelPrototype>[]? AllowedModifyAccessList;
+        public readonly ProtoId<AccessLevelPrototype>[]? MissingPrivilegesList;
 
         public AccessOverriderBoundUserInterfaceState(bool isPrivilegedIdPresent,
             bool isPrivilegedIdAuthorized,
-            string[]? targetAccessReaderIdAccessList,
-            string[]? allowedModifyAccessList,
-            string[]? missingPrivilegesList,
+            ProtoId<AccessLevelPrototype>[]? targetAccessReaderIdAccessList,
+            ProtoId<AccessLevelPrototype>[]? allowedModifyAccessList,
+            ProtoId<AccessLevelPrototype>[]? missingPrivilegesList,
             string privilegedIdName,
             string targetLabel,
             Color targetLabelColor)
diff --git a/Content.Shared/Access/Components/AccessReaderComponent.cs b/Content.Shared/Access/Components/AccessReaderComponent.cs
index b1577979223..cbd3f5acd67 100644
--- a/Content.Shared/Access/Components/AccessReaderComponent.cs
+++ b/Content.Shared/Access/Components/AccessReaderComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.StationRecords;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
@@ -23,15 +24,15 @@ public sealed partial class AccessReaderComponent : Component
     /// The set of tags that will automatically deny an allowed check, if any of them are present.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField(customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
-    public HashSet<string> DenyTags = new();
+    [DataField]
+    public HashSet<ProtoId<AccessLevelPrototype>> DenyTags = new();
 
     /// <summary>
     /// List of access groups that grant access to this reader. Only a single matching group is required to gain access.
     /// A group matches if it is a subset of the set being checked against.
     /// </summary>
     [DataField("access")] [ViewVariables(VVAccess.ReadWrite)]
-    public List<HashSet<string>> AccessLists = new();
+    public List<HashSet<ProtoId<AccessLevelPrototype>>> AccessLists = new();
 
     /// <summary>
     /// A list of <see cref="StationRecordKey"/>s that grant access. Only a single matching key is required to gain
@@ -88,9 +89,9 @@ public sealed class AccessReaderComponentState : ComponentState
 {
     public bool Enabled;
 
-    public HashSet<string> DenyTags;
+    public HashSet<ProtoId<AccessLevelPrototype>> DenyTags;
 
-    public List<HashSet<string>> AccessLists;
+    public List<HashSet<ProtoId<AccessLevelPrototype>>> AccessLists;
 
     public List<(NetEntity, uint)> AccessKeys;
 
@@ -98,7 +99,7 @@ public sealed class AccessReaderComponentState : ComponentState
 
     public int AccessLogLimit;
 
-    public AccessReaderComponentState(bool enabled, HashSet<string> denyTags, List<HashSet<string>> accessLists, List<(NetEntity, uint)> accessKeys, Queue<AccessRecord> accessLog, int accessLogLimit)
+    public AccessReaderComponentState(bool enabled, HashSet<ProtoId<AccessLevelPrototype>> denyTags, List<HashSet<ProtoId<AccessLevelPrototype>>> accessLists, List<(NetEntity, uint)> accessKeys, Queue<AccessRecord> accessLog, int accessLogLimit)
     {
         Enabled = enabled;
         DenyTags = denyTags;
@@ -108,3 +109,10 @@ public AccessReaderComponentState(bool enabled, HashSet<string> denyTags, List<H
         AccessLogLimit = accessLogLimit;
     }
 }
+
+public sealed class AccessReaderConfigurationChangedEvent : EntityEventArgs
+{
+    public AccessReaderConfigurationChangedEvent()
+    {
+    }
+}
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
index 252fc2c5f43..417b77855cc 100644
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -3,6 +3,8 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Access.Components;
 
@@ -27,10 +29,10 @@ public sealed class WriteToTargetIdMessage : BoundUserInterfaceMessage
     {
         public readonly string FullName;
         public readonly string JobTitle;
-        public readonly List<string> AccessList;
-        public readonly string JobPrototype;
+        public readonly List<ProtoId<AccessLevelPrototype>> AccessList;
+        public readonly ProtoId<AccessLevelPrototype> JobPrototype;
 
-        public WriteToTargetIdMessage(string fullName, string jobTitle, List<string> accessList, string jobPrototype)
+        public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<AccessLevelPrototype>> accessList, ProtoId<AccessLevelPrototype> jobPrototype)
         {
             FullName = fullName;
             JobTitle = jobTitle;
@@ -99,18 +101,18 @@ public sealed class IdCardConsoleBoundUserInterfaceState : BoundUserInterfaceSta
         public readonly string TargetIdName;
         public readonly string? TargetIdFullName;
         public readonly string? TargetIdJobTitle;
-        public readonly string[]? TargetIdAccessList;
-        public readonly string[]? AllowedModifyAccessList;
-        public readonly string TargetIdJobPrototype;
+        public readonly List<ProtoId<AccessLevelPrototype>>? TargetIdAccessList;
+        public readonly List<ProtoId<AccessLevelPrototype>>? AllowedModifyAccessList;
+        public readonly ProtoId<AccessLevelPrototype> TargetIdJobPrototype;
 
         public IdCardConsoleBoundUserInterfaceState(bool isPrivilegedIdPresent,
             bool isPrivilegedIdAuthorized,
             bool isTargetIdPresent,
             string? targetIdFullName,
             string? targetIdJobTitle,
-            string[]? targetIdAccessList,
-            string[]? allowedModifyAccessList,
-            string targetIdJobPrototype,
+            List<ProtoId<AccessLevelPrototype>>? targetIdAccessList,
+            List<ProtoId<AccessLevelPrototype>>? allowedModifyAccessList,
+            ProtoId<AccessLevelPrototype> targetIdJobPrototype,
             string privilegedIdName,
             string targetIdName)
         {
diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index 812a8e04870..89c08e0a4e7 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -112,11 +112,36 @@ public bool IsAllowed(EntityUid user, EntityUid target, AccessReaderComponent? r
         return false;
     }
 
+    public bool GetMainAccessReader(EntityUid uid, [NotNullWhen(true)] out AccessReaderComponent? component)
+    {
+        component = null;
+        if (!TryComp(uid, out AccessReaderComponent? accessReader))
+            return false;
+
+        component = accessReader;
+
+        if (component.ContainerAccessProvider == null)
+            return true;
+
+        if (!_containerSystem.TryGetContainer(uid, component.ContainerAccessProvider, out var container))
+            return true;
+
+        foreach (var entity in container.ContainedEntities)
+        {
+            if (TryComp(entity, out AccessReaderComponent? containedReader))
+            {
+                component = containedReader;
+                return true;
+            }
+        }
+        return true;
+    }
+
     /// <summary>
     /// Check whether the given access permissions satisfy an access reader's requirements.
     /// </summary>
     public bool IsAllowed(
-        ICollection<string> access,
+        ICollection<ProtoId<AccessLevelPrototype>> access,
         ICollection<StationRecordKey> stationKeys,
         EntityUid target,
         AccessReaderComponent reader)
@@ -142,7 +167,7 @@ public bool IsAllowed(
         return false;
     }
 
-    private bool IsAllowedInternal(ICollection<string> access, ICollection<StationRecordKey> stationKeys, AccessReaderComponent reader)
+    private bool IsAllowedInternal(ICollection<ProtoId<AccessLevelPrototype>> access, ICollection<StationRecordKey> stationKeys, AccessReaderComponent reader)
     {
         return !reader.Enabled
                || AreAccessTagsAllowed(access, reader)
@@ -154,7 +179,7 @@ private bool IsAllowedInternal(ICollection<string> access, ICollection<StationRe
     /// </summary>
     /// <param name="accessTags">A list of access tags</param>
     /// <param name="reader">An access reader to check against</param>
-    public bool AreAccessTagsAllowed(ICollection<string> accessTags, AccessReaderComponent reader)
+    public bool AreAccessTagsAllowed(ICollection<ProtoId<AccessLevelPrototype>> accessTags, AccessReaderComponent reader)
     {
         if (reader.DenyTags.Overlaps(accessTags))
         {
@@ -218,9 +243,9 @@ public HashSet<EntityUid> FindPotentialAccessItems(EntityUid uid)
     /// </summary>
     /// <param name="uid">The entity that is being searched.</param>
     /// <param name="items">All of the items to search for access. If none are passed in, <see cref="FindPotentialAccessItems"/> will be used.</param>
-    public ICollection<string> FindAccessTags(EntityUid uid, HashSet<EntityUid>? items = null)
+    public ICollection<ProtoId<AccessLevelPrototype>> FindAccessTags(EntityUid uid, HashSet<EntityUid>? items = null)
     {
-        HashSet<string>? tags = null;
+        HashSet<ProtoId<AccessLevelPrototype>>? tags = null;
         var owned = false;
 
         items ??= FindPotentialAccessItems(uid);
@@ -230,7 +255,7 @@ public ICollection<string> FindAccessTags(EntityUid uid, HashSet<EntityUid>? ite
             FindAccessTagsItem(ent, ref tags, ref owned);
         }
 
-        return (ICollection<string>?) tags ?? Array.Empty<string>();
+        return (ICollection<ProtoId<AccessLevelPrototype>>?) tags ?? Array.Empty<ProtoId<AccessLevelPrototype>>();
     }
 
     /// <summary>
@@ -260,7 +285,7 @@ public bool FindStationRecordKeys(EntityUid uid, out ICollection<StationRecordKe
     ///     This version merges into a set or replaces the set.
     ///     If owned is false, the existing tag-set "isn't ours" and can't be merged with (is read-only).
     /// </summary>
-    private void FindAccessTagsItem(EntityUid uid, ref HashSet<string>? tags, ref bool owned)
+    private void FindAccessTagsItem(EntityUid uid, ref HashSet<ProtoId<AccessLevelPrototype>>? tags, ref bool owned)
     {
         if (!FindAccessTagsItem(uid, out var targetTags))
         {
@@ -286,6 +311,17 @@ private void FindAccessTagsItem(EntityUid uid, ref HashSet<string>? tags, ref bo
         }
     }
 
+    public void SetAccesses(EntityUid uid, AccessReaderComponent component, List<ProtoId<AccessLevelPrototype>> accesses)
+    {
+        component.AccessLists.Clear();
+        foreach (var access in accesses)
+        {
+            component.AccessLists.Add(new HashSet<ProtoId<AccessLevelPrototype>>(){access});
+        }
+        Dirty(uid, component);
+        RaiseLocalEvent(uid, new AccessReaderConfigurationChangedEvent());
+    }
+
     public bool FindAccessItemsInventory(EntityUid uid, out HashSet<EntityUid> items)
     {
         items = new();
@@ -308,7 +344,7 @@ public bool FindAccessItemsInventory(EntityUid uid, out HashSet<EntityUid> items
     ///     Try to find <see cref="AccessComponent"/> on this item
     ///     or inside this item (if it's pda)
     /// </summary>
-    private bool FindAccessTagsItem(EntityUid uid, out HashSet<string> tags)
+    private bool FindAccessTagsItem(EntityUid uid, out HashSet<ProtoId<AccessLevelPrototype>> tags)
     {
         tags = new();
         var ev = new GetAccessTagsEvent(tags, _prototype);
diff --git a/Content.Shared/Access/Systems/SharedAccessSystem.cs b/Content.Shared/Access/Systems/SharedAccessSystem.cs
index 965ccb24128..a4b04c35597 100644
--- a/Content.Shared/Access/Systems/SharedAccessSystem.cs
+++ b/Content.Shared/Access/Systems/SharedAccessSystem.cs
@@ -51,7 +51,7 @@ public void SetAccessEnabled(EntityUid uid, bool val, AccessComponent? component
         ///     Replaces the set of access tags we have with the provided set.
         /// </summary>
         /// <param name="access">The new access tags</param>
-        public bool TrySetTags(EntityUid uid, IEnumerable<string> newTags, AccessComponent? access = null)
+        public bool TrySetTags(EntityUid uid, IEnumerable<ProtoId<AccessLevelPrototype>> newTags, AccessComponent? access = null)
         {
             if (!Resolve(uid, ref access))
                 return false;
@@ -67,12 +67,12 @@ public bool TrySetTags(EntityUid uid, IEnumerable<string> newTags, AccessCompone
         ///     Gets the set of access tags.
         /// </summary>
         /// <param name="access">The new access tags</param>
-        public IEnumerable<string>? TryGetTags(EntityUid uid, AccessComponent? access = null)
+        public IEnumerable<ProtoId<AccessLevelPrototype>>? TryGetTags(EntityUid uid, AccessComponent? access = null)
         {
             return !Resolve(uid, ref access) ? null : access.Tags;
         }
 
-        public bool TryAddGroups(EntityUid uid, IEnumerable<string> newGroups, AccessComponent? access = null)
+        public bool TryAddGroups(EntityUid uid, IEnumerable<ProtoId<AccessGroupPrototype>> newGroups, AccessComponent? access = null)
         {
             if (!Resolve(uid, ref access))
                 return false;
diff --git a/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs b/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs
index 12e25e1e229..81843b5e2d2 100644
--- a/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs
+++ b/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs
@@ -1,6 +1,9 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Containers.ItemSlots;
 using JetBrains.Annotations;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Access.Systems
 {
@@ -33,5 +36,16 @@ private void OnComponentRemove(EntityUid uid, IdCardConsoleComponent component,
             _itemSlotsSystem.RemoveItemSlot(uid, component.PrivilegedIdSlot);
             _itemSlotsSystem.RemoveItemSlot(uid, component.TargetIdSlot);
         }
+
+        [Serializable, NetSerializable]
+        private sealed class IdCardConsoleComponentState : ComponentState
+        {
+            public List<string> AccessLevels;
+
+            public IdCardConsoleComponentState(List<string> accessLevels)
+            {
+                AccessLevels = accessLevels;
+            }
+        }
     }
 }
diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index a914a8f267d..f5ed2df227c 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -202,7 +202,7 @@ public bool CanChangeDirection(EntityUid uid)
         public bool CanShiver(EntityUid uid)
         {
             var ev = new ShiverAttemptEvent(uid);
-            RaiseLocalEvent(uid, ev);
+            RaiseLocalEvent(uid, ref ev);
 
             return !ev.Cancelled;
         }
@@ -210,7 +210,7 @@ public bool CanShiver(EntityUid uid)
         public bool CanSweat(EntityUid uid)
         {
             var ev = new SweatAttemptEvent(uid);
-            RaiseLocalEvent(uid, ev);
+            RaiseLocalEvent(uid, ref ev);
 
             return !ev.Cancelled;
         }
diff --git a/Content.Shared/Actions/Events/FabricateActionEvent.cs b/Content.Shared/Actions/Events/FabricateActionEvent.cs
new file mode 100644
index 00000000000..7483cb04d98
--- /dev/null
+++ b/Content.Shared/Actions/Events/FabricateActionEvent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Actions.Events;
+
+public sealed partial class FabricateActionEvent : InstantActionEvent
+{
+    [DataField(required: true)]
+    public ProtoId<EntityPrototype> Fabrication;
+}
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index e909f0a8a30..9f3fb964100 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -124,7 +124,7 @@ public bool TryGetActionData(
             return true;
 
         if (logError)
-            Log.Error($"Failed to get action from action entity: {ToPrettyString(uid.Value)}");
+            Log.Error($"Failed to get action from action entity: {ToPrettyString(uid.Value)}. Trace: {Environment.StackTrace}");
 
         return false;
     }
@@ -804,7 +804,7 @@ public void RemoveAction(EntityUid performer, EntityUid? actionId, ActionsCompon
                               || !comp.Actions.Contains(actionId.Value));
 
             if (!GameTiming.ApplyingState)
-                Log.Error($"Attempted to remove an action {ToPrettyString(actionId)} from an entity that it was never attached to: {ToPrettyString(performer)}");
+                Log.Error($"Attempted to remove an action {ToPrettyString(actionId)} from an entity that it was never attached to: {ToPrettyString(performer)}. Trace: {Environment.StackTrace}");
             return;
         }
 
diff --git a/Content.Shared/Administration/AdminData.cs b/Content.Shared/Administration/AdminData.cs
index 5b5873bce36..229edbcd4c3 100644
--- a/Content.Shared/Administration/AdminData.cs
+++ b/Content.Shared/Administration/AdminData.cs
@@ -12,6 +12,11 @@ public sealed class AdminData
         /// </summary>
         public bool Active;
 
+        /// <summary>
+        /// Whether the admin is in stealth mode and won't appear in adminwho to admins without the Stealth flag.
+        /// </summary>
+        public bool Stealth;
+
         /// <summary>
         ///     The admin's title.
         /// </summary>
@@ -56,6 +61,14 @@ public bool CanAdminMenu()
             return HasFlag(AdminFlags.Admin);
         }
 
+        /// <summary>
+        /// Check if this admin can be hidden and see other hidden admins.
+        /// </summary>
+        public bool CanStealth()
+        {
+            return HasFlag(AdminFlags.Stealth);
+        }
+
         public bool CanAdminReloadPrototypes()
         {
             return HasFlag(AdminFlags.Host);
diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs
index 64cf522faaf..9842e638c2c 100644
--- a/Content.Shared/Administration/AdminFlags.cs
+++ b/Content.Shared/Administration/AdminFlags.cs
@@ -96,7 +96,12 @@ public enum AdminFlags : uint
         MassBan = 1 << 15,
 
         /// <summary>
-        ///     DeltaV - The ability to whitelist people. Either this permission or +BAN is required for remove.
+        /// Allows you to remain hidden from adminwho except to other admins with this flag.
+        /// </summary>
+        Stealth = 1 << 16,
+
+        /// <summary>
+        /// DeltaV - The ability to whitelist people. Either this permission or +BAN is required for remove.
         /// </summary>
         Whitelist = 1 << 20,
 
diff --git a/Content.Shared/Administration/AdminFrozenSystem.cs b/Content.Shared/Administration/AdminFrozenSystem.cs
index 14438cc5912..4ec9600b0bd 100644
--- a/Content.Shared/Administration/AdminFrozenSystem.cs
+++ b/Content.Shared/Administration/AdminFrozenSystem.cs
@@ -1,13 +1,10 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
-using Content.Shared.Movement;
 using Content.Shared.Movement.Events;
-using Content.Shared.Physics.Pull;
-using Content.Shared.Pulling;
-using Content.Shared.Pulling.Components;
-using Content.Shared.Pulling.Events;
-using Content.Shared.Stunnable;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Events;
+using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Throwing;
 
 namespace Content.Shared.Administration;
@@ -15,7 +12,7 @@ namespace Content.Shared.Administration;
 public sealed class AdminFrozenSystem : EntitySystem
 {
     [Dependency] private readonly ActionBlockerSystem _blocker = default!;
-    [Dependency] private readonly SharedPullingSystem _pulling = default!;
+    [Dependency] private readonly PullingSystem _pulling = default!;
 
     public override void Initialize()
     {
@@ -45,9 +42,9 @@ private void OnPullAttempt(EntityUid uid, AdminFrozenComponent component, PullAt
 
     private void OnStartup(EntityUid uid, AdminFrozenComponent component, ComponentStartup args)
     {
-        if (TryComp<SharedPullableComponent>(uid, out var pullable))
+        if (TryComp<PullableComponent>(uid, out var pullable))
         {
-            _pulling.TryStopPull(pullable);
+            _pulling.TryStopPull(uid, pullable);
         }
 
         UpdateCanMove(uid, component, args);
diff --git a/Content.Shared/Advertise/MessagePackPrototype.cs b/Content.Shared/Advertise/MessagePackPrototype.cs
new file mode 100644
index 00000000000..f7495d7e468
--- /dev/null
+++ b/Content.Shared/Advertise/MessagePackPrototype.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Advertise;
+
+[Serializable, Prototype("messagePack")]
+public sealed partial class MessagePackPrototype : IPrototype
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    [DataField]
+    public List<LocId> Messages { get; private set; } = [];
+}
diff --git a/Content.Shared/Alert/AlertPrototype.cs b/Content.Shared/Alert/AlertPrototype.cs
index ac43cb45f3b..248cc00ba40 100644
--- a/Content.Shared/Alert/AlertPrototype.cs
+++ b/Content.Shared/Alert/AlertPrototype.cs
@@ -25,6 +25,12 @@ public sealed partial class AlertPrototype : IPrototype
         [DataField("icons", required: true)]
         public List<SpriteSpecifier> Icons = new();
 
+        /// <summary>
+        /// An entity used for displaying the <see cref="Icons"/> in the UI control.
+        /// </summary>
+        [DataField]
+        public EntProtoId AlertViewEntity = "AlertSpriteView";
+
         /// <summary>
         /// Name to show in tooltip window. Accepts formatting.
         /// </summary>
@@ -83,13 +89,9 @@ public sealed partial class AlertPrototype : IPrototype
         /// <returns>the icon path to the texture for the provided severity level</returns>
         public SpriteSpecifier GetIcon(short? severity = null)
         {
-            if (!SupportsSeverity && severity != null)
-            {
-                throw new InvalidOperationException($"This alert ({AlertKey}) does not support severity");
-            }
-
             var minIcons = SupportsSeverity
-                ? MaxSeverity - MinSeverity : 1;
+                ? MaxSeverity - MinSeverity
+                : 1;
 
             if (Icons.Count < minIcons)
                 throw new InvalidOperationException($"Insufficient number of icons given for alert {AlertType}");
diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs
index b917dd692d7..dc323dc64a8 100644
--- a/Content.Shared/Alert/AlertType.cs
+++ b/Content.Shared/Alert/AlertType.cs
@@ -37,6 +37,7 @@ public enum AlertType : byte
         Internals,
         Toxins,
         Muted,
+        Walking,
         VowOfSilence,
         VowBroken,
         Essence,
@@ -52,7 +53,8 @@ public enum AlertType : byte
         SuitPower,
         BorgHealth,
         BorgCrit,
-        BorgDead
+        BorgDead,
+        Offer,
     }
 
 }
diff --git a/Content.Shared/Alert/AlertsSystem.cs b/Content.Shared/Alert/AlertsSystem.cs
index d8737a717aa..5b888e30c4c 100644
--- a/Content.Shared/Alert/AlertsSystem.cs
+++ b/Content.Shared/Alert/AlertsSystem.cs
@@ -80,6 +80,10 @@ public bool TryGetAlertState(EntityUid euid, AlertKey key, out AlertState alertS
     /// <param name="showCooldown">if true, the cooldown will be visibly shown over the alert icon</param>
     public void ShowAlert(EntityUid euid, AlertType alertType, short? severity = null, (TimeSpan, TimeSpan)? cooldown = null, bool autoRemove = false, bool showCooldown = true )
     {
+        // This should be handled as part of networking.
+        if (_timing.ApplyingState)
+            return;
+
         if (!TryComp(euid, out AlertsComponent? alertsComponent))
             return;
 
@@ -148,6 +152,9 @@ public void ClearAlertCategory(EntityUid euid, AlertCategory category)
     /// </summary>
     public void ClearAlert(EntityUid euid, AlertType alertType)
     {
+        if (_timing.ApplyingState)
+            return;
+
         if (!EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent))
             return;
 
diff --git a/Content.Shared/Announcements/Events/AnnouncementSendEvent.cs b/Content.Shared/Announcements/Events/AnnouncementSendEvent.cs
new file mode 100644
index 00000000000..ca75742aed6
--- /dev/null
+++ b/Content.Shared/Announcements/Events/AnnouncementSendEvent.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.Audio;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Announcements.Events;
+
+
+[Serializable, NetSerializable]
+public sealed class AnnouncementSendEvent : EntityEventArgs
+{
+    public string AnnouncerId { get; }
+    public string AnnouncementId { get; }
+    public List<NetUserId> Recipients { get; }
+    public AudioParams AudioParams { get; }
+
+    public AnnouncementSendEvent(string announcerId, string announcementId, List<NetUserId> recipients, AudioParams audioParams)
+    {
+        AnnouncerId = announcerId;
+        AnnouncementId = announcementId;
+        Recipients = recipients;
+        AudioParams = audioParams;
+    }
+}
diff --git a/Content.Shared/Announcements/Prototypes/AnnouncerPrototype.cs b/Content.Shared/Announcements/Prototypes/AnnouncerPrototype.cs
new file mode 100644
index 00000000000..42db148df9c
--- /dev/null
+++ b/Content.Shared/Announcements/Prototypes/AnnouncerPrototype.cs
@@ -0,0 +1,71 @@
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Announcements.Prototypes;
+
+/// <summary>
+///     Defines an announcer and their announcement file paths
+/// </summary>
+[Prototype("announcer")]
+public sealed class AnnouncerPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; } = default!;
+
+    /// <summary>
+    ///     A prefix to add to all announcement paths unless told not to by <see cref="AnnouncementData.IgnoreBasePath"/>
+    /// </summary>
+    /// <remarks>Paths always start in Resources/</remarks>
+    [DataField("basePath")]
+    public string BasePath { get; } = default!;
+
+    /// <summary>
+    ///     Audio parameters to apply to all announcement sounds unless overwritten by <see cref="AnnouncementData.AudioParams"/>
+    /// </summary>
+    [DataField("baseAudioParams")]
+    public AudioParams? BaseAudioParams { get; }
+
+    [DataField("announcements")]
+    public AnnouncementData[] Announcements { get; } = default!;
+}
+
+/// <summary>
+///     Defines a path to an announcement file and that announcement's ID
+/// </summary>
+[DataDefinition]
+public sealed partial class AnnouncementData
+{
+    [DataField("id")]
+    public string ID = default!;
+
+    /// <summary>
+    ///     If true, the <see cref="AnnouncerPrototype.BasePath"/> will not be prepended to this announcement's path
+    /// </summary>
+    [DataField("ignoreBasePath")]
+    public bool IgnoreBasePath = false;
+
+    /// <summary>
+    ///     Where to look for the announcement audio file
+    /// </summary>
+    [DataField("path")]
+    public string? Path;
+
+    /// <summary>
+    ///    Use a soundCollection instead of a single sound
+    /// </summary>
+    [DataField("collection"), ValidatePrototypeId<SoundCollectionPrototype>]
+    public string? Collection;
+
+    /// <summary>
+    ///     Overrides the default announcement message for this announcement type
+    /// </summary>
+    [DataField("message")]
+    public string? MessageOverride;
+
+    /// <summary>
+    ///     Audio parameters to apply to this announcement sound
+    ///     Will override <see cref="AnnouncerPrototype.BaseAudioParams"/>
+    /// </summary>
+    [DataField("audioParams")]
+    public AudioParams? AudioParams;
+}
diff --git a/Content.Shared/Announcements/Systems/SharedAnnouncerSystem.cs b/Content.Shared/Announcements/Systems/SharedAnnouncerSystem.cs
new file mode 100644
index 00000000000..c29513285e1
--- /dev/null
+++ b/Content.Shared/Announcements/Systems/SharedAnnouncerSystem.cs
@@ -0,0 +1,152 @@
+using System.Linq;
+using System.Text.RegularExpressions;
+using Content.Shared.Announcements.Prototypes;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Announcements.Systems;
+
+public abstract class SharedAnnouncerSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+
+
+    /// <summary>
+    ///     Gets an announcement path from the announcer
+    /// </summary>
+    /// <param name="announcementId">ID of the announcement from the announcer to get information for</param>
+    /// <param name="announcerId">ID of the announcer to use instead of the current one</param>
+    public string GetAnnouncementPath(string announcementId, string announcerId)
+    {
+        if (!_proto.TryIndex<AnnouncerPrototype>(announcerId, out var announcer))
+            return "";
+
+        // Get the announcement data from the announcer
+        // Will be the fallback if the data for the announcementId is not found
+        var announcementType = announcer.Announcements.FirstOrDefault(a => a.ID == announcementId) ??
+            announcer.Announcements.First(a => a.ID.ToLower() == "fallback");
+
+        // If the greedy announcementType wants to do the job of announcer, ignore the base path and just return the path
+        if (announcementType.IgnoreBasePath)
+            return announcementType.Path!;
+        // If the announcementType has a collection, get the sound from the collection
+        if (announcementType.Collection != null)
+            return _audio.GetSound(new SoundCollectionSpecifier(announcementType.Collection));
+        // If nothing is overriding the base paths, return the base path + the announcement file path
+        return $"{announcer.BasePath}/{announcementType.Path}";
+    }
+
+    /// <summary>
+    ///     Gets audio params from the announcer
+    /// </summary>
+    /// <param name="announcementId">ID of the announcement from the announcer to get information for</param>
+    /// <param name="announcer">Announcer prototype to get information from</param>
+    public string GetAnnouncementPath(string announcementId, AnnouncerPrototype announcer)
+    {
+        // Get the announcement data from the announcer
+        // Will be the fallback if the data for the announcementId is not found
+        var announcementType = announcer.Announcements.FirstOrDefault(a => a.ID == announcementId) ??
+            announcer.Announcements.First(a => a.ID.ToLower() == "fallback");
+
+        // If the greedy announcementType wants to do the job of announcer, ignore the base path and just return the path
+        if (announcementType.IgnoreBasePath)
+            return announcementType.Path!;
+        // If the announcementType has a collection, get the sound from the collection
+        if (announcementType.Collection != null)
+            return _audio.GetSound(new SoundCollectionSpecifier(announcementType.Collection));
+        // If nothing is overriding the base paths, return the base path + the announcement file path
+        return $"{announcer.BasePath}/{announcementType.Path}";
+    }
+
+    /// <summary>
+    ///     Converts a prototype ID to a consistently used format for announcements
+    /// </summary>
+    public string GetAnnouncementId(string announcementId, bool ended = false)
+    {
+        // Replace the first letter with lowercase
+        var id = char.ToLowerInvariant(announcementId[0]) + announcementId[1..];
+
+        // If the event has ended, add "Complete" to the end
+        if (ended)
+            id += "Complete";
+
+        return id;
+    }
+
+
+    /// <summary>
+    ///     Gets audio params from the announcer
+    /// </summary>
+    /// <param name="announcementId">ID of the announcement from the announcer to get information from</param>
+    /// <param name="announcerId">ID of the announcer to use instead of the current one</param>
+    public AudioParams? GetAudioParams(string announcementId, string announcerId)
+    {
+        if (!_proto.TryIndex<AnnouncerPrototype>(announcerId, out var announcer))
+            return null;
+
+        // Get the announcement data from the announcer
+        // Will be the fallback if the data for the announcementId is not found
+        var announcementType = announcer.Announcements.FirstOrDefault(a => a.ID == announcementId) ??
+            announcer.Announcements.First(a => a.ID == "fallback");
+
+        // Return the announcer.BaseAudioParams if the announcementType doesn't have an override
+        return announcementType.AudioParams ?? announcer.BaseAudioParams ?? null; // For some reason the formatter doesn't warn me about "?? null" being redundant, so it stays
+    }
+
+    /// <summary>
+    ///     Gets audio params from the announcer
+    /// </summary>
+    /// <param name="announcementId">ID of the announcement from the announcer to get information from</param>
+    /// <param name="announcer">Announcer prototype to get information from</param>
+    public AudioParams? GetAudioParams(string announcementId, AnnouncerPrototype announcer)
+    {
+        // Get the announcement data from the announcer
+        // Will be the fallback if the data for the announcementId is not found
+        var announcementType = announcer.Announcements.FirstOrDefault(a => a.ID == announcementId) ??
+            announcer.Announcements.First(a => a.ID == "fallback");
+
+        // Return the announcer.BaseAudioParams if the announcementType doesn't have an override
+        return announcementType.AudioParams ?? announcer.BaseAudioParams;
+    }
+
+
+    /// <summary>
+    ///     Gets an announcement message from the announcer
+    /// </summary>
+    /// <param name="announcementId">ID of the announcement from the announcer to get information from</param>
+    /// <param name="announcerId">ID of the announcer to get information from</param>
+    /// <param name="localeArgs">Locale arguments to pass to the overwritten announcement</param>
+    public string? GetAnnouncementMessage(string announcementId, string announcerId,
+        params (string, object)[] localeArgs)
+    {
+        if (!_proto.TryIndex<AnnouncerPrototype>(announcerId, out var announcer))
+            return null;
+
+        // Get the announcement data from the announcer
+        // Will be the fallback if the data for the announcementId is not found
+        var announcementType = announcer.Announcements.FirstOrDefault(a => a.ID == announcementId) ??
+            announcer.Announcements.First(a => a.ID == "fallback");
+
+        // Return the announcementType.MessageOverride if it exists, otherwise return null
+        return announcementType.MessageOverride != null ? Loc.GetString(announcementType.MessageOverride, localeArgs) : null;
+    }
+
+    /// <summary>
+    ///     Gets an announcement message from an event ID
+    /// </summary>
+    /// <param name="eventId">ID of the event to convert</param>
+    /// <param name="localeBase">Format for the locale string, replaces "{}" with the converted ID</param>
+    /// <remarks>The IDs use a hardcoded format, you can probably handle other formats yourself</remarks>
+    /// <returns>Localized announcement</returns>
+    public string GetEventLocaleString(string eventId, string localeBase = "station-event-{}-announcement")
+    {
+        // Replace capital letters with lowercase plus a hyphen before it
+        var capsCapture = new Regex("([A-Z])");
+        var id = capsCapture.Replace(eventId, "-$1").ToLower();
+
+        // Replace {} with the converted ID
+        return localeBase.Replace("{}", id);
+    }
+}
diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
index bafdf123600..3878aeb81cb 100644
--- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Anomaly.Prototypes;
 using Content.Shared.Damage;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
@@ -94,13 +95,13 @@ public sealed partial class AnomalyComponent : Component
     /// The minimum interval between pulses.
     /// </summary>
     [DataField]
-    public TimeSpan MinPulseLength = TimeSpan.FromMinutes(1);
+    public TimeSpan MinPulseLength = TimeSpan.FromMinutes(2);
 
     /// <summary>
     /// The maximum interval between pulses.
     /// </summary>
     [DataField]
-    public TimeSpan MaxPulseLength = TimeSpan.FromMinutes(2);
+    public TimeSpan MaxPulseLength = TimeSpan.FromMinutes(4);
 
     /// <summary>
     /// A percentage by which the length of a pulse might vary.
@@ -166,6 +167,12 @@ public sealed partial class AnomalyComponent : Component
     [DataField]
     public AnomalousParticleType WeakeningParticleType;
 
+    /// <summary>
+    /// The particle type that change anomaly behaviour.
+    /// </summary>
+    [DataField]
+    public AnomalousParticleType TransformationParticleType;
+
     #region Points and Vessels
     /// <summary>
     /// The vessel that the anomaly is connceted to. Stored so that multiple
@@ -185,7 +192,7 @@ public sealed partial class AnomalyComponent : Component
     /// This doesn't include the point bonus for being unstable.
     /// </summary>
     [DataField("maxPointsPerSecond")]
-    public int MaxPointsPerSecond = 80;
+    public int MaxPointsPerSecond = 70;
 
     /// <summary>
     /// The multiplier applied to the point value for the
@@ -221,6 +228,31 @@ public sealed partial class AnomalyComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public EntProtoId? CoreInertPrototype;
 
+    #region Behavior Deviations
+
+    [DataField]
+    public ProtoId<AnomalyBehaviorPrototype>? CurrentBehavior;
+
+    /// <summary>
+    /// Presumption of anomaly to change behavior. The higher the number, the higher the chance that the anomaly will change its behavior.
+    /// </summary>
+    [DataField]
+    public float Continuity = 0f;
+
+    /// <summary>
+    /// Minimum contituty probability chance, that can be selected by anomaly on MapInit
+    /// </summary>
+    [DataField]
+    public float MinContituty = 0.1f;
+
+    /// <summary>
+    /// Maximum contituty probability chance, that can be selected by anomaly on MapInit
+    /// </summary>
+    [DataField]
+    public float MaxContituty = 1.0f;
+
+    #endregion
+
     #region Floating Animation
     /// <summary>
     /// How long it takes to go from the bottom of the animation to the top.
@@ -247,13 +279,13 @@ public sealed partial class AnomalyComponent : Component
 /// <param name="Stability"></param>
 /// <param name="Severity"></param>
 [ByRefEvent]
-public readonly record struct AnomalyPulseEvent(EntityUid Anomaly, float Stability, float Severity);
+public readonly record struct AnomalyPulseEvent(EntityUid Anomaly, float Stability, float Severity, float PowerModifier);
 
 /// <summary>
 /// Event raised on an anomaly when it reaches a supercritical point.
 /// </summary>
 [ByRefEvent]
-public readonly record struct AnomalySupercriticalEvent(EntityUid Anomaly);
+public readonly record struct AnomalySupercriticalEvent(EntityUid Anomaly, float PowerModifier);
 
 /// <summary>
 /// Event broadcast after an anomaly goes supercritical
@@ -282,3 +314,9 @@ public sealed partial class AnomalyComponent : Component
 /// <param name="Anomaly">The anomaly being changed</param>
 [ByRefEvent]
 public readonly record struct AnomalyHealthChangedEvent(EntityUid Anomaly, float Health);
+
+/// <summary>
+/// Event broadcast when an anomaly's behavior is changed.
+/// </summary>
+[ByRefEvent]
+public readonly record struct AnomalyBehaviorChangedEvent(EntityUid Anomaly, ProtoId<AnomalyBehaviorPrototype>? Old, ProtoId<AnomalyBehaviorPrototype>? New);
diff --git a/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs b/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
index f4b7cc8bf4f..4c3cdb01465 100644
--- a/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
+++ b/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects.Components;
 using Content.Shared.Ghost;
@@ -27,8 +27,8 @@ public override void Initialize()
     private void OnAnomalyPulse(EntityUid uid, GravityAnomalyComponent component, ref AnomalyPulseEvent args)
     {
         var xform = Transform(uid);
-        var range = component.MaxThrowRange * args.Severity;
-        var strength = component.MaxThrowStrength * args.Severity;
+        var range = component.MaxThrowRange * args.Severity * args.PowerModifier;
+        var strength = component.MaxThrowStrength * args.Severity * args.PowerModifier;
         var lookup = _lookup.GetEntitiesInRange(uid, range, LookupFlags.Dynamic | LookupFlags.Sundries);
         var xformQuery = GetEntityQuery<TransformComponent>();
         var worldPos = _xform.GetWorldPosition(xform, xformQuery);
@@ -61,8 +61,8 @@ private void OnSupercritical(EntityUid uid, GravityAnomalyComponent component, r
         var tiles = tileref.Select(t => (t.GridIndices, Tile.Empty)).ToList();
         _mapSystem.SetTiles(xform.GridUid.Value, grid, tiles);
 
-        var range = component.MaxThrowRange * 2;
-        var strength = component.MaxThrowStrength * 2;
+        var range = component.MaxThrowRange * 2 * args.PowerModifier;
+        var strength = component.MaxThrowStrength * 2 * args.PowerModifier;
         var lookup = _lookup.GetEntitiesInRange(uid, range, LookupFlags.Dynamic | LookupFlags.Sundries);
         var xformQuery = GetEntityQuery<TransformComponent>();
         var physQuery = GetEntityQuery<PhysicsComponent>();
diff --git a/Content.Shared/Anomaly/Prototypes/AnomalyBehaviorPrototype.cs b/Content.Shared/Anomaly/Prototypes/AnomalyBehaviorPrototype.cs
new file mode 100644
index 00000000000..c498f5c595d
--- /dev/null
+++ b/Content.Shared/Anomaly/Prototypes/AnomalyBehaviorPrototype.cs
@@ -0,0 +1,45 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Anomaly.Prototypes;
+
+[Prototype]
+public sealed partial class AnomalyBehaviorPrototype : IPrototype
+{
+    [IdDataField] public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// Description for anomaly scanner
+    /// </summary>
+    [DataField]
+    public string Description = string.Empty;
+
+    /// <summary>
+    /// modification of the number of points earned from an anomaly
+    /// </summary>
+    [DataField]
+    public float EarnPointModifier = 1f;
+
+    /// <summary>
+    /// deceleration or acceleration of the pulsation frequency of the anomaly
+    /// </summary>
+    [DataField]
+    public float PulseFrequencyModifier = 1f;
+
+    /// <summary>
+    /// pulse and supercrit power modifier
+    /// </summary>
+    [DataField]
+    public float PulsePowerModifier = 1f;
+
+    /// <summary>
+    /// how much the particles will affect the anomaly
+    /// </summary>
+    [DataField]
+    public float ParticleSensivity = 1f;
+
+    /// <summary>
+    /// Components that are added to the anomaly when this behavior is selected, and removed when another behavior is selected.
+    /// </summary>
+    [DataField(serverOnly: true)]
+    public ComponentRegistry Components = new();
+}
diff --git a/Content.Shared/Anomaly/SharedAnomaly.cs b/Content.Shared/Anomaly/SharedAnomaly.cs
index b7585cb5f14..cde61ca3366 100644
--- a/Content.Shared/Anomaly/SharedAnomaly.cs
+++ b/Content.Shared/Anomaly/SharedAnomaly.cs
@@ -33,6 +33,7 @@ public enum AnomalousParticleType : byte
     Delta,
     Epsilon,
     Zeta,
+    Sigma,
     Default
 }
 
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index c335cd7b858..da1d31c6ff6 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Anomaly.Components;
+using Content.Shared.Anomaly.Prototypes;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
@@ -14,6 +15,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;
 using Robust.Shared.Utility;
@@ -33,6 +35,7 @@ public abstract class SharedAnomalySystem : EntitySystem
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
@@ -90,8 +93,7 @@ public void DoAnomalyPulse(EntityUid uid, AnomalyComponent? component = null)
             return;
 
         DebugTools.Assert(component.MinPulseLength > TimeSpan.FromSeconds(3)); // this is just to prevent lagspikes mispredicting pulses
-        var variation = Random.NextFloat(-component.PulseVariation, component.PulseVariation) + 1;
-        component.NextPulseTime = Timing.CurTime + GetPulseLength(component) * variation;
+        RefreshPulseTimer(uid, component);
 
         if (_net.IsServer)
             Log.Info($"Performing anomaly pulse. Entity: {ToPrettyString(uid)}");
@@ -115,10 +117,25 @@ public void DoAnomalyPulse(EntityUid uid, AnomalyComponent? component = null)
         pulse.EndTime  = Timing.CurTime + pulse.PulseDuration;
         Appearance.SetData(uid, AnomalyVisuals.IsPulsing, true);
 
-        var ev = new AnomalyPulseEvent(uid, component.Stability, component.Severity);
+        var powerMod = 1f;
+        if (component.CurrentBehavior != null)
+        {
+            var beh = _prototype.Index<AnomalyBehaviorPrototype>(component.CurrentBehavior);
+            powerMod = beh.PulsePowerModifier;
+        }
+        var ev = new AnomalyPulseEvent(uid, component.Stability, component.Severity, powerMod);
         RaiseLocalEvent(uid, ref ev, true);
     }
 
+    public void RefreshPulseTimer(EntityUid uid, AnomalyComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        var variation = Random.NextFloat(-component.PulseVariation, component.PulseVariation) + 1;
+        component.NextPulseTime = Timing.CurTime + GetPulseLength(component) * variation;
+    }
+
     /// <summary>
     /// Begins the animation for going supercritical
     /// </summary>
@@ -159,7 +176,14 @@ public void DoAnomalySupercriticalEvent(EntityUid uid, AnomalyComponent? compone
         if (_net.IsServer)
             Log.Info($"Raising supercritical event. Entity: {ToPrettyString(uid)}");
 
-        var ev = new AnomalySupercriticalEvent(uid);
+        var powerMod = 1f;
+        if (component.CurrentBehavior != null)
+        {
+            var beh = _prototype.Index<AnomalyBehaviorPrototype>(component.CurrentBehavior);
+            powerMod = beh.PulsePowerModifier;
+        }
+
+        var ev = new AnomalySupercriticalEvent(uid, powerMod);
         RaiseLocalEvent(uid, ref ev, true);
 
         EndAnomaly(uid, component, true);
@@ -276,8 +300,17 @@ public void ChangeAnomalyHealth(EntityUid uid, float change, AnomalyComponent? c
     public TimeSpan GetPulseLength(AnomalyComponent component)
     {
         DebugTools.Assert(component.MaxPulseLength > component.MinPulseLength);
-        var modifier = Math.Clamp((component.Stability - component.GrowthThreshold) /  component.GrowthThreshold, 0, 1);
-        return (component.MaxPulseLength - component.MinPulseLength) * modifier + component.MinPulseLength;
+        var modifier = Math.Clamp((component.Stability - component.GrowthThreshold) / component.GrowthThreshold, 0, 1);
+
+        var lenght = (component.MaxPulseLength - component.MinPulseLength) * modifier + component.MinPulseLength;
+
+        //Apply behavior modifier
+        if (component.CurrentBehavior != null)
+        {
+            var behavior = _prototype.Index(component.CurrentBehavior.Value);
+            lenght *= behavior.PulseFrequencyModifier;
+        }
+        return lenght;
     }
 
     /// <summary>
@@ -335,14 +368,14 @@ public override void Update(float frameTime)
     /// <summary>
     /// Gets random points around the anomaly based on the given parameters.
     /// </summary>
-    public List<TileRef>? GetSpawningPoints(EntityUid uid, float stability, float severity, AnomalySpawnSettings settings)
+    public List<TileRef>? GetSpawningPoints(EntityUid uid, float stability, float severity, AnomalySpawnSettings settings, float powerModifier = 1f)
     {
         var xform = Transform(uid);
 
         if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
             return null;
 
-        var amount = (int) (MathHelper.Lerp(settings.MinAmount, settings.MaxAmount, severity * stability) + 0.5f);
+        var amount = (int) (MathHelper.Lerp(settings.MinAmount, settings.MaxAmount, severity * stability * powerModifier) + 0.5f);
 
         var localpos = xform.Coordinates.Position;
         var tilerefs = grid.GetLocalTilesIntersecting(
diff --git a/Content.Shared/Atmos/AtmosDirection.cs b/Content.Shared/Atmos/AtmosDirection.cs
index a25c9d553c5..09ba521aa96 100644
--- a/Content.Shared/Atmos/AtmosDirection.cs
+++ b/Content.Shared/Atmos/AtmosDirection.cs
@@ -1,4 +1,5 @@
-using System.Runtime.CompilerServices;
+using System.Numerics;
+using System.Runtime.CompilerServices;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Atmos
@@ -15,6 +16,8 @@ public enum AtmosDirection
         South   = 1 << 1,                   // 2
         East    = 1 << 2,                   // 4
         West    = 1 << 3,                   // 8
+        // If more directions are added, note that AtmosDirectionHelpers.ToOppositeIndex() expects opposite directions
+        // to come in pairs
 
         NorthEast = North | East,           // 5
         SouthEast = South | East,           // 6
@@ -42,6 +45,22 @@ public static AtmosDirection GetOpposite(this AtmosDirection direction)
             };
         }
 
+        /// <summary>
+        /// This returns the index that corresponds to the opposite direction of some other direction index.
+        /// I.e., <c>1&lt;&lt;OppositeIndex(i) == (1&lt;&lt;i).GetOpposite()</c>
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int ToOppositeIndex(this int index)
+        {
+            return index ^ 1;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static AtmosDirection ToOppositeDir(this int index)
+        {
+            return (AtmosDirection) (1 << (index ^ 1));
+        }
+
         public static Direction ToDirection(this AtmosDirection direction)
         {
             return direction switch
@@ -119,10 +138,11 @@ public static AtmosDirection ToAtmosDirection(this Angle angle)
             return angle.GetDir().ToAtmosDirection();
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static int ToIndex(this AtmosDirection direction)
         {
             // This will throw if you pass an invalid direction. Not this method's fault, but yours!
-            return (int) Math.Log2((int) direction);
+            return BitOperations.Log2((uint)direction);
         }
 
         public static AtmosDirection WithFlag(this AtmosDirection direction, AtmosDirection other)
diff --git a/Content.Shared/Audio/SharedAmbientSoundSystem.cs b/Content.Shared/Audio/SharedAmbientSoundSystem.cs
index 5f17261825c..0a52b7c58e2 100644
--- a/Content.Shared/Audio/SharedAmbientSoundSystem.cs
+++ b/Content.Shared/Audio/SharedAmbientSoundSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Mobs;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
@@ -12,6 +13,7 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<AmbientSoundComponent, ComponentGetState>(GetCompState);
         SubscribeLocalEvent<AmbientSoundComponent, ComponentHandleState>(HandleCompState);
+
         _query = GetEntityQuery<AmbientSoundComponent>();
     }
 
diff --git a/Content.Shared/Audio/SoundWhileAliveComponent.cs b/Content.Shared/Audio/SoundWhileAliveComponent.cs
new file mode 100644
index 00000000000..977d9372ce2
--- /dev/null
+++ b/Content.Shared/Audio/SoundWhileAliveComponent.cs
@@ -0,0 +1,10 @@
+using Content.Shared.Sound.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Audio;
+
+/// <summary>
+/// Toggles <see cref="AmbientSoundComponent"/> and <see cref="SpamEmitSoundComponent"/> off when this entity's MobState isn't Alive.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SoundWhileAliveComponent : Component;
diff --git a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
index f14dc21c480..c3fa21e293e 100644
--- a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
+++ b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.GameTicking;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
+using Content.Shared.Mobs.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
@@ -22,6 +23,7 @@ public abstract class SharedCryostorageSystem : EntitySystem
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] protected readonly SharedMindSystem Mind = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     protected EntityUid? PausedMap { get; private set; }
 
@@ -81,6 +83,12 @@ private void OnInsertAttempt(Entity<CryostorageComponent> ent, ref ContainerIsIn
         if (args.Container.ID != comp.ContainerId)
             return;
 
+        if (_mobState.IsIncapacitated(args.EntityUid))
+        {
+            args.Cancel();
+            return;
+        }
+
         if (!TryComp<MindContainerComponent>(args.EntityUid, out var mindContainer))
         {
             args.Cancel();
diff --git a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
index 4e4bc2c574b..c6248c88f77 100644
--- a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
@@ -37,7 +37,7 @@ private void OnMapInit(EntityUid uid, SleepingComponent component, MapInitEvent
             _actionsSystem.AddAction(uid, ref component.WakeAction, WakeActionId, uid);
 
             // TODO remove hardcoded time.
-            _actionsSystem.SetCooldown(component.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(15));
+            _actionsSystem.SetCooldown(component.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(2f));
         }
 
         private void OnShutdown(EntityUid uid, SleepingComponent component, ComponentShutdown args)
diff --git a/Content.Shared/Bed/Sleep/SleepEmitSoundComponent.cs b/Content.Shared/Bed/Sleep/SleepEmitSoundComponent.cs
index 6313f633f21..9250a330777 100644
--- a/Content.Shared/Bed/Sleep/SleepEmitSoundComponent.cs
+++ b/Content.Shared/Bed/Sleep/SleepEmitSoundComponent.cs
@@ -12,16 +12,16 @@ public sealed partial class SleepEmitSoundComponent : Component
     public SoundSpecifier Snore = new SoundCollectionSpecifier("Snores", AudioParams.Default.WithVariation(0.2f));
 
     /// <summary>
-    /// Interval between snore attempts in seconds
+    /// Minimum interval between snore attempts in seconds
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float Interval = 5f;
+    public TimeSpan Interval = TimeSpan.FromSeconds(5);
 
     /// <summary>
-    /// Chance for snore attempt to succeed
+    /// Maximum interval between snore attempts in seconds
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float Chance = 0.33f;
+    public TimeSpan MaxInterval = TimeSpan.FromSeconds(15);
 
     /// <summary>
     /// Popup for snore (e.g. Zzz...)
diff --git a/Content.Shared/Body/Events/MechanismBodyEvents.cs b/Content.Shared/Body/Events/MechanismBodyEvents.cs
index b52a333613f..968b172aef5 100644
--- a/Content.Shared/Body/Events/MechanismBodyEvents.cs
+++ b/Content.Shared/Body/Events/MechanismBodyEvents.cs
@@ -1,61 +1,28 @@
-namespace Content.Shared.Body.Events
-{
-    // All of these events are raised on a mechanism entity when added/removed to a body in different
-    // ways.
-
-    /// <summary>
-    ///     Raised on a mechanism when it is added to a body part.
-    /// </summary>
-    public sealed class AddedToPartEvent : EntityEventArgs
-    {
-        public EntityUid Part;
-
-        public AddedToPartEvent(EntityUid part)
-        {
-            Part = part;
-        }
-    }
-
-    /// <summary>
-    ///     Raised on a mechanism when it is added to a body part within a body.
-    /// </summary>
-    public sealed class AddedToPartInBodyEvent : EntityEventArgs
-    {
-        public EntityUid Body;
-        public EntityUid Part;
-
-        public AddedToPartInBodyEvent(EntityUid body, EntityUid part)
-        {
-            Body = body;
-            Part = part;
-        }
-    }
-
-    /// <summary>
-    ///     Raised on a mechanism when it is removed from a body part.
-    /// </summary>
-    public sealed class RemovedFromPartEvent : EntityEventArgs
-    {
-        public EntityUid OldPart;
-
-        public RemovedFromPartEvent(EntityUid oldPart)
-        {
-            OldPart = oldPart;
-        }
-    }
-
-    /// <summary>
-    ///     Raised on a mechanism when it is removed from a body part within a body.
-    /// </summary>
-    public sealed class RemovedFromPartInBodyEvent : EntityEventArgs
-    {
-        public EntityUid OldBody;
-        public EntityUid OldPart;
-
-        public RemovedFromPartInBodyEvent(EntityUid oldBody, EntityUid oldPart)
-        {
-            OldBody = oldBody;
-            OldPart = oldPart;
-        }
-    }
-}
+namespace Content.Shared.Body.Events;
+
+// All of these events are raised on a mechanism entity when added/removed to a body in different
+// ways.
+
+/// <summary>
+/// Raised on a mechanism when it is added to a body part.
+/// </summary>
+[ByRefEvent]
+public readonly record struct OrganAddedEvent(EntityUid Part);
+
+/// <summary>
+/// Raised on a mechanism when it is added to a body part within a body.
+/// </summary>
+[ByRefEvent]
+public readonly record struct OrganAddedToBodyEvent(EntityUid Body, EntityUid Part);
+
+/// <summary>
+/// Raised on a mechanism when it is removed from a body part.
+/// </summary>
+[ByRefEvent]
+public readonly record struct OrganRemovedEvent(EntityUid OldPart);
+
+/// <summary>
+/// Raised on a mechanism when it is removed from a body part within a body.
+/// </summary>
+[ByRefEvent]
+public readonly record struct OrganRemovedFromBodyEvent(EntityUid OldBody, EntityUid OldPart);
diff --git a/Content.Shared/Body/Events/ShiverAttemptEvent.cs b/Content.Shared/Body/Events/ShiverAttemptEvent.cs
index 8c2761f545d..e9400bc48d7 100644
--- a/Content.Shared/Body/Events/ShiverAttemptEvent.cs
+++ b/Content.Shared/Body/Events/ShiverAttemptEvent.cs
@@ -1,12 +1,8 @@
-namespace Content.Shared.Body.Events
-{
-    public sealed class ShiverAttemptEvent : CancellableEntityEventArgs
-    {
-        public ShiverAttemptEvent(EntityUid uid)
-        {
-            Uid = uid;
-        }
+namespace Content.Shared.Body.Events;
 
-        public EntityUid Uid { get; }
-    }
+[ByRefEvent]
+public record struct ShiverAttemptEvent(EntityUid Uid)
+{
+    public readonly EntityUid Uid = Uid;
+    public bool Cancelled = false;
 }
diff --git a/Content.Shared/Body/Events/SweatAttemptEvent.cs b/Content.Shared/Body/Events/SweatAttemptEvent.cs
index 7f4b3fab15d..7506538c439 100644
--- a/Content.Shared/Body/Events/SweatAttemptEvent.cs
+++ b/Content.Shared/Body/Events/SweatAttemptEvent.cs
@@ -1,12 +1,8 @@
-namespace Content.Shared.Body.Events
-{
-    public sealed class SweatAttemptEvent : CancellableEntityEventArgs
-    {
-        public SweatAttemptEvent(EntityUid uid)
-        {
-            Uid = uid;
-        }
+namespace Content.Shared.Body.Events;
 
-        public EntityUid Uid { get; }
-    }
+[ByRefEvent]
+public record struct SweatAttemptEvent(EntityUid Uid)
+{
+    public readonly EntityUid Uid = Uid;
+    public bool Cancelled = false;
 }
diff --git a/Content.Shared/Body/Organ/OrganComponent.cs b/Content.Shared/Body/Organ/OrganComponent.cs
index 9e1de6b3559..3048927b5fb 100644
--- a/Content.Shared/Body/Organ/OrganComponent.cs
+++ b/Content.Shared/Body/Organ/OrganComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Systems;
+using Content.Shared.Body.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 
@@ -11,6 +11,6 @@ public sealed partial class OrganComponent : Component
     /// <summary>
     /// Relevant body this organ is attached to.
     /// </summary>
-    [DataField("body"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntityUid? Body;
 }
diff --git a/Content.Shared/Body/Part/BodyPartEvents.cs b/Content.Shared/Body/Part/BodyPartEvents.cs
index 4dbc543fc8e..0d8d2c8a268 100644
--- a/Content.Shared/Body/Part/BodyPartEvents.cs
+++ b/Content.Shared/Body/Part/BodyPartEvents.cs
@@ -1,7 +1,7 @@
-namespace Content.Shared.Body.Part;
+namespace Content.Shared.Body.Part;
 
 [ByRefEvent]
-public readonly record struct BodyPartAddedEvent(string Slot, BodyPartComponent Part);
+public readonly record struct BodyPartAddedEvent(string Slot, Entity<BodyPartComponent> Part);
 
 [ByRefEvent]
-public readonly record struct BodyPartRemovedEvent(string Slot, BodyPartComponent Part);
+public readonly record struct BodyPartRemovedEvent(string Slot, Entity<BodyPartComponent> Part);
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
index bc7cf63124c..1a35afdbe00 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
@@ -9,7 +9,6 @@
 using Content.Shared.Gibbing.Events;
 using Content.Shared.Gibbing.Systems;
 using Content.Shared.Inventory;
-using Content.Shared.Inventory.Events;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -30,8 +29,10 @@ public partial class SharedBodySystem
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly GibbingSystem _gibbingSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+
     private const float GibletLaunchImpulse = 8;
     private const float GibletLaunchImpulseVariance = 3;
+
     private void InitializeBody()
     {
         // Body here to handle root body parts.
@@ -43,7 +44,7 @@ private void InitializeBody()
         SubscribeLocalEvent<BodyComponent, CanDragEvent>(OnBodyCanDrag);
     }
 
-    private void OnBodyInserted(EntityUid uid, BodyComponent component, EntInsertedIntoContainerMessage args)
+    private void OnBodyInserted(Entity<BodyComponent> ent, ref EntInsertedIntoContainerMessage args)
     {
         // Root body part?
         var slotId = args.Container.ID;
@@ -51,21 +52,21 @@ private void OnBodyInserted(EntityUid uid, BodyComponent component, EntInsertedI
         if (slotId != BodyRootContainerId)
             return;
 
-        var entity = args.Entity;
+        var insertedUid = args.Entity;
 
-        if (TryComp(entity, out BodyPartComponent? childPart))
+        if (TryComp(insertedUid, out BodyPartComponent? part))
         {
-            AddPart(uid, entity, slotId, childPart);
-            RecursiveBodyUpdate(entity, uid, childPart);
+            AddPart((ent, ent), (insertedUid, part), slotId);
+            RecursiveBodyUpdate((insertedUid, part), ent);
         }
 
-        if (TryComp(entity, out OrganComponent? organ))
+        if (TryComp(insertedUid, out OrganComponent? organ))
         {
-            AddOrgan(entity, uid, uid, organ);
+            AddOrgan((insertedUid, organ), ent, ent);
         }
     }
 
-    private void OnBodyRemoved(EntityUid uid, BodyComponent component, EntRemovedFromContainerMessage args)
+    private void OnBodyRemoved(Entity<BodyComponent> ent, ref EntRemovedFromContainerMessage args)
     {
         // Root body part?
         var slotId = args.Container.ID;
@@ -73,55 +74,55 @@ private void OnBodyRemoved(EntityUid uid, BodyComponent component, EntRemovedFro
         if (slotId != BodyRootContainerId)
             return;
 
-        var entity = args.Entity;
-        DebugTools.Assert(!TryComp(entity, out BodyPartComponent? b) || b.Body == uid);
-        DebugTools.Assert(!TryComp(entity, out OrganComponent? o) || o.Body == uid);
+        var removedUid = args.Entity;
+        DebugTools.Assert(!TryComp(removedUid, out BodyPartComponent? b) || b.Body == ent);
+        DebugTools.Assert(!TryComp(removedUid, out OrganComponent? o) || o.Body == ent);
 
-        if (TryComp(entity, out BodyPartComponent? childPart))
+        if (TryComp(removedUid, out BodyPartComponent? part))
         {
-            RemovePart(uid, entity, slotId, childPart);
-            RecursiveBodyUpdate(entity, null, childPart);
+            RemovePart((ent, ent), (removedUid, part), slotId);
+            RecursiveBodyUpdate((removedUid, part), null);
         }
 
-        if (TryComp(entity, out OrganComponent? organ))
-            RemoveOrgan(entity, uid, organ);
+        if (TryComp(removedUid, out OrganComponent? organ))
+            RemoveOrgan((removedUid, organ), ent);
     }
 
-    private void OnBodyInit(EntityUid bodyId, BodyComponent body, ComponentInit args)
+    private void OnBodyInit(Entity<BodyComponent> ent, ref ComponentInit args)
     {
         // Setup the initial container.
-        body.RootContainer = Containers.EnsureContainer<ContainerSlot>(bodyId, BodyRootContainerId);
+        ent.Comp.RootContainer = Containers.EnsureContainer<ContainerSlot>(ent, BodyRootContainerId);
     }
 
-    private void OnBodyMapInit(EntityUid bodyId, BodyComponent body, MapInitEvent args)
+    private void OnBodyMapInit(Entity<BodyComponent> ent, ref MapInitEvent args)
     {
-        if (body.Prototype == null)
+        if (ent.Comp.Prototype is null)
             return;
 
         // One-time setup
         // Obviously can't run in Init to avoid double-spawns on save / load.
-        var prototype = Prototypes.Index(body.Prototype.Value);
-        MapInitBody(bodyId, prototype);
+        var prototype = Prototypes.Index(ent.Comp.Prototype.Value);
+        MapInitBody(ent, prototype);
     }
 
     private void MapInitBody(EntityUid bodyEntity, BodyPrototype prototype)
     {
         var protoRoot = prototype.Slots[prototype.Root];
-        if (protoRoot.Part == null)
+        if (protoRoot.Part is null)
             return;
 
         // This should already handle adding the entity to the root.
-        var rootPartEntity = SpawnInContainerOrDrop(protoRoot.Part, bodyEntity, BodyRootContainerId);
-        var rootPart = Comp<BodyPartComponent>(rootPartEntity);
+        var rootPartUid = SpawnInContainerOrDrop(protoRoot.Part, bodyEntity, BodyRootContainerId);
+        var rootPart = Comp<BodyPartComponent>(rootPartUid);
         rootPart.Body = bodyEntity;
-        Dirty(rootPartEntity, rootPart);
+        Dirty(rootPartUid, rootPart);
 
         // Setup the rest of the body entities.
-        SetupOrgans(rootPartEntity, rootPart, protoRoot.Organs);
-        MapInitParts(rootPartEntity, prototype);
+        SetupOrgans((rootPartUid, rootPart), protoRoot.Organs);
+        MapInitParts(rootPartUid, prototype);
     }
 
-    private void OnBodyCanDrag(EntityUid uid, BodyComponent component, ref CanDragEvent args)
+    private void OnBodyCanDrag(Entity<BodyComponent> ent, ref CanDragEvent args)
     {
         args.Handled = true;
     }
@@ -169,7 +170,7 @@ private void MapInitParts(EntityUid rootPartId, BodyPrototype prototype)
                 var partSlot = CreatePartSlot(parentEntity, connection, childPartComponent.PartType, parentPartComponent);
                 var cont = Containers.GetContainer(parentEntity, GetPartSlotContainerId(connection));
 
-                if (partSlot == null || !Containers.Insert(childPart, cont))
+                if (partSlot is null || !Containers.Insert(childPart, cont))
                 {
                     Log.Error($"Could not create slot for connection {connection} in body {prototype.ID}");
                     QueueDel(childPart);
@@ -177,7 +178,7 @@ private void MapInitParts(EntityUid rootPartId, BodyPrototype prototype)
                 }
 
                 // Add organs
-                SetupOrgans(childPart, childPartComponent, connectionSlot.Organs);
+                SetupOrgans((childPart, childPartComponent), connectionSlot.Organs);
 
                 // Enqueue it so we can also get its neighbors.
                 frontier.Enqueue(connection);
@@ -185,16 +186,16 @@ private void MapInitParts(EntityUid rootPartId, BodyPrototype prototype)
         }
     }
 
-    private void SetupOrgans(EntityUid partId, BodyPartComponent partComponent, Dictionary<string, string> organs)
+    private void SetupOrgans(Entity<BodyPartComponent> ent, Dictionary<string, string> organs)
     {
         foreach (var (organSlotId, organProto) in organs)
         {
-            var slot = CreateOrganSlot(organSlotId, partId, partComponent);
-            SpawnInContainerOrDrop(organProto, partId, GetOrganContainerId(organSlotId));
+            var slot = CreateOrganSlot((ent, ent), organSlotId);
+            SpawnInContainerOrDrop(organProto, ent, GetOrganContainerId(organSlotId));
 
-            if (slot == null)
+            if (slot is null)
             {
-                Log.Error($"Could not create organ for slot {organSlotId} in {ToPrettyString(partId)}");
+                Log.Error($"Could not create organ for slot {organSlotId} in {ToPrettyString(ent)}");
             }
         }
     }
@@ -202,12 +203,14 @@ private void SetupOrgans(EntityUid partId, BodyPartComponent partComponent, Dict
     /// <summary>
     /// Gets all body containers on this entity including the root one.
     /// </summary>
-    public IEnumerable<BaseContainer> GetBodyContainers(EntityUid id, BodyComponent? body = null,
+    public IEnumerable<BaseContainer> GetBodyContainers(
+        EntityUid id,
+        BodyComponent? body = null,
         BodyPartComponent? rootPart = null)
     {
-        if (!Resolve(id, ref body, false) ||
-            body.RootContainer.ContainedEntity == null ||
-            !Resolve(body.RootContainer.ContainedEntity.Value, ref rootPart))
+        if (!Resolve(id, ref body, logMissing: false)
+            || body.RootContainer.ContainedEntity is null
+            || !Resolve(body.RootContainer.ContainedEntity.Value, ref rootPart))
         {
             yield break;
         }
@@ -223,13 +226,15 @@ public IEnumerable<BaseContainer> GetBodyContainers(EntityUid id, BodyComponent?
     /// <summary>
     /// Gets all child body parts of this entity, including the root entity.
     /// </summary>
-    public IEnumerable<(EntityUid Id, BodyPartComponent Component)> GetBodyChildren(EntityUid? id, BodyComponent? body = null,
+    public IEnumerable<(EntityUid Id, BodyPartComponent Component)> GetBodyChildren(
+        EntityUid? id,
+        BodyComponent? body = null,
         BodyPartComponent? rootPart = null)
     {
-        if (id == null ||
-            !Resolve(id.Value, ref body, false) ||
-            body.RootContainer.ContainedEntity == null ||
-            !Resolve(body.RootContainer.ContainedEntity.Value, ref rootPart))
+        if (id is null
+            || !Resolve(id.Value, ref body, logMissing: false)
+            || body.RootContainer.ContainedEntity is null
+            || !Resolve(body.RootContainer.ContainedEntity.Value, ref rootPart))
         {
             yield break;
         }
@@ -240,9 +245,11 @@ public IEnumerable<BaseContainer> GetBodyContainers(EntityUid id, BodyComponent?
         }
     }
 
-    public IEnumerable<(EntityUid Id, OrganComponent Component)> GetBodyOrgans(EntityUid? bodyId, BodyComponent? body = null)
+    public IEnumerable<(EntityUid Id, OrganComponent Component)> GetBodyOrgans(
+        EntityUid? bodyId,
+        BodyComponent? body = null)
     {
-        if (bodyId == null || !Resolve(bodyId.Value, ref body, false))
+        if (bodyId is null || !Resolve(bodyId.Value, ref body, logMissing: false))
             yield break;
 
         foreach (var part in GetBodyChildren(bodyId, body))
@@ -260,10 +267,15 @@ public IEnumerable<BaseContainer> GetBodyContainers(EntityUid id, BodyComponent?
     /// <param name="bodyId"></param>
     /// <param name="body"></param>
     /// <returns></returns>
-    public IEnumerable<BodyPartSlot> GetBodyAllSlots(EntityUid bodyId, BodyComponent? body = null)
+    public IEnumerable<BodyPartSlot> GetBodyAllSlots(
+        EntityUid bodyId,
+        BodyComponent? body = null)
     {
-        if (!Resolve(bodyId, ref body, false) || body.RootContainer.ContainedEntity == null)
+        if (!Resolve(bodyId, ref body, logMissing: false)
+            || body.RootContainer.ContainedEntity is null)
+        {
             yield break;
+        }
 
         foreach (var slot in GetAllBodyPartSlots(body.RootContainer.ContainedEntity.Value))
         {
@@ -279,12 +291,11 @@ public virtual HashSet<EntityUid> GibBody(
         Vector2? splatDirection = null,
         float splatModifier = 1,
         Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null
-        )
+        SoundSpecifier? gibSoundOverride = null)
     {
         var gibs = new HashSet<EntityUid>();
 
-        if (!Resolve(bodyId, ref body, false))
+        if (!Resolve(bodyId, ref body, logMissing: false))
             return gibs;
 
         var root = GetRootPartOrNull(bodyId, body);
@@ -311,7 +322,7 @@ public virtual HashSet<EntityUid> GibBody(
                     launchImpulseVariance:GibletLaunchImpulseVariance, launchCone: splatCone);
             }
         }
-        if(TryComp<InventoryComponent>(bodyId, out var inventory))
+        if (TryComp<InventoryComponent>(bodyId, out var inventory))
         {
             foreach (var item in _inventory.GetHandOrInventoryEntities(bodyId))
             {
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
index fa113907058..efabebfc858 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
@@ -9,41 +9,50 @@ namespace Content.Shared.Body.Systems;
 
 public partial class SharedBodySystem
 {
-    private void AddOrgan(EntityUid uid, EntityUid bodyUid, EntityUid parentPartUid, OrganComponent component)
+    private void AddOrgan(
+        Entity<OrganComponent> organEnt,
+        EntityUid bodyUid,
+        EntityUid parentPartUid)
     {
-        component.Body = bodyUid;
-        RaiseLocalEvent(uid, new AddedToPartEvent(parentPartUid));
+        organEnt.Comp.Body = bodyUid;
+        var addedEv = new OrganAddedEvent(parentPartUid);
+        RaiseLocalEvent(organEnt, ref addedEv);
 
-        if (component.Body != null)
-            RaiseLocalEvent(uid, new AddedToPartInBodyEvent(component.Body.Value, parentPartUid));
+        if (organEnt.Comp.Body is not null)
+        {
+            var addedInBodyEv = new OrganAddedToBodyEvent(bodyUid, parentPartUid);
+            RaiseLocalEvent(organEnt, ref addedInBodyEv);
+        }
 
-        Dirty(uid, component);
+        Dirty(organEnt, organEnt.Comp);
     }
 
-    private void RemoveOrgan(EntityUid uid, EntityUid parentPartUid, OrganComponent component)
+    private void RemoveOrgan(Entity<OrganComponent> organEnt, EntityUid parentPartUid)
     {
-        RaiseLocalEvent(uid, new RemovedFromPartEvent(parentPartUid));
+        var removedEv = new OrganRemovedEvent(parentPartUid);
+        RaiseLocalEvent(organEnt, ref removedEv);
 
-        if (component.Body != null)
+        if (organEnt.Comp.Body is { Valid: true } bodyUid)
         {
-            RaiseLocalEvent(uid, new RemovedFromPartInBodyEvent(component.Body.Value, parentPartUid));
+            var removedInBodyEv = new OrganRemovedFromBodyEvent(bodyUid, parentPartUid);
+            RaiseLocalEvent(organEnt, ref removedInBodyEv);
         }
 
-        component.Body = null;
-        Dirty(uid, component);
+        organEnt.Comp.Body = null;
+        Dirty(organEnt, organEnt.Comp);
     }
 
     /// <summary>
     /// Creates the specified organ slot on the parent entity.
     /// </summary>
-    private OrganSlot? CreateOrganSlot(string slotId, EntityUid parent, BodyPartComponent? part = null)
+    private OrganSlot? CreateOrganSlot(Entity<BodyPartComponent?> parentEnt, string slotId)
     {
-        if (!Resolve(parent, ref part, false))
+        if (!Resolve(parentEnt, ref parentEnt.Comp, logMissing: false))
             return null;
 
-        Containers.EnsureContainer<ContainerSlot>(parent, GetOrganContainerId(slotId));
+        Containers.EnsureContainer<ContainerSlot>(parentEnt, GetOrganContainerId(slotId));
         var slot = new OrganSlot(slotId);
-        part.Organs.Add(slotId, slot);
+        parentEnt.Comp.Organs.Add(slotId, slot);
         return slot;
     }
 
@@ -58,20 +67,23 @@ public bool TryCreateOrganSlot(
     {
         slot = null;
 
-        if (parent == null || !Resolve(parent.Value, ref part, false))
+        if (parent is null || !Resolve(parent.Value, ref part, logMissing: false))
         {
             return false;
         }
 
         Containers.EnsureContainer<ContainerSlot>(parent.Value, GetOrganContainerId(slotId));
         slot = new OrganSlot(slotId);
-        return part.Organs.TryAdd(slotId,slot.Value);
+        return part.Organs.TryAdd(slotId, slot.Value);
     }
 
     /// <summary>
     /// Returns whether the slotId exists on the partId.
     /// </summary>
-    public bool CanInsertOrgan(EntityUid partId, string slotId, BodyPartComponent? part = null)
+    public bool CanInsertOrgan(
+        EntityUid partId,
+        string slotId,
+        BodyPartComponent? part = null)
     {
         return Resolve(partId, ref part) && part.Organs.ContainsKey(slotId);
     }
@@ -79,26 +91,32 @@ public bool CanInsertOrgan(EntityUid partId, string slotId, BodyPartComponent? p
     /// <summary>
     /// Returns whether the specified organ slot exists on the partId.
     /// </summary>
-    public bool CanInsertOrgan(EntityUid partId, OrganSlot slot, BodyPartComponent? part = null)
+    public bool CanInsertOrgan(
+        EntityUid partId,
+        OrganSlot slot,
+        BodyPartComponent? part = null)
     {
         return CanInsertOrgan(partId, slot.Id, part);
     }
 
-    public bool InsertOrgan(EntityUid partId, EntityUid organId, string slotId, BodyPartComponent? part = null, OrganComponent? organ = null)
+    public bool InsertOrgan(
+        EntityUid partId,
+        EntityUid organId,
+        string slotId,
+        BodyPartComponent? part = null,
+        OrganComponent? organ = null)
     {
-        if (!Resolve(organId, ref organ, false) ||
-            !Resolve(partId, ref part, false) ||
-            !CanInsertOrgan(partId, slotId, part))
+        if (!Resolve(organId, ref organ, logMissing: false)
+            || !Resolve(partId, ref part, logMissing: false)
+            || !CanInsertOrgan(partId, slotId, part))
         {
             return false;
         }
 
         var containerId = GetOrganContainerId(slotId);
 
-        if (!Containers.TryGetContainer(partId, containerId, out var container))
-            return false;
-
-        return Containers.Insert(organId, container);
+        return Containers.TryGetContainer(partId, containerId, out var container)
+            && Containers.Insert(organId, container);
     }
 
     /// <summary>
@@ -111,10 +129,8 @@ public bool RemoveOrgan(EntityUid organId, OrganComponent? organ = null)
 
         var parent = container.Owner;
 
-        if (!HasComp<BodyPartComponent>(parent))
-            return false;
-
-        return Containers.Remove(organId, container);
+        return HasComp<BodyPartComponent>(parent)
+            && Containers.Remove(organId, container);
     }
 
     /// <summary>
@@ -126,8 +142,8 @@ public bool AddOrganToFirstValidSlot(
         BodyPartComponent? part = null,
         OrganComponent? organ = null)
     {
-        if (!Resolve(partId, ref part, false) ||
-            !Resolve(organId, ref organ, false))
+        if (!Resolve(partId, ref part, logMissing: false)
+            || !Resolve(organId, ref organ, logMissing: false))
         {
             return false;
         }
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index e07aac06226..ee79faa0b8e 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
@@ -23,52 +23,52 @@ private void InitializeParts()
         SubscribeLocalEvent<BodyPartComponent, EntRemovedFromContainerMessage>(OnBodyPartRemoved);
     }
 
-    private void OnBodyPartInserted(EntityUid uid, BodyPartComponent component, EntInsertedIntoContainerMessage args)
+    private void OnBodyPartInserted(Entity<BodyPartComponent> ent, ref EntInsertedIntoContainerMessage args)
     {
         // Body part inserted into another body part.
-        var entity = args.Entity;
+        var insertedUid = args.Entity;
         var slotId = args.Container.ID;
 
-        if (component.Body == null)
+        if (ent.Comp.Body is null)
             return;
 
-        if (TryComp(entity, out BodyPartComponent? childPart))
+        if (TryComp(insertedUid, out BodyPartComponent? part))
         {
-            AddPart(component.Body.Value, entity, slotId, childPart);
-            RecursiveBodyUpdate(entity, component.Body.Value, childPart);
+            AddPart(ent.Comp.Body.Value, (insertedUid, part), slotId);
+            RecursiveBodyUpdate((insertedUid, part), ent.Comp.Body.Value);
         }
 
-        if (TryComp(entity, out OrganComponent? organ))
-            AddOrgan(entity, component.Body.Value, uid, organ);
+        if (TryComp(insertedUid, out OrganComponent? organ))
+            AddOrgan((insertedUid, organ), ent.Comp.Body.Value, ent);
     }
 
-    private void OnBodyPartRemoved(EntityUid uid, BodyPartComponent component, EntRemovedFromContainerMessage args)
+    private void OnBodyPartRemoved(Entity<BodyPartComponent> ent, ref EntRemovedFromContainerMessage args)
     {
         // Body part removed from another body part.
-        var entity = args.Entity;
+        var removedUid = args.Entity;
         var slotId = args.Container.ID;
 
-        DebugTools.Assert(!TryComp(entity, out BodyPartComponent? b) || b.Body == component.Body);
-        DebugTools.Assert(!TryComp(entity, out OrganComponent? o) || o.Body == component.Body);
+        DebugTools.Assert(!TryComp(removedUid, out BodyPartComponent? b) || b.Body == ent.Comp.Body);
+        DebugTools.Assert(!TryComp(removedUid, out OrganComponent? o) || o.Body == ent.Comp.Body);
 
-        if (TryComp(entity, out BodyPartComponent? childPart) && childPart.Body != null)
+        if (TryComp(removedUid, out BodyPartComponent? part) && part.Body is not null)
         {
-            RemovePart(childPart.Body.Value, entity, slotId, childPart);
-            RecursiveBodyUpdate(entity, null, childPart);
+            RemovePart(part.Body.Value, (removedUid, part), slotId);
+            RecursiveBodyUpdate((removedUid, part), null);
         }
 
-        if (TryComp(entity, out OrganComponent? organ))
-            RemoveOrgan(entity, uid, organ);
+        if (TryComp(removedUid, out OrganComponent? organ))
+            RemoveOrgan((removedUid, organ), ent);
     }
 
-    private void RecursiveBodyUpdate(EntityUid uid, EntityUid? bodyUid, BodyPartComponent component)
+    private void RecursiveBodyUpdate(Entity<BodyPartComponent> ent, EntityUid? bodyUid)
     {
-        component.Body = bodyUid;
-        Dirty(uid, component);
+        ent.Comp.Body = bodyUid;
+        Dirty(ent, ent.Comp);
 
-        foreach (var slotId in component.Organs.Keys)
+        foreach (var slotId in ent.Comp.Organs.Keys)
         {
-            if (!Containers.TryGetContainer(uid, GetOrganContainerId(slotId), out var container))
+            if (!Containers.TryGetContainer(ent, GetOrganContainerId(slotId), out var container))
                 continue;
 
             foreach (var organ in container.ContainedEntities)
@@ -78,105 +78,108 @@ private void RecursiveBodyUpdate(EntityUid uid, EntityUid? bodyUid, BodyPartComp
 
                 Dirty(organ, organComp);
 
-                if (organComp.Body != null)
-                    RaiseLocalEvent(organ, new RemovedFromPartInBodyEvent(organComp.Body.Value, uid));
+                if (organComp.Body is { Valid: true } oldBodyUid)
+                {
+                    var removedEv = new OrganRemovedFromBodyEvent(oldBodyUid, ent);
+                    RaiseLocalEvent(organ, ref removedEv);
+                }
 
                 organComp.Body = bodyUid;
-                if (bodyUid != null)
-                    RaiseLocalEvent(organ, new AddedToPartInBodyEvent(bodyUid.Value, uid));
+                if (bodyUid is not null)
+                {
+                    var addedEv = new OrganAddedToBodyEvent(bodyUid.Value, ent);
+                    RaiseLocalEvent(organ, ref addedEv);
+                }
             }
         }
 
-        foreach (var slotId in component.Children.Keys)
+        foreach (var slotId in ent.Comp.Children.Keys)
         {
-            if (!Containers.TryGetContainer(uid, GetPartSlotContainerId(slotId), out var container))
+            if (!Containers.TryGetContainer(ent, GetPartSlotContainerId(slotId), out var container))
                 continue;
 
-            foreach (var containedEnt in container.ContainedEntities)
+            foreach (var containedUid in container.ContainedEntities)
             {
-                if (TryComp(containedEnt, out BodyPartComponent? childPart))
-                    RecursiveBodyUpdate(containedEnt, bodyUid, childPart);
+                if (TryComp(containedUid, out BodyPartComponent? childPart))
+                    RecursiveBodyUpdate((containedUid, childPart), bodyUid);
             }
         }
     }
 
     protected virtual void AddPart(
-        EntityUid bodyUid,
-        EntityUid partUid,
-        string slotId,
-        BodyPartComponent component,
-        BodyComponent? bodyComp = null)
+        Entity<BodyComponent?> bodyEnt,
+        Entity<BodyPartComponent> partEnt,
+        string slotId)
     {
-        DebugTools.AssertOwner(partUid, component);
-        Dirty(partUid, component);
-        component.Body = bodyUid;
+        Dirty(partEnt, partEnt.Comp);
+        partEnt.Comp.Body = bodyEnt;
 
-        var ev = new BodyPartAddedEvent(slotId, component);
-        RaiseLocalEvent(bodyUid, ref ev);
+        var ev = new BodyPartAddedEvent(slotId, partEnt);
+        RaiseLocalEvent(bodyEnt, ref ev);
 
-        AddLeg(partUid, bodyUid, component, bodyComp);
+        AddLeg(partEnt, bodyEnt);
     }
 
     protected virtual void RemovePart(
-        EntityUid bodyUid,
-        EntityUid partUid,
-        string slotId,
-        BodyPartComponent component,
-        BodyComponent? bodyComp = null)
+        Entity<BodyComponent?> bodyEnt,
+        Entity<BodyPartComponent> partEnt,
+        string slotId)
     {
-        DebugTools.AssertOwner(partUid, component);
-        Resolve(bodyUid, ref bodyComp, false);
-        Dirty(partUid, component);
-        component.Body = null;
+        Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false);
+        Dirty(partEnt, partEnt.Comp);
+        partEnt.Comp.Body = null;
 
-        var ev = new BodyPartRemovedEvent(slotId, component);
-        RaiseLocalEvent(bodyUid, ref ev);
+        var ev = new BodyPartRemovedEvent(slotId, partEnt);
+        RaiseLocalEvent(bodyEnt, ref ev);
 
-        RemoveLeg(partUid, bodyUid, component);
-        PartRemoveDamage(bodyUid, component, bodyComp);
+        RemoveLeg(partEnt, bodyEnt);
+        PartRemoveDamage(bodyEnt, partEnt);
     }
 
-    private void AddLeg(EntityUid uid, EntityUid bodyUid, BodyPartComponent component, BodyComponent? bodyComp = null)
+    private void AddLeg(Entity<BodyPartComponent> legEnt, Entity<BodyComponent?> bodyEnt)
     {
-        if (!Resolve(bodyUid, ref bodyComp, false))
+        if (!Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false))
             return;
 
-        if (component.PartType == BodyPartType.Leg)
+        if (legEnt.Comp.PartType == BodyPartType.Leg)
         {
-            bodyComp.LegEntities.Add(uid);
-            UpdateMovementSpeed(bodyUid);
-            Dirty(bodyUid, bodyComp);
+            bodyEnt.Comp.LegEntities.Add(legEnt);
+            UpdateMovementSpeed(bodyEnt);
+            Dirty(bodyEnt, bodyEnt.Comp);
         }
     }
 
-    private void RemoveLeg(EntityUid uid, EntityUid bodyUid, BodyPartComponent component, BodyComponent? bodyComp = null)
+    private void RemoveLeg(Entity<BodyPartComponent> legEnt, Entity<BodyComponent?> bodyEnt)
     {
-        if (!Resolve(bodyUid, ref bodyComp, false))
+        if (!Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false))
             return;
 
-        if (component.PartType == BodyPartType.Leg)
+        if (legEnt.Comp.PartType == BodyPartType.Leg)
         {
-            bodyComp.LegEntities.Remove(uid);
-            UpdateMovementSpeed(bodyUid);
-            Dirty(bodyUid, bodyComp);
+            bodyEnt.Comp.LegEntities.Remove(legEnt);
+            UpdateMovementSpeed(bodyEnt);
+            Dirty(bodyEnt, bodyEnt.Comp);
 
-            if (!bodyComp.LegEntities.Any())
+            if (!bodyEnt.Comp.LegEntities.Any())
             {
-                Standing.Down(bodyUid);
+                Standing.Down(bodyEnt);
             }
         }
     }
 
-    private void PartRemoveDamage(EntityUid parent, BodyPartComponent component, BodyComponent? bodyComp = null)
+    private void PartRemoveDamage(Entity<BodyComponent?> bodyEnt, Entity<BodyPartComponent> partEnt)
     {
-        if (!Resolve(parent, ref bodyComp, false))
+        if (!Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false))
             return;
 
-        if (!_timing.ApplyingState && component.IsVital && !GetBodyChildrenOfType(parent, component.PartType, bodyComp).Any())
+        if (!_timing.ApplyingState
+            && partEnt.Comp.IsVital
+            && !GetBodyChildrenOfType(bodyEnt, partEnt.Comp.PartType, bodyEnt.Comp).Any()
+        )
         {
             // TODO BODY SYSTEM KILL : remove this when wounding and required parts are implemented properly
             var damage = new DamageSpecifier(Prototypes.Index<DamageTypePrototype>("Bloodloss"), 300);
-            Damageable.TryChangeDamage(parent, damage);
+            Damageable.TryChangeDamage(bodyEnt, damage);
         }
     }
 
@@ -212,7 +215,8 @@ private void PartRemoveDamage(EntityUid parent, BodyPartComponent component, Bod
 
         var parent = container.Owner;
 
-        if (!TryComp<BodyPartComponent>(parent, out var parentBody) || !parentBody.Children.ContainsKey(slotId))
+        if (!TryComp<BodyPartComponent>(parent, out var parentBody)
+            || !parentBody.Children.ContainsKey(slotId))
             return null;
 
         return (parent, slotId);
@@ -252,7 +256,7 @@ public bool TryGetParentBodyPart(
         BodyPartType partType,
         BodyPartComponent? part = null)
     {
-        if (!Resolve(partUid, ref part, false))
+        if (!Resolve(partUid, ref part, logMissing: false))
             return null;
 
         Containers.EnsureContainer<ContainerSlot>(partUid, GetPartSlotContainerId(slotId));
@@ -275,8 +279,8 @@ public bool TryCreatePartSlot(
     {
         slot = null;
 
-        if (partId == null ||
-            !Resolve(partId.Value, ref part, false))
+        if (partId is null
+            || !Resolve(partId.Value, ref part, logMissing: false))
         {
             return false;
         }
@@ -310,24 +314,31 @@ public bool TryCreatePartSlotAndAttach(
     /// <summary>
     /// Returns true if the partId is the root body container for the specified bodyId.
     /// </summary>
-    public bool IsPartRoot(EntityUid bodyId, EntityUid partId, BodyComponent? body = null, BodyPartComponent? part = null)
+    public bool IsPartRoot(
+        EntityUid bodyId,
+        EntityUid partId,
+        BodyComponent? body = null,
+        BodyPartComponent? part = null)
     {
-        if (!Resolve(partId, ref part)|| !Resolve(bodyId, ref body))
-            return false;
-
-        return Containers.TryGetContainingContainer(bodyId, partId, out var container) && container.ID == BodyRootContainerId;
+        return Resolve(partId, ref part)
+            && Resolve(bodyId, ref body)
+            && Containers.TryGetContainingContainer(bodyId, partId, out var container)
+            && container.ID == BodyRootContainerId;
     }
 
     /// <summary>
     /// Returns true if we can attach the partId to the bodyId as the root entity.
     /// </summary>
-    public bool CanAttachToRoot(EntityUid bodyId, EntityUid partId, BodyComponent? body = null,
+    public bool CanAttachToRoot(
+        EntityUid bodyId,
+        EntityUid partId,
+        BodyComponent? body = null,
         BodyPartComponent? part = null)
     {
-        return Resolve(bodyId, ref body) &&
-               Resolve(partId, ref part) &&
-               body.RootContainer.ContainedEntity == null &&
-               bodyId != part.Body;
+        return Resolve(bodyId, ref body)
+            && Resolve(partId, ref part)
+            && body.RootContainer.ContainedEntity is null
+            && bodyId != part.Body;
     }
 
     /// <summary>
@@ -335,8 +346,11 @@ public bool CanAttachToRoot(EntityUid bodyId, EntityUid partId, BodyComponent? b
     /// </summary>
     public (EntityUid Entity, BodyPartComponent BodyPart)? GetRootPartOrNull(EntityUid bodyId, BodyComponent? body = null)
     {
-        if (!Resolve(bodyId, ref body) || body.RootContainer.ContainedEntity == null)
+        if (!Resolve(bodyId, ref body)
+            || body.RootContainer.ContainedEntity is null)
+        {
             return null;
+        }
 
         return (body.RootContainer.ContainedEntity.Value,
             Comp<BodyPartComponent>(body.RootContainer.ContainedEntity.Value));
@@ -352,13 +366,9 @@ public bool CanAttachPart(
         BodyPartComponent? parentPart = null,
         BodyPartComponent? part = null)
     {
-        if (!Resolve(partId, ref part, false) ||
-            !Resolve(parentId, ref parentPart, false))
-        {
-            return false;
-        }
-
-        return CanAttachPart(parentId, slot.Id, partId, parentPart, part);
+        return Resolve(partId, ref part, logMissing: false)
+            && Resolve(parentId, ref parentPart, logMissing: false)
+            && CanAttachPart(parentId, slot.Id, partId, parentPart, part);
     }
 
     /// <summary>
@@ -371,16 +381,12 @@ public bool CanAttachPart(
         BodyPartComponent? parentPart = null,
         BodyPartComponent? part = null)
     {
-        if (!Resolve(partId, ref part, false) ||
-            !Resolve(parentId, ref parentPart, false) ||
-            !parentPart.Children.TryGetValue(slotId, out var parentSlotData))
-        {
-            return false;
-        }
-
-        return part.PartType == parentSlotData.Type &&
-               Containers.TryGetContainer(parentId, GetPartSlotContainerId(slotId), out var container) &&
-               Containers.CanInsert(partId, container);
+        return Resolve(partId, ref part, logMissing: false)
+            && Resolve(parentId, ref parentPart, logMissing: false)
+            && parentPart.Children.TryGetValue(slotId, out var parentSlotData)
+            && part.PartType == parentSlotData.Type
+            && Containers.TryGetContainer(parentId, GetPartSlotContainerId(slotId), out var container)
+            && Containers.CanInsert(partId, container);
     }
 
     public bool AttachPartToRoot(
@@ -389,14 +395,10 @@ public bool AttachPartToRoot(
         BodyComponent? body = null,
         BodyPartComponent? part = null)
     {
-        if (!Resolve(bodyId, ref body) ||
-            !Resolve(partId, ref part) ||
-            !CanAttachToRoot(bodyId, partId, body, part))
-        {
-            return false;
-        }
-
-        return Containers.Insert(partId, body.RootContainer);
+        return Resolve(bodyId, ref body)
+            && Resolve(partId, ref part)
+            && CanAttachToRoot(bodyId, partId, body, part)
+            && Containers.Insert(partId, body.RootContainer);
     }
 
     #endregion
@@ -406,20 +408,16 @@ public bool AttachPartToRoot(
     /// <summary>
     /// Attaches a body part to the specified body part parent.
     /// </summary>
-     public bool AttachPart(
-         EntityUid parentPartId,
-         string slotId,
-         EntityUid partId,
-         BodyPartComponent? parentPart = null,
-         BodyPartComponent? part = null)
-    {
-        if (!Resolve(parentPartId, ref parentPart, false) ||
-            !parentPart.Children.TryGetValue(slotId, out var slot))
-        {
-            return false;
-        }
-
-        return AttachPart(parentPartId, slot, partId, parentPart, part);
+    public bool AttachPart(
+        EntityUid parentPartId,
+        string slotId,
+        EntityUid partId,
+        BodyPartComponent? parentPart = null,
+        BodyPartComponent? part = null)
+    {
+        return Resolve(parentPartId, ref parentPart, logMissing: false)
+            && parentPart.Children.TryGetValue(slotId, out var slot)
+            && AttachPart(parentPartId, slot, partId, parentPart, part);
     }
 
     /// <summary>
@@ -432,10 +430,10 @@ public bool AttachPart(
         BodyPartComponent? parentPart = null,
         BodyPartComponent? part = null)
     {
-        if (!Resolve(parentPartId, ref parentPart, false) ||
-            !Resolve(partId, ref part, false) ||
-            !CanAttachPart(parentPartId, slot.Id, partId, parentPart, part) ||
-            !parentPart.Children.ContainsKey(slot.Id))
+        if (!Resolve(parentPartId, ref parentPart, logMissing: false)
+            || !Resolve(partId, ref part, logMissing: false)
+            || !CanAttachPart(parentPartId, slot.Id, partId, parentPart, part)
+            || !parentPart.Children.ContainsKey(slot.Id))
         {
             return false;
         }
@@ -453,13 +451,16 @@ public bool AttachPart(
 
     #region Misc
 
-    public void UpdateMovementSpeed(EntityUid bodyId, BodyComponent? body = null, MovementSpeedModifierComponent? movement = null)
+    public void UpdateMovementSpeed(
+        EntityUid bodyId,
+        BodyComponent? body = null,
+        MovementSpeedModifierComponent? movement = null)
     {
-        if (!Resolve(bodyId, ref body, ref movement, false))
-            return;
-
-        if (body.RequiredLegs <= 0)
+        if (!Resolve(bodyId, ref body, ref movement, logMissing: false)
+            || body.RequiredLegs <= 0)
+        {
             return;
+        }
 
         var walkSpeed = 0f;
         var sprintSpeed = 0f;
@@ -488,7 +489,7 @@ public void UpdateMovementSpeed(EntityUid bodyId, BodyComponent? body = null, Mo
     /// </summary>
     public IEnumerable<(EntityUid Id, OrganComponent Component)> GetPartOrgans(EntityUid partId, BodyPartComponent? part = null)
     {
-        if (!Resolve(partId, ref part, false))
+        if (!Resolve(partId, ref part, logMissing: false))
             yield break;
 
         foreach (var slotId in part.Organs.Keys)
@@ -513,7 +514,7 @@ public void UpdateMovementSpeed(EntityUid bodyId, BodyComponent? body = null, Mo
     /// </summary>
     public IEnumerable<BaseContainer> GetPartContainers(EntityUid id, BodyPartComponent? part = null)
     {
-        if (!Resolve(id, ref part, false) ||
+        if (!Resolve(id, ref part, logMissing: false) ||
             part.Children.Count == 0)
         {
             yield break;
@@ -541,9 +542,11 @@ public IEnumerable<BaseContainer> GetPartContainers(EntityUid id, BodyPartCompon
     /// <summary>
     /// Returns all body part components for this entity including itself.
     /// </summary>
-    public IEnumerable<(EntityUid Id, BodyPartComponent Component)> GetBodyPartChildren(EntityUid partId, BodyPartComponent? part = null)
+    public IEnumerable<(EntityUid Id, BodyPartComponent Component)> GetBodyPartChildren(
+        EntityUid partId,
+        BodyPartComponent? part = null)
     {
-        if (!Resolve(partId, ref part, false))
+        if (!Resolve(partId, ref part, logMissing: false))
             yield break;
 
         yield return (partId, part);
@@ -571,9 +574,11 @@ public IEnumerable<BaseContainer> GetPartContainers(EntityUid id, BodyPartCompon
     /// <summary>
     /// Returns all body part slots for this entity.
     /// </summary>
-    public IEnumerable<BodyPartSlot> GetAllBodyPartSlots(EntityUid partId, BodyPartComponent? part = null)
+    public IEnumerable<BodyPartSlot> GetAllBodyPartSlots(
+        EntityUid partId,
+        BodyPartComponent? part = null)
     {
-        if (!Resolve(partId, ref part, false))
+        if (!Resolve(partId, ref part, logMissing: false))
             yield break;
 
         foreach (var (slotId, slot) in part.Children)
@@ -601,7 +606,10 @@ public IEnumerable<BodyPartSlot> GetAllBodyPartSlots(EntityUid partId, BodyPartC
     /// <summary>
     /// Returns true if the bodyId has any parts of this type.
     /// </summary>
-    public bool BodyHasPartType(EntityUid bodyId, BodyPartType type, BodyComponent? body = null)
+    public bool BodyHasPartType(
+        EntityUid bodyId,
+        BodyPartType type,
+        BodyComponent? body = null)
     {
         return GetBodyChildrenOfType(bodyId, type, body).Any();
     }
@@ -615,8 +623,8 @@ public bool PartHasChild(
         BodyPartComponent? parent,
         BodyPartComponent? child)
     {
-        if (!Resolve(parentId, ref parent, false) ||
-            !Resolve(childId, ref child, false))
+        if (!Resolve(parentId, ref parent, logMissing: false)
+            || !Resolve(childId, ref child, logMissing: false))
         {
             return false;
         }
@@ -638,15 +646,11 @@ public bool BodyHasChild(
         BodyComponent? body = null,
         BodyPartComponent? part = null)
     {
-        if (!Resolve(bodyId, ref body, false) ||
-            body.RootContainer.ContainedEntity == null ||
-            !Resolve(partId, ref part, false) ||
-            !TryComp(body.RootContainer.ContainedEntity, out BodyPartComponent? rootPart))
-        {
-            return false;
-        }
-
-        return PartHasChild(body.RootContainer.ContainedEntity.Value, partId, rootPart, part);
+        return Resolve(bodyId, ref body, logMissing: false)
+            && body.RootContainer.ContainedEntity is not null
+            && Resolve(partId, ref part, logMissing: false)
+            && TryComp(body.RootContainer.ContainedEntity, out BodyPartComponent? rootPart)
+            && PartHasChild(body.RootContainer.ContainedEntity.Value, partId, rootPart, part);
     }
 
     public IEnumerable<(EntityUid Id, BodyPartComponent Component)> GetBodyChildrenOfType(
@@ -721,9 +725,11 @@ public bool TryGetBodyPartOrganComponents<T>(
     /// <summary>
     /// Gets the parent body part and all immediate child body parts for the partId.
     /// </summary>
-    public IEnumerable<EntityUid> GetBodyPartAdjacentParts(EntityUid partId, BodyPartComponent? part = null)
+    public IEnumerable<EntityUid> GetBodyPartAdjacentParts(
+        EntityUid partId,
+        BodyPartComponent? part = null)
     {
-        if (!Resolve(partId, ref part, false))
+        if (!Resolve(partId, ref part, logMissing: false))
             yield break;
 
         if (TryGetParentBodyPart(partId, out var parentUid, out _))
@@ -745,7 +751,7 @@ public IEnumerable<EntityUid> GetBodyPartAdjacentParts(EntityUid partId, BodyPar
         BodyPartComponent? part = null)
         where T : IComponent
     {
-        if (!Resolve(partId, ref part, false))
+        if (!Resolve(partId, ref part, logMissing: false))
             yield break;
 
         var query = GetEntityQuery<T>();
@@ -762,7 +768,7 @@ public bool TryGetBodyPartAdjacentPartsComponents<T>(
         BodyPartComponent? part = null)
         where T : IComponent
     {
-        if (!Resolve(partId, ref part, false))
+        if (!Resolve(partId, ref part, logMissing: false))
         {
             comps = null;
             return false;
diff --git a/Content.Shared/Buckle/Components/StrapComponent.cs b/Content.Shared/Buckle/Components/StrapComponent.cs
index f25e1b03741..72c92ebf84b 100644
--- a/Content.Shared/Buckle/Components/StrapComponent.cs
+++ b/Content.Shared/Buckle/Components/StrapComponent.cs
@@ -22,9 +22,14 @@ public sealed partial class StrapComponent : Component
     /// Entities that this strap accepts and can buckle
     /// If null it accepts any entity
     /// </summary>
-    [DataField]
-    [ViewVariables]
-    public EntityWhitelist? AllowedEntities;
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Entities that this strap does not accept and cannot buckle.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public EntityWhitelist? Blacklist;
 
     /// <summary>
     /// The change in position to the strapped mob
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index 8172947a039..bc039c03e65 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -10,7 +10,6 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Popups;
-using Content.Shared.Pulling.Components;
 using Content.Shared.Standing;
 using Content.Shared.Storage.Components;
 using Content.Shared.Stunnable;
@@ -19,6 +18,7 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Utility;
+using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent;
 
 namespace Content.Shared.Buckle;
 
@@ -221,8 +221,8 @@ private bool CanBuckle(
         }
 
         // Does it pass the Whitelist
-        if (strapComp.AllowedEntities != null &&
-            !strapComp.AllowedEntities.IsValid(userUid, EntityManager))
+        if (strapComp.Whitelist != null &&
+            !strapComp.Whitelist.IsValid(buckleUid, EntityManager) || strapComp.Blacklist?.IsValid(buckleUid, EntityManager) == true)
         {
             if (_netManager.IsServer)
                 _popup.PopupEntity(Loc.GetString("buckle-component-cannot-fit-message"), userUid, buckleUid, PopupType.Medium);
@@ -348,11 +348,11 @@ public bool TryBuckle(EntityUid buckleUid, EntityUid userUid, EntityUid strapUid
         RaiseLocalEvent(ev.BuckledEntity, ref ev);
         RaiseLocalEvent(ev.StrapEntity, ref ev);
 
-        if (TryComp<SharedPullableComponent>(buckleUid, out var ownerPullable))
+        if (TryComp<PullableComponent>(buckleUid, out var ownerPullable))
         {
             if (ownerPullable.Puller != null)
             {
-                _pulling.TryStopPull(ownerPullable);
+                _pulling.TryStopPull(buckleUid, ownerPullable);
             }
         }
 
@@ -361,12 +361,12 @@ public bool TryBuckle(EntityUid buckleUid, EntityUid userUid, EntityUid strapUid
             _physics.ResetDynamics(buckleUid, physics);
         }
 
-        if (!buckleComp.PullStrap && TryComp<SharedPullableComponent>(strapUid, out var toPullable))
+        if (!buckleComp.PullStrap && TryComp<PullableComponent>(strapUid, out var toPullable))
         {
             if (toPullable.Puller == buckleUid)
             {
                 // can't pull it and buckle to it at the same time
-                _pulling.TryStopPull(toPullable);
+                _pulling.TryStopPull(strapUid, toPullable);
             }
         }
 
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.cs b/Content.Shared/Buckle/SharedBuckleSystem.cs
index 8f683356637..67218657e52 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.cs
@@ -15,6 +15,7 @@
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
+using PullingSystem = Content.Shared.Movement.Pulling.Systems.PullingSystem;
 
 namespace Content.Shared.Buckle;
 
@@ -35,7 +36,7 @@ public abstract partial class SharedBuckleSystem : EntitySystem
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedJointSystem _joints = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedPullingSystem _pulling = default!;
+    [Dependency] private readonly PullingSystem _pulling = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StandingStateSystem _standing = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
diff --git a/Content.Shared/Burial/BurialSystem.cs b/Content.Shared/Burial/BurialSystem.cs
index 937784ca2ab..76336e13989 100644
--- a/Content.Shared/Burial/BurialSystem.cs
+++ b/Content.Shared/Burial/BurialSystem.cs
@@ -52,8 +52,15 @@ private void OnInteractUsing(EntityUid uid, GraveComponent component, InteractUs
                 BreakOnHandChange = true
             };
 
+            if (component.Stream == null)
+                component.Stream = _audioSystem.PlayPredicted(component.DigSound, uid, args.User)?.Entity;
+
             if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs))
+            {
+                _audioSystem.Stop(component.Stream);
                 return;
+            }
+
 
             StartDigging(uid, args.User, args.Used, component);
         }
@@ -110,10 +117,9 @@ private void StartDigging(EntityUid uid, EntityUid user, EntityUid? used, GraveC
     {
         if (used != null)
         {
-            _popupSystem.PopupClient(Loc.GetString("grave-start-digging-user", ("grave", uid), ("tool", used)), user, user);
-            _popupSystem.PopupEntity(Loc.GetString("grave-start-digging-others", ("user", user), ("grave", uid), ("tool", used)), user, Filter.PvsExcept(user), true);
-            if (component.Stream == null)
-                component.Stream = _audioSystem.PlayPredicted(component.DigSound, uid, user)?.Entity;
+            var selfMessage = Loc.GetString("grave-start-digging-user", ("grave", uid), ("tool", used));
+            var othersMessage = Loc.GetString("grave-start-digging-others", ("user", user), ("grave", uid), ("tool", used));
+            _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
             component.ActiveShovelDigging = true;
             Dirty(uid, component);
         }
@@ -165,8 +171,15 @@ private void OnRelayMovement(EntityUid uid, GraveComponent component, ref Contai
             BreakOnDamage = false
         };
 
-        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs, out component.HandDiggingDoAfter))
+
+        if (component.Stream == null)
+            component.Stream = _audioSystem.PlayPredicted(component.DigSound, uid, args.Entity)?.Entity;
+
+        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs))
+        {
+            _audioSystem.Stop(component.Stream);
             return;
+        }
 
         StartDigging(uid, args.Entity, null, component);
     }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 25527ca9b54..64e9558e6af 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -112,14 +112,14 @@ public static readonly CVarDef<bool>
         ///     Close to how long you expect a round to last, so you'll probably have to tweak this on downstreams.
         /// </summary>
         public static readonly CVarDef<float>
-            EventsRampingAverageEndTime = CVarDef.Create("events.ramping_average_end_time", 120f, CVar.ARCHIVE | CVar.SERVERONLY);
+            EventsRampingAverageEndTime = CVarDef.Create("events.ramping_average_end_time", 40f, CVar.ARCHIVE | CVar.SERVERONLY);
 
         /// <summary>
         ///     Average ending chaos modifier for the ramping event scheduler.
         ///     Max chaos chosen for a round will deviate from this
         /// </summary>
         public static readonly CVarDef<float>
-            EventsRampingAverageChaos = CVarDef.Create("events.ramping_average_chaos", 4f, CVar.ARCHIVE | CVar.SERVERONLY);
+            EventsRampingAverageChaos = CVarDef.Create("events.ramping_average_chaos", 6f, CVar.ARCHIVE | CVar.SERVERONLY);
 
         /*
          * Game
@@ -176,26 +176,26 @@ public static readonly CVarDef<bool>
         /// <summary>
         ///     Minimum time between Basic station events in seconds
         /// </summary>
-        public static readonly CVarDef<int> // 15 Minutes
-            GameEventsBasicMinimumTime = CVarDef.Create("game.events_basic_minimum_time", 900, CVar.SERVERONLY);
+        public static readonly CVarDef<int> // 5 Minutes
+            GameEventsBasicMinimumTime = CVarDef.Create("game.events_basic_minimum_time", 300, CVar.SERVERONLY);
 
         /// <summary>
         ///     Maximum time between Basic station events in seconds
         /// </summary>
-        public static readonly CVarDef<int> // 35 Minutes
-            GameEventsBasicMaximumTime = CVarDef.Create("game.events_basic_maximum_time", 2100, CVar.SERVERONLY);
+        public static readonly CVarDef<int> // 25 Minutes
+            GameEventsBasicMaximumTime = CVarDef.Create("game.events_basic_maximum_time", 1500, CVar.SERVERONLY);
 
         /// <summary>
         ///     Minimum time between Ramping station events in seconds
         /// </summary>
-        public static readonly CVarDef<int> // 20 Minutes
-            GameEventsRampingMinimumTime = CVarDef.Create("game.events_ramping_minimum_time", 1200, CVar.SERVERONLY);
+        public static readonly CVarDef<int> // 4 Minutes
+            GameEventsRampingMinimumTime = CVarDef.Create("game.events_ramping_minimum_time", 240, CVar.SERVERONLY);
 
         /// <summary>
         ///     Maximum time between Ramping station events in seconds
         /// </summary>
-        public static readonly CVarDef<int> // 45 Minutes
-            GameEventsRampingMaximumTime = CVarDef.Create("game.events_ramping_maximum_time", 2700, CVar.SERVERONLY);
+        public static readonly CVarDef<int> // 12 Minutes
+            GameEventsRampingMaximumTime = CVarDef.Create("game.events_ramping_maximum_time", 720, CVar.SERVERONLY);
 
         /// <summary>
         ///
@@ -256,25 +256,6 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool>
             GameCryoSleepRejoining = CVarDef.Create("game.cryo_sleep_rejoining", false, CVar.SERVER | CVar.REPLICATED);
 
-        /// <summary>
-        ///     Whether a random position offset will be applied to the station on roundstart.
-        /// </summary>
-        public static readonly CVarDef<bool> StationOffset =
-            CVarDef.Create("game.station_offset", true);
-
-        /// <summary>
-        /// When the default blueprint is loaded what is the maximum amount it can be offset from 0,0.
-        /// Does nothing without <see cref="StationOffset"/> as true.
-        /// </summary>
-        public static readonly CVarDef<float> MaxStationOffset =
-            CVarDef.Create("game.maxstationoffset", 1000.0f);
-
-        /// <summary>
-        ///     Whether a random rotation will be applied to the station on roundstart.
-        /// </summary>
-        public static readonly CVarDef<bool> StationRotation =
-            CVarDef.Create("game.station_rotation", true);
-
         /// <summary>
         ///     When enabled, guests will be assigned permanent UIDs and will have their preferences stored.
         /// </summary>
@@ -400,6 +381,19 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<int> GameLoadoutsPoints =
             CVarDef.Create("game.loadouts_points", 14, CVar.REPLICATED);
 
+
+        /// <summary>
+        ///     Whether to repeat eating doafters after completion
+        /// </summary>
+        public static readonly CVarDef<bool> GameAutoEatFood =
+            CVarDef.Create("game.auto_eat_food", false, CVar.REPLICATED);
+
+        /// <summary>
+        ///     Whether to repeat drinking doafters after completion
+        /// </summary>
+        public static readonly CVarDef<bool> GameAutoEatDrinks =
+            CVarDef.Create("game.auto_eat_drinks", false, CVar.REPLICATED);
+
 #if EXCEPTION_TOLERANCE
         /// <summary>
         ///     Amount of times round start must fail before the server is shut down.
@@ -435,6 +429,36 @@ public static readonly CVarDef<bool>
             CVarDef.Create("game.round_end_sound_collection", "RoundEnd", CVar.SERVERONLY);
 
 
+        /*
+         * Announcers
+         */
+
+        /// <summary>
+        ///     Weighted list of announcers to choose from
+        /// </summary>
+        public static readonly CVarDef<string> AnnouncerList =
+            CVarDef.Create("announcer.list", "RandomAnnouncers", CVar.REPLICATED);
+
+        /// <summary>
+        ///     Optionally force set an announcer
+        /// </summary>
+        public static readonly CVarDef<string> Announcer =
+            CVarDef.Create("announcer.announcer", "", CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Optionally blacklist announcers
+        ///     List of IDs separated by commas
+        /// </summary>
+        public static readonly CVarDef<string> AnnouncerBlacklist =
+            CVarDef.Create("announcer.blacklist", "", CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Changes how loud the announcers are for the client
+        /// </summary>
+        public static readonly CVarDef<float> AnnouncerVolume =
+            CVarDef.Create("announcer.volume", 0.5f, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+
         /*
          * Queue
          */
@@ -443,8 +467,8 @@ public static readonly CVarDef<bool>
         ///     Controls if the connections queue is enabled
         ///     If enabled plyaers will be added to a queue instead of being kicked after SoftMaxPlayers is reached
         /// </summary>
-        public static readonly CVarDef<bool>
-        QueueEnabled = CVarDef.Create("queue.enabled", false, CVar.SERVERONLY);
+        public static readonly CVarDef<bool> QueueEnabled =
+            CVarDef.Create("queue.enabled", false, CVar.SERVERONLY);
 
 
         /*
@@ -626,8 +650,8 @@ public static readonly CVarDef<bool>
          * Console
          */
 
-        public static readonly CVarDef<bool>
-            ConsoleLoginLocal = CVarDef.Create("console.loginlocal", true, CVar.ARCHIVE | CVar.SERVERONLY);
+        public static readonly CVarDef<bool> ConsoleLoginLocal =
+            CVarDef.Create("console.loginlocal", true, CVar.ARCHIVE | CVar.SERVERONLY);
 
         /// <summary>
         /// Automatically log in the given user as host, equivalent to the <c>promotehost</c> command.
@@ -810,6 +834,9 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> CombatModeIndicatorsPointShow =
             CVarDef.Create("hud.combat_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
 
+        public static readonly CVarDef<bool> OfferModeIndicatorsPointShow =
+            CVarDef.Create("hud.offer_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
         public static readonly CVarDef<bool> LoocAboveHeadShow =
             CVarDef.Create("hud.show_looc_above_head", true, CVar.ARCHIVE | CVar.CLIENTONLY);
 
@@ -856,6 +883,13 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> AdminAnnounceLogout =
             CVarDef.Create("admin.announce_logout", true, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     The token used to authenticate with the admin API. Leave empty to disable the admin API. This is a secret! Do not share!
+        /// </summary>
+        public static readonly CVarDef<string> AdminApiToken =
+            CVarDef.Create("admin.api_token", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
+
+
         /// <summary>
         /// Should users be able to see their own notes? Admins will be able to see and set notes regardless
         /// </summary>
@@ -919,6 +953,7 @@ public static readonly CVarDef<bool>
 
         /// <summary>
         ///     Should the ban details in admin channel include PII? (IP, HWID, etc)
+        /// </summary>
         public static readonly CVarDef<bool> AdminShowPIIOnBan =
             CVarDef.Create("admin.show_pii_onban", false, CVar.SERVERONLY);
 
@@ -1136,7 +1171,7 @@ public static readonly CVarDef<bool>
         ///     Useful to prevent clipping through objects.
         /// </summary>
         public static readonly CVarDef<float> SpaceWindMaxVelocity =
-            CVarDef.Create("atmos.space_wind_max_velocity", 30f, CVar.SERVERONLY);
+            CVarDef.Create("atmos.space_wind_max_velocity", 15f, CVar.SERVERONLY);
 
         /// <summary>
         ///     The maximum force that may be applied to an object by pushing (i.e. not throwing) atmospheric pressure differences.
@@ -1145,6 +1180,24 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<float> SpaceWindMaxPushForce =
             CVarDef.Create("atmos.space_wind_max_push_force", 20f, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     If an object's mass is below this number, then this number is used in place of mass to determine whether air pressure can throw an object.
+        ///     This has nothing to do with throwing force, only acting as a way of reducing the odds of tiny 5 gram objects from being yeeted by people's breath
+        /// </summary>
+        /// <remarks>
+        ///     If you are reading this because you want to change it, consider looking into why almost every item in the game weighs only 5 grams
+        ///     And maybe do your part to fix that? :)
+        /// </remarks>
+        public static readonly CVarDef<float> SpaceWindMinimumCalculatedMass =
+            CVarDef.Create("atmos.space_wind_minimum_calculated_mass", 10f, CVar.SERVERONLY);
+
+        /// <summary>
+        /// 	Calculated as 1/Mass, where Mass is the physics.Mass of the desired threshold.
+        /// 	If an object's inverse mass is lower than this, it is capped at this. Basically, an upper limit to how heavy an object can be before it stops resisting space wind more.
+        /// </summary>
+        public static readonly CVarDef<float> SpaceWindMaximumCalculatedInverseMass =
+            CVarDef.Create("atmos.space_wind_maximum_calculated_inverse_mass", 0.04f, CVar.SERVERONLY);
+
         /// <summary>
         ///     Whether monstermos tile equalization is enabled.
         /// </summary>
@@ -1166,7 +1219,21 @@ public static readonly CVarDef<bool>
 		///     Also looks weird on slow spacing for unrelated reasons. If you do want to enable this, you should probably turn on instaspacing.
         /// </summary>
         public static readonly CVarDef<bool> MonstermosRipTiles =
-            CVarDef.Create("atmos.monstermos_rip_tiles", false, CVar.SERVERONLY);
+            CVarDef.Create("atmos.monstermos_rip_tiles", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Taken as the cube of a tile's mass, this acts as a minimum threshold of mass for which air pressure calculates whether or not to rip a tile from the floor
+        ///     This should be set by default to the cube of the game's lowest mass tile as defined in their prototypes, but can be increased for server performance reasons
+        /// </summary>
+        public static readonly CVarDef<float> MonstermosRipTilesMinimumPressure =
+            CVarDef.Create("atmos.monstermos_rip_tiles_min_pressure", 7500f, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Taken after the minimum pressure is checked, the effective pressure is multiplied by this amount.
+        ///		This allows server hosts to finely tune how likely floor tiles are to be ripped apart by air pressure
+        /// </summary>
+        public static readonly CVarDef<float> MonstermosRipTilesPressureOffset =
+            CVarDef.Create("atmos.monstermos_rip_tiles_pressure_offset", 0.44f, CVar.SERVERONLY);
 
         /// <summary>
         ///     Whether explosive depressurization will cause the grid to gain an impulse.
@@ -1197,6 +1264,13 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<float> AtmosSpacingMaxWind =
             CVarDef.Create("atmos.mmos_max_wind", 500f, CVar.SERVERONLY);
 
+        /// <summary>
+        /// Increases default airflow calculations to O(n^2) complexity, for use with heavy space wind optimizations. Potato servers BEWARE
+        /// This solves the problem of objects being trapped in an infinite loop of slamming into a wall repeatedly.
+        /// </summary>
+        public static readonly CVarDef<bool> MonstermosUseExpensiveAirflow =
+            CVarDef.Create("atmos.mmos_expensive_airflow", true, CVar.SERVERONLY);
+
         /// <summary>
         ///     Whether atmos superconduction is enabled.
         /// </summary>
@@ -1253,6 +1327,13 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<float> AtmosHeatScale =
             CVarDef.Create("atmos.heat_scale", 8f, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     A multiplier on the amount of force applied to Humanoid entities, as tracked by HumanoidAppearanceComponent
+        ///     This multiplier is added after all other checks are made, and applies to both throwing force, and how easy it is for an entity to be thrown.
+        /// </summary>
+        public static readonly CVarDef<float> AtmosHumanoidThrowMultiplier =
+            CVarDef.Create("atmos.humanoid_throw_multiplier", 2f, CVar.SERVERONLY);
+
         /*
          * MIDI instruments
          */
@@ -1301,6 +1382,9 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> OocEnableDuringRound =
             CVarDef.Create("ooc.enable_during_round", true, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);
 
+        public static readonly CVarDef<bool> ShowOocPatronColor =
+            CVarDef.Create("ooc.show_ooc_patron_color", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.CLIENT);
+
         /*
          * LOOC
          */
@@ -1335,7 +1419,7 @@ public static readonly CVarDef<bool>
         ///     Controls whether the server will deny any players that are not whitelisted in the DB.
         /// </summary>
         public static readonly CVarDef<bool> WhitelistEnabled =
-            CVarDef.Create("whitelist.enabled", true, CVar.SERVERONLY);
+            CVarDef.Create("whitelist.enabled", false, CVar.SERVERONLY);
 
         /// <summary>
         ///     The loc string to display as a disconnect reason when someone is not whitelisted.
@@ -1638,6 +1722,23 @@ public static readonly CVarDef<int>
         public static readonly CVarDef<int> ViewportWidth =
             CVarDef.Create("viewport.width", 21, CVar.CLIENTONLY | CVar.ARCHIVE);
 
+        /*
+         * FOV
+         */
+
+        /// <summary>
+        ///     The number by which the current FOV size is divided for each level.
+        /// </summary>
+        public static readonly CVarDef<float> ZoomLevelStep =
+            CVarDef.Create("fov.zoom_step", 1.2f, CVar.SERVER | CVar.REPLICATED);
+
+        /// <summary>
+        ///     How many times the player can zoom in until they reach the minimum zoom.
+        ///     This does not affect the maximum zoom.
+        /// </summary>
+        public static readonly CVarDef<int> ZoomLevels =
+            CVarDef.Create("fov.zoom_levels", 7, CVar.SERVER | CVar.REPLICATED);
+
         /*
          * UI
          */
@@ -1656,6 +1757,13 @@ public static readonly CVarDef<int>
         * Accessibility
         */
 
+        /// <summary>
+        /// Chat window opacity slider, controlling the alpha of the chat window background.
+        /// Goes from to 0 (completely transparent) to 1 (completely opaque)
+        /// </summary>
+        public static readonly CVarDef<float> ChatWindowOpacity =
+            CVarDef.Create("accessibility.chat_window_transparency", 0.85f, CVar.CLIENTONLY | CVar.ARCHIVE);
+
         /// <summary>
         /// Toggle for visual effects that may potentially cause motion sickness.
         /// Where reasonable, effects affected by this CVar should use an alternate effect.
@@ -2164,7 +2272,7 @@ public static readonly CVarDef<float>
         ///     Whether height & width sliders adjust a player's max view distance
         /// </summary>
         public static readonly CVarDef<bool> HeightAdjustModifiesZoom =
-            CVarDef.Create("heightadjust.modifies_zoom", true, CVar.SERVERONLY);
+            CVarDef.Create("heightadjust.modifies_zoom", false, CVar.SERVERONLY);
 
         /// <summary>
         ///     Enables station goals
@@ -2177,5 +2285,54 @@ public static readonly CVarDef<float>
         /// </summary>
         public static readonly CVarDef<float> StationGoalsChance =
             CVarDef.Create("game.station_goals_chance", 0.1f, CVar.SERVERONLY);
+
+        #region Contests System
+
+        /// <summary>
+        ///     The MASTER TOGGLE for the entire Contests System.
+        ///     ALL CONTESTS BELOW, regardless of type or setting will output 1f when false.
+        /// </summary>
+        public static readonly CVarDef<bool> DoContestsSystem =
+            CVarDef.Create("contests.do_contests_system", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Contest functions normally include an optional override to bypass the clamp set by max_percentage.
+        ///     This CVar disables the bypass when false, forcing all implementations to comply with max_percentage.
+        /// </summary>
+        public static readonly CVarDef<bool> AllowClampOverride =
+            CVarDef.Create("contests.allow_clamp_override", true, CVar.REPLICATED | CVar.SERVER);
+        /// <summary>
+        ///     Toggles all MassContest functions. All mass contests output 1f when false
+        /// </summary>
+        public static readonly CVarDef<bool> DoMassContests =
+            CVarDef.Create("contests.do_mass_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Toggles all StaminaContest functions. All stamina contests output 1f when false
+        /// </summary>
+        public static readonly CVarDef<bool> DoStaminaContests =
+            CVarDef.Create("contests.do_stamina_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Toggles all HealthContest functions. All health contests output 1f when false
+        /// </summary>
+        public static readonly CVarDef<bool> DoHealthContests =
+            CVarDef.Create("contests.do_health_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Toggles all MindContest functions. All mind contests output 1f when false.
+        ///     MindContests are not currently implemented, and are awaiting completion of the Psionic Refactor
+        /// </summary>
+        public static readonly CVarDef<bool> DoMindContests =
+            CVarDef.Create("contests.do_mind_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     The maximum amount that Mass Contests can modify a physics multiplier, given as a +/- percentage
+        ///     Default of 0.25f outputs between * 0.75f and 1.25f
+        /// </summary>
+        public static readonly CVarDef<float> MassContestsMaxPercentage =
+            CVarDef.Create("contests.max_percentage", 0.25f, CVar.REPLICATED | CVar.SERVER);
+
+        #endregion
     }
 }
diff --git a/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs b/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs
index 7b1acf836fd..bf82a08127e 100644
--- a/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs
+++ b/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs
@@ -32,16 +32,30 @@ public sealed partial class CargoBountyConsoleComponent : Component
     /// </summary>
     [DataField("printSound")]
     public SoundSpecifier PrintSound = new SoundPathSpecifier("/Audio/Machines/printer.ogg");
+
+    /// <summary>
+    /// The sound made when the bounty is skipped.
+    /// </summary>
+    [DataField("skipSound")]
+    public SoundSpecifier SkipSound = new SoundPathSpecifier("/Audio/Effects/Cargo/ping.ogg");
+
+    /// <summary>
+    /// The sound made when bounty skipping is denied due to lacking access.
+    /// </summary>
+    [DataField("denySound")]
+    public SoundSpecifier DenySound = new SoundPathSpecifier("/Audio/Effects/Cargo/buzz_two.ogg");
 }
 
 [NetSerializable, Serializable]
 public sealed class CargoBountyConsoleState : BoundUserInterfaceState
 {
     public List<CargoBountyData> Bounties;
+    public TimeSpan UntilNextSkip;
 
-    public CargoBountyConsoleState(List<CargoBountyData> bounties)
+    public CargoBountyConsoleState(List<CargoBountyData> bounties, TimeSpan untilNextSkip)
     {
         Bounties = bounties;
+        UntilNextSkip = untilNextSkip;
     }
 }
 
@@ -55,3 +69,14 @@ public BountyPrintLabelMessage(string bountyId)
         BountyId = bountyId;
     }
 }
+
+[Serializable, NetSerializable]
+public sealed class BountySkipMessage : BoundUserInterfaceMessage
+{
+    public string BountyId;
+
+    public BountySkipMessage(string bountyId)
+    {
+        BountyId = bountyId;
+    }
+}
diff --git a/Content.Shared/Charges/Systems/SharedChargesSystem.cs b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
index 021191ac263..5de1383cde0 100644
--- a/Content.Shared/Charges/Systems/SharedChargesSystem.cs
+++ b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
@@ -61,4 +61,26 @@ public virtual void UseCharge(EntityUid uid, LimitedChargesComponent? comp = nul
         if (Resolve(uid, ref comp, false))
             AddCharges(uid, -1, comp);
     }
+
+    /// <summary>
+    /// Gets the limited charges component and returns true if the number of charges remaining is less than the specified value.
+    /// Will return false if there is no limited charges component.
+    /// </summary>
+    public bool HasInsufficientCharges(EntityUid uid, int requiredCharges, LimitedChargesComponent? comp = null)
+    {
+        // can't be empty if there are no limited charges
+        if (!Resolve(uid, ref comp, false))
+            return false;
+
+        return comp.Charges < requiredCharges;
+    }
+
+    /// <summary>
+    /// Uses up a specified number of charges. Must check HasInsufficentCharges beforehand to prevent using with insufficient remaining charges.
+    /// </summary>
+    public virtual void UseCharges(EntityUid uid, int chargesUsed, LimitedChargesComponent? comp = null)
+    {
+        if (Resolve(uid, ref comp, false))
+            AddCharges(uid, -chargesUsed, comp);
+    }
 }
diff --git a/Content.Shared/Chat/TypingIndicator/TypingIndicatorPrototype.cs b/Content.Shared/Chat/TypingIndicator/TypingIndicatorPrototype.cs
index 8cbfe7bb2e4..63008c6e08d 100644
--- a/Content.Shared/Chat/TypingIndicator/TypingIndicatorPrototype.cs
+++ b/Content.Shared/Chat/TypingIndicator/TypingIndicatorPrototype.cs
@@ -23,6 +23,6 @@ public sealed partial class TypingIndicatorPrototype : IPrototype
     public Vector2 Offset = new(0, 0);
 
     [DataField("shader")]
-    public string Shader = "unshaded";
+    public string Shader = "shaded";
 
 }
diff --git a/Content.Shared/Chat/V2/Moderation/ChatCensor.cs b/Content.Shared/Chat/V2/Moderation/ChatCensor.cs
new file mode 100644
index 00000000000..b5d6aa03441
--- /dev/null
+++ b/Content.Shared/Chat/V2/Moderation/ChatCensor.cs
@@ -0,0 +1,59 @@
+using System.Linq;
+
+namespace Content.Shared.Chat.V2.Moderation;
+
+public interface IChatCensor
+{
+    public bool Censor(string input, out string output, char replaceWith = '*');
+}
+
+public sealed class CompoundChatCensor(IEnumerable<IChatCensor> censors) : IChatCensor
+{
+    public bool Censor(string input, out string output, char replaceWith = '*')
+    {
+        var censored = false;
+
+        foreach (var censor in censors)
+        {
+            if (censor.Censor(input, out output, replaceWith))
+            {
+                censored = true;
+            }
+        }
+
+        output = input;
+
+        return censored;
+    }
+}
+
+public sealed class ChatCensorFactory
+{
+    private List<IChatCensor> _censors = new();
+
+    public void With(IChatCensor censor)
+    {
+        _censors.Add(censor);
+    }
+
+    /// <summary>
+    /// Builds a ChatCensor that combines all the censors that have been added to this.
+    /// </summary>
+    public IChatCensor Build()
+    {
+        return new CompoundChatCensor(_censors.ToArray());
+    }
+
+    /// <summary>
+    /// Resets the build state to zero, allowing for different rules to be provided to the next censor(s) built.
+    /// </summary>
+    /// <returns>True if the builder had any setup prior to the reset.</returns>
+    public bool Reset()
+    {
+        var notEmpty = _censors.Count > 0;
+
+        _censors = new List<IChatCensor>();
+
+        return notEmpty;
+    }
+}
diff --git a/Content.Shared/Chat/V2/Moderation/RegexCensor.cs b/Content.Shared/Chat/V2/Moderation/RegexCensor.cs
new file mode 100644
index 00000000000..cd47bf0c33c
--- /dev/null
+++ b/Content.Shared/Chat/V2/Moderation/RegexCensor.cs
@@ -0,0 +1,15 @@
+using System.Text.RegularExpressions;
+
+namespace Content.Shared.Chat.V2.Moderation;
+
+public sealed class RegexCensor(Regex censorInstruction) : IChatCensor
+{
+    private readonly Regex _censorInstruction = censorInstruction;
+
+    public bool Censor(string input, out string output, char replaceWith = '*')
+    {
+        output = _censorInstruction.Replace(input, replaceWith.ToString());
+
+        return !string.Equals(input, output);
+    }
+}
diff --git a/Content.Shared/Chat/V2/Moderation/SimpleCensor.cs b/Content.Shared/Chat/V2/Moderation/SimpleCensor.cs
new file mode 100644
index 00000000000..a6bb70dd9f6
--- /dev/null
+++ b/Content.Shared/Chat/V2/Moderation/SimpleCensor.cs
@@ -0,0 +1,340 @@
+using System.Collections.Frozen;
+using System.Linq;
+using System.Text;
+using System.Text.Unicode;
+
+namespace Content.Shared.Chat.V2.Moderation;
+
+/// <summary>
+/// A basic censor. Not bullet-proof.
+/// </summary>
+public sealed class SimpleCensor : IChatCensor
+{
+    // Common substitution symbols are replaced with one of the characters they commonly substitute.
+    private bool _shouldSanitizeLeetspeak;
+    private FrozenDictionary<char, char> _leetspeakReplacements = FrozenDictionary<char, char>.Empty;
+
+    // Special characters are replaced with spaces.
+    private bool _shouldSanitizeSpecialCharacters;
+    private HashSet<char> _specialCharacterReplacements = [];
+
+    // Censored words are removed unless they're a false positive (e.g. Scunthorpe)
+    private string[] _censoredWords = Array.Empty<string>();
+    private string[] _falsePositives = Array.Empty<string>();
+
+    // False negatives are censored words that contain a false positives.
+    private string[] _falseNegatives = Array.Empty<string>();
+
+    // What unicode ranges are allowed? If this array is empty, don't filter by range.
+    private UnicodeRange[] _allowedUnicodeRanges= Array.Empty<UnicodeRange>();
+
+    /// <summary>
+    /// Censors the input string.
+    /// </summary>
+    /// <param name="input">The input string</param>
+    /// <param name="output">The output string</param>
+    /// <param name="replaceWith">The character to replace with</param>
+    /// <returns>If output is valid</returns>
+    public bool Censor(string input, out string output, char replaceWith = '*')
+    {
+        output = Censor(input, replaceWith);
+
+        return !string.Equals(input, output);
+    }
+
+    public string Censor(string input, char replaceWith = '*')
+    {
+        // We flat-out ban anything not in the allowed unicode ranges, stripping them
+        input = SanitizeOutBlockedUnicode(input);
+
+        var originalInput = input.ToCharArray();
+
+        input = SanitizeInput(input);
+
+        var censored = input.ToList();
+
+        // Remove false negatives
+        input = CheckProfanity(input, censored, _falseNegatives, replaceWith);
+
+        // Get false positives
+        var falsePositives = FindFalsePositives(censored, replaceWith);
+
+        // Remove censored words
+        CheckProfanity(input, censored, _censoredWords, replaceWith);
+
+        // Reconstruct
+        // Reconstruct false positives
+        for (var i = 0; i < falsePositives.Length; i++)
+        {
+            if (falsePositives[i] != replaceWith)
+            {
+                censored[i] = falsePositives[i];
+            }
+        }
+
+        for (var i = 0; i < originalInput.Length; i++)
+        {
+            if (originalInput[i] == ' ')
+            {
+                censored.Insert(i, ' ');
+
+                continue;
+            }
+
+            if (_shouldSanitizeSpecialCharacters && _specialCharacterReplacements.Contains(originalInput[i]))
+            {
+                censored.Insert(i, originalInput[i]);
+
+                continue;
+            }
+
+            if (_shouldSanitizeLeetspeak || _shouldSanitizeSpecialCharacters)
+            {
+                // detect "()"
+                if (originalInput[i] == '(' && i != originalInput.Length - 1 && originalInput[i+1] == ')')
+                {
+                    // censored has now had "o" replaced with "o) so both strings line up again..."
+                    censored.Insert(i+1, censored[i] != replaceWith ? ')' : replaceWith);
+                }
+            }
+
+            if (censored[i] != replaceWith)
+            {
+                censored[i] = originalInput[i];
+            }
+        }
+
+        // SO says this is fast...
+        return string.Concat(censored);
+    }
+
+    /// <summary>
+    /// Adds a l33tsp34k sanitization rule
+    /// </summary>
+    /// <returns>The censor for further configuration</returns>
+    public SimpleCensor WithSanitizeLeetSpeak()
+    {
+        _shouldSanitizeLeetspeak = true;
+
+        return BuildCharacterReplacements();
+    }
+
+    /// <summary>
+    /// Adds a l33tsp34k sanitization rule
+    /// </summary>
+    /// <returns>The censor for further configuration</returns>
+    public SimpleCensor WithSanitizeSpecialCharacters()
+    {
+        _shouldSanitizeSpecialCharacters = true;
+
+        return BuildCharacterReplacements();
+    }
+
+    public SimpleCensor WithRanges(UnicodeRange[] ranges)
+    {
+        _allowedUnicodeRanges = ranges;
+
+        return this;
+    }
+
+    public SimpleCensor WithCustomDictionary(string[] naughtyWords)
+    {
+        _censoredWords = naughtyWords;
+
+        return this;
+    }
+
+    public SimpleCensor WithFalsePositives(string[] falsePositives)
+    {
+        _falsePositives = falsePositives;
+
+        return this;
+    }
+
+    public SimpleCensor WithFalseNegatives(string[] falseNegatives)
+    {
+        _falseNegatives = falseNegatives;
+
+        return this;
+    }
+
+    public SimpleCensor WithLeetspeakReplacements(Dictionary<char, char> replacements)
+    {
+        _leetspeakReplacements = replacements.ToFrozenDictionary();
+
+        return this;
+    }
+
+    public SimpleCensor WithSpecialCharacterReplacements(Dictionary<char, char> replacements)
+    {
+        _leetspeakReplacements = replacements.ToFrozenDictionary();
+
+        return this;
+    }
+
+    private string CheckProfanity(string input, List<char> censored, string[] words, char replaceWith = '*')
+    {
+        foreach (var word in words)
+        {
+            var wordLength = word.Length;
+            var endOfFoundWord = 0;
+            var foundIndex = input.IndexOf(word, endOfFoundWord, StringComparison.OrdinalIgnoreCase);
+
+            while(foundIndex > -1)
+            {
+                endOfFoundWord = foundIndex + wordLength;
+
+                for (var i = 0; i < wordLength; i++)
+                {
+                    censored[foundIndex+i] = replaceWith;
+                }
+
+                foundIndex = input.IndexOf(word, endOfFoundWord, StringComparison.OrdinalIgnoreCase);
+            }
+        }
+
+        return input;
+    }
+
+    private char[] FindFalsePositives(List<char> chars, char replaceWith = '*')
+    {
+        var input = string.Concat(chars);
+
+        var output = Enumerable.Repeat(replaceWith, input.Length).ToArray();
+        var inputAsARr = input.ToArray();
+
+        foreach (var word in _falsePositives)
+        {
+            var wordLength = word.Length;
+            var endOfFoundWord = 0;
+            var foundIndex = input.IndexOf(word, endOfFoundWord, StringComparison.OrdinalIgnoreCase);
+
+            while(foundIndex > -1)
+            {
+                endOfFoundWord = foundIndex + wordLength;
+
+                for (var i = foundIndex; i < endOfFoundWord; i++)
+                {
+                    output[i] = inputAsARr[i];
+                }
+
+                foundIndex = input.IndexOf(word, endOfFoundWord, StringComparison.OrdinalIgnoreCase);
+            }
+        }
+
+        return output;
+    }
+
+    private string SanitizeInput(string input)
+    {
+        // "()" is a broad enough trick to beat censors that we we should check for it broadly.
+        if (_shouldSanitizeLeetspeak || _shouldSanitizeSpecialCharacters)
+        {
+            input = input.Replace("()", "o");
+        }
+
+        var sb = new StringBuilder();
+
+        // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
+        foreach (var character in input)
+        {
+            if (character == ' ' || _shouldSanitizeSpecialCharacters && _specialCharacterReplacements.Contains(character))
+            {
+                continue;
+            }
+
+            if (_shouldSanitizeLeetspeak && _leetspeakReplacements.TryGetValue(character, out var leetRepl))
+            {
+                sb.Append(leetRepl);
+
+                continue;
+            }
+
+            sb.Append(character);
+        }
+
+        return sb.ToString();
+    }
+
+    /// <summary>
+    /// Returns a string with all characters not in ISO-8851-1 replaced with question marks
+    /// </summary>
+    private string SanitizeOutBlockedUnicode(string input)
+    {
+        if (_allowedUnicodeRanges.Length <= 0)
+        {
+            return input;
+        }
+
+        var sb = new StringBuilder();
+
+        foreach (var symbol in input.EnumerateRunes())
+        {
+            // ReSharper disable once LoopCanBeConvertedToQuery
+            foreach (var range in _allowedUnicodeRanges)
+            {
+                if (symbol.Value < range.FirstCodePoint || symbol.Value >= range.FirstCodePoint + range.Length)
+                    continue;
+
+                sb.Append(symbol);
+
+                break;
+            }
+        }
+
+        return sb.ToString();
+    }
+
+    private SimpleCensor BuildCharacterReplacements()
+    {
+        if (_shouldSanitizeSpecialCharacters)
+        {
+            _specialCharacterReplacements =
+            [
+                '-',
+                '_',
+                '|',
+                '.',
+                ',',
+                '(',
+                ')',
+                '<',
+                '>',
+                '"',
+                '`',
+                '~',
+                '*',
+                '&',
+                '%',
+                '$',
+                '#',
+                '@',
+                '!',
+                '?',
+                '+'
+            ];
+        }
+
+        if (_shouldSanitizeLeetspeak)
+        {
+            _leetspeakReplacements = new Dictionary<char, char>
+            {
+                ['4'] = 'a',
+                ['$'] = 's',
+                ['!'] = 'i',
+                ['+'] = 't',
+                ['#'] = 'h',
+                ['@'] = 'a',
+                ['0'] = 'o',
+                ['1'] = 'i', // also obviously can be l; gamer-words need i's more though.
+                ['7'] = 'l',
+                ['3'] = 'e',
+                ['5'] = 's',
+                ['9'] = 'g',
+                ['<'] = 'c'
+            }.ToFrozenDictionary();
+        }
+
+        return this;
+    }
+}
diff --git a/Content.Shared/Chemistry/Components/BlockSolutionAccessComponent.cs b/Content.Shared/Chemistry/Components/BlockSolutionAccessComponent.cs
new file mode 100644
index 00000000000..182f92d7d33
--- /dev/null
+++ b/Content.Shared/Chemistry/Components/BlockSolutionAccessComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Chemistry.Components;
+
+/// <summary>
+/// Blocks all attempts to access solutions contained by this entity.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BlockSolutionAccessComponent : Component
+{
+}
diff --git a/Content.Shared/Chemistry/Components/HyposprayComponent.cs b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
index 95f8ffb6e58..05ef84bbaf7 100644
--- a/Content.Shared/Chemistry/Components/HyposprayComponent.cs
+++ b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
@@ -1,9 +1,40 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
-using Content.Shared.DoAfter;
+using Robust.Shared.Audio;
 
 namespace Content.Shared.Chemistry.Components;
 
-[Serializable, NetSerializable]
-public sealed partial class HyposprayDoAfterEvent : SimpleDoAfterEvent
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class HyposprayComponent : Component
 {
-}
\ No newline at end of file
+    [DataField]
+    public string SolutionName = "hypospray";
+
+    // TODO: This should be on clumsycomponent.
+    [DataField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float ClumsyFailChance = 0.5f;
+
+    [DataField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public FixedPoint2 TransferAmount = FixedPoint2.New(5);
+
+    [DataField]
+    public SoundSpecifier InjectSound = new SoundPathSpecifier("/Audio/Items/hypospray.ogg");
+
+    /// <summary>
+    /// Decides whether you can inject everything or just mobs.
+    /// When you can only affect mobs, you're capable of drawing from beakers.
+    /// </summary>
+    [AutoNetworkedField]
+    [DataField(required: true)]
+    public bool OnlyAffectsMobs = false;
+
+    /// <summary>
+    /// Whether or not the hypospray is able to draw from containers or if it's a single use
+    /// device that can only inject.
+    /// </summary>
+    [DataField]
+    public bool InjectOnly = false;
+}
diff --git a/Content.Shared/Chemistry/Components/ScoopableSolutionComponent.cs b/Content.Shared/Chemistry/Components/ScoopableSolutionComponent.cs
new file mode 100644
index 00000000000..6c3f934b7a8
--- /dev/null
+++ b/Content.Shared/Chemistry/Components/ScoopableSolutionComponent.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Chemistry.Components;
+
+/// <summary>
+/// Basically reverse spiking, instead of using the solution-entity on a beaker, you use the beaker on the solution-entity.
+/// If there is not enough volume it will stay in the solution-entity rather than spill onto the floor.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ScoopableSolutionSystem))]
+public sealed partial class ScoopableSolutionComponent : Component
+{
+    /// <summary>
+    /// Solution name that can be scooped from.
+    /// </summary>
+    [DataField]
+    public string Solution = "default";
+
+    /// <summary>
+    /// If true, when the whole solution is scooped up the entity will be deleted.
+    /// </summary>
+    [DataField]
+    public bool Delete = true;
+
+    /// <summary>
+    /// Popup to show the user when scooping.
+    /// Passed entities "scooped" and "beaker".
+    /// </summary>
+    [DataField]
+    public LocId Popup = "scoopable-component-popup";
+}
diff --git a/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs b/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs
deleted file mode 100644
index a8df6be1090..00000000000
--- a/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Shared.FixedPoint;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Chemistry.Components;
-
-[NetworkedComponent()]
-public abstract partial class SharedHyposprayComponent : Component
-{
-    [DataField("solutionName")]
-    public string SolutionName = "hypospray";
-}
-
-[Serializable, NetSerializable]
-public sealed class HyposprayComponentState : ComponentState
-{
-    public FixedPoint2 CurVolume { get; }
-    public FixedPoint2 MaxVolume { get; }
-
-    public HyposprayComponentState(FixedPoint2 curVolume, FixedPoint2 maxVolume)
-    {
-        CurVolume = curVolume;
-        MaxVolume = maxVolume;
-    }
-}
diff --git a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
index 76e7967db26..1abe81180c8 100644
--- a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
@@ -5,4 +5,10 @@ public sealed partial class ExaminableSolutionComponent : Component
 {
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public string Solution = "default";
+
+    /// <summary>
+    /// If false then the hidden solution is always visible.
+    /// </summary>
+    [DataField]
+    public bool HeldOnly;
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs b/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
new file mode 100644
index 00000000000..84f1e456160
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
@@ -0,0 +1,53 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Robust.Shared.Network;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+/// <summary>
+/// Handles solution transfer when a beaker is used on a scoopable entity.
+/// </summary>
+public sealed class ScoopableSolutionSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _netManager = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
+    [Dependency] private readonly SolutionTransferSystem _solutionTransfer = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ScoopableSolutionComponent, InteractUsingEvent>(OnInteractUsing);
+    }
+
+    private void OnInteractUsing(Entity<ScoopableSolutionComponent> ent, ref InteractUsingEvent args)
+    {
+        TryScoop(ent, args.Used, args.User);
+    }
+
+    public bool TryScoop(Entity<ScoopableSolutionComponent> ent, EntityUid beaker, EntityUid user)
+    {
+        if (!_solution.TryGetSolution(ent.Owner, ent.Comp.Solution, out var src, out var srcSolution) ||
+            !_solution.TryGetRefillableSolution(beaker, out var target, out _))
+            return false;
+
+        var scooped = _solutionTransfer.Transfer(user, ent, src.Value, beaker, target.Value, srcSolution.Volume);
+        if (scooped == 0)
+            return false;
+
+        _popup.PopupClient(Loc.GetString(ent.Comp.Popup, ("scooped", ent.Owner), ("beaker", beaker)), user, user);
+
+        if (srcSolution.Volume == 0 && ent.Comp.Delete)
+        {
+            // deletion isnt predicted so do this to prevent spam clicking to see "the ash is empty!"
+            RemCompDeferred<ScoopableSolutionComponent>(ent);
+
+            if (!_netManager.IsClient)
+                QueueDel(ent);
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs
new file mode 100644
index 00000000000..b647d33c98c
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs
@@ -0,0 +1,61 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Timing;
+using Content.Shared.Verbs;
+using Content.Shared.Popups;
+using Robust.Shared.Player;
+using Content.Shared.Administration.Logs;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+public abstract class SharedHypospraySystem : EntitySystem
+{
+    [Dependency] protected readonly UseDelaySystem _useDelay = default!;
+    [Dependency] protected readonly SharedPopupSystem _popup = default!;
+    [Dependency] protected readonly SharedSolutionContainerSystem _solutionContainers = default!;
+    [Dependency] protected readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] protected readonly ReactiveSystem _reactiveSystem = default!;
+    
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<HyposprayComponent, GetVerbsEvent<AlternativeVerb>>(AddToggleModeVerb);
+    }
+
+    // <summary>
+    // Uses the OnlyMobs field as a check to implement the ability
+    // to draw from jugs and containers with the hypospray
+    // Toggleable to allow people to inject containers if they prefer it over drawing
+    // </summary>
+    private void AddToggleModeVerb(Entity<HyposprayComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null || entity.Comp.InjectOnly)
+            return;
+
+        var (_, component) = entity;
+        var user = args.User;
+        var verb = new AlternativeVerb
+        {
+            Text = Loc.GetString("hypospray-verb-mode-label"),
+            Act = () =>
+            {
+                ToggleMode(entity, user);
+            }
+        };
+        args.Verbs.Add(verb);
+    }
+
+    private void ToggleMode(Entity<HyposprayComponent> entity, EntityUid user)
+    {
+        SetMode(entity, !entity.Comp.OnlyAffectsMobs);
+        string msg = entity.Comp.OnlyAffectsMobs ? "hypospray-verb-mode-inject-mobs-only" : "hypospray-verb-mode-inject-all";
+        _popup.PopupClient(Loc.GetString(msg), entity, user);
+    }
+
+    public void SetMode(Entity<HyposprayComponent> entity, bool onlyAffectsMobs)
+    {
+        if (entity.Comp.OnlyAffectsMobs == onlyAffectsMobs)
+            return;
+
+        entity.Comp.OnlyAffectsMobs = onlyAffectsMobs;
+        Dirty(entity);
+    }
+}
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
index 7e41cb39bd6..6c43c1d5f06 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
@@ -37,10 +37,7 @@ private void AddSetTransferVerbs(Entity<InjectorComponent> entity, ref GetVerbsE
         if (!args.CanAccess || !args.CanInteract || args.Hands == null)
             return;
 
-        if (!HasComp<ActorComponent>(args.User))
-            return;
         var user = args.User;
-
         var (_, component) = entity;
 
         var min = component.MinimumTransferAmount;
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 6e762aa5984..e74c1463804 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -13,6 +13,8 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Dependency = Robust.Shared.IoC.DependencyAttribute;
 
 namespace Content.Shared.Chemistry.EntitySystems;
@@ -53,7 +55,9 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     [Dependency] protected readonly ChemicalReactionSystem ChemicalReactionSystem = default!;
     [Dependency] protected readonly ExamineSystemShared ExamineSystem = default!;
     [Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
+    [Dependency] protected readonly SharedHandsSystem Hands = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
+    [Dependency] protected readonly MetaDataSystem MetaData = default!;
 
     public override void Initialize()
     {
@@ -133,6 +137,12 @@ public bool TryGetSolution(Entity<SolutionContainerManagerComponent?> container,
     /// <inheritdoc cref="TryGetSolution"/>
     public bool TryGetSolution(Entity<SolutionContainerManagerComponent?> container, string? name, [NotNullWhen(true)] out Entity<SolutionComponent>? entity)
     {
+        if (TryComp(container, out BlockSolutionAccessComponent? blocker))
+        {
+            entity = null;
+            return false;
+        }
+
         EntityUid uid;
         if (name is null)
             uid = container;
@@ -178,6 +188,9 @@ public bool TryGetSolution(SolutionContainerManagerComponent container, string n
         if (!Resolve(container, ref container.Comp, logMissing: false))
             yield break;
 
+        if (HasComp<BlockSolutionAccessComponent>(container))
+            yield break;
+
         foreach (var name in container.Comp.Containers)
         {
             if (ContainerSystem.GetContainer(container, $"solution@{name}") is ContainerSlot slot && slot.ContainedEntity is { } solutionId)
@@ -720,6 +733,9 @@ private void OnExamineSolution(Entity<ExaminableSolutionComponent> entity, ref E
             return;
         }
 
+        if (!CanSeeHiddenSolution(entity,args.Examiner))
+            return;
+
         var primaryReagent = solution.GetPrimaryReagentId();
 
         if (string.IsNullOrEmpty(primaryReagent?.Prototype))
@@ -816,6 +832,9 @@ private void OnSolutionExaminableVerb(Entity<ExaminableSolutionComponent> entity
             return;
         }
 
+        if (!CanSeeHiddenSolution(entity,args.User))
+            return;
+
         var target = args.Target;
         var user = args.User;
         var verb = new ExamineVerb()
@@ -865,5 +884,22 @@ private FormattedMessage GetSolutionExamine(Solution solution)
         return msg;
     }
 
+    /// <summary>
+    /// Check if examinable solution requires you to hold the item in hand.
+    /// </summary>
+    private bool CanSeeHiddenSolution(Entity<ExaminableSolutionComponent> entity, EntityUid examiner)
+    {
+        // If not held-only then it's always visible.
+        if (!entity.Comp.HeldOnly)
+            return true;
+
+        if (TryComp(examiner, out HandsComponent? handsComp))
+        {
+            return Hands.IsHolding(examiner, entity, out _, handsComp);
+        }
+
+        return true;
+    }
+
     #endregion Event Handlers
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
new file mode 100644
index 00000000000..34a64d0edbd
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
@@ -0,0 +1,223 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+/// <summary>
+/// Allows an entity to transfer solutions with a customizable amount per click.
+/// Also provides <see cref="Transfer"/> API for other systems.
+/// </summary>
+public sealed class SolutionTransferSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+
+    /// <summary>
+    ///     Default transfer amounts for the set-transfer verb.
+    /// </summary>
+    public static readonly FixedPoint2[] DefaultTransferAmounts = new FixedPoint2[] { 1, 5, 10, 25, 50, 100, 250, 500, 1000 };
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SolutionTransferComponent, GetVerbsEvent<AlternativeVerb>>(AddSetTransferVerbs);
+        SubscribeLocalEvent<SolutionTransferComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<SolutionTransferComponent, TransferAmountSetValueMessage>(OnTransferAmountSetValueMessage);
+    }
+
+    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;
+
+        if (message.Session.AttachedEntity is { Valid: true } user)
+            _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", newTransferAmount)), ent, user);
+    }
+
+    private void AddSetTransferVerbs(Entity<SolutionTransferComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        var (uid, comp) = ent;
+
+        if (!args.CanAccess || !args.CanInteract || !comp.CanChangeTransferAmount || args.Hands == null)
+            return;
+
+        if (!TryComp<ActorComponent>(args.User, out var actor))
+            return;
+
+        // Custom transfer verb
+        args.Verbs.Add(new AlternativeVerb()
+        {
+            Text = Loc.GetString("comp-solution-transfer-verb-custom-amount"),
+            Category = VerbCategory.SetTransferAmount,
+            // TODO: remove server check when bui prediction is a thing
+            Act = () =>
+            {
+                if (_net.IsServer)
+                    _ui.TryOpen(uid, TransferAmountUiKey.Key, actor.PlayerSession);
+            },
+            Priority = 1
+        });
+
+        // Add specific transfer verbs according to the container's size
+        var priority = 0;
+        var user = args.User;
+        foreach (var amount in DefaultTransferAmounts)
+        {
+            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);
+            };
+
+            // we want to sort by size, not alphabetically by the verb text.
+            verb.Priority = priority;
+            priority--;
+
+            args.Verbs.Add(verb);
+        }
+    }
+
+    private void OnAfterInteract(Entity<SolutionTransferComponent> ent, ref AfterInteractEvent args)
+    {
+        if (!args.CanReach || args.Target is not {} target)
+            return;
+
+        var (uid, comp) = ent;
+
+        //Special case for reagent tanks, because normally clicking another container will give solution, not take it.
+        if (comp.CanReceive
+            && !HasComp<RefillableSolutionComponent>(target) // target must not be refillable (e.g. Reagent Tanks)
+            && _solution.TryGetDrainableSolution(target, out var targetSoln, out _) // target must be drainable
+            && TryComp<RefillableSolutionComponent>(uid, out var refill)
+            && _solution.TryGetRefillableSolution((uid, refill, null), out var ownerSoln, out var ownerRefill))
+        {
+            var transferAmount = comp.TransferAmount; // This is the player-configurable transfer amount of "uid," not the target reagent tank.
+
+            // if the receiver has a smaller transfer limit, use that instead
+            if (refill?.MaxRefill is {} maxRefill)
+                transferAmount = FixedPoint2.Min(transferAmount, maxRefill);
+
+            var transferred = Transfer(args.User, target, targetSoln.Value, uid, ownerSoln.Value, transferAmount);
+            if (transferred > 0)
+            {
+                var toTheBrim = ownerRefill.AvailableVolume == 0;
+                var msg = toTheBrim
+                    ? "comp-solution-transfer-fill-fully"
+                    : "comp-solution-transfer-fill-normal";
+
+                _popup.PopupClient(Loc.GetString(msg, ("owner", args.Target), ("amount", transferred), ("target", uid)), uid, args.User);
+
+                args.Handled = true;
+                return;
+            }
+        }
+
+        // if target is refillable, and owner is drainable
+        if (comp.CanSend
+            && TryComp<RefillableSolutionComponent>(target, out var targetRefill)
+            && _solution.TryGetRefillableSolution((target, targetRefill, null), out targetSoln, out _)
+            && _solution.TryGetDrainableSolution(uid, out ownerSoln, out _))
+        {
+            var transferAmount = comp.TransferAmount;
+
+            if (targetRefill?.MaxRefill is {} maxRefill)
+                transferAmount = FixedPoint2.Min(transferAmount, maxRefill);
+
+            var transferred = Transfer(args.User, uid, ownerSoln.Value, target, targetSoln.Value, transferAmount);
+
+            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;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Transfer from a solution to another, allowing either entity to cancel it and show a popup.
+    /// </summary>
+    /// <returns>The actual amount transferred.</returns>
+    public FixedPoint2 Transfer(EntityUid user,
+        EntityUid sourceEntity,
+        Entity<SolutionComponent> source,
+        EntityUid targetEntity,
+        Entity<SolutionComponent> target,
+        FixedPoint2 amount)
+    {
+        var transferAttempt = new SolutionTransferAttemptEvent(sourceEntity, targetEntity);
+
+        // Check if the source is cancelling the transfer
+        RaiseLocalEvent(sourceEntity, ref transferAttempt);
+        if (transferAttempt.CancelReason is {} reason)
+        {
+            _popup.PopupClient(reason, sourceEntity, user);
+            return FixedPoint2.Zero;
+        }
+
+        var sourceSolution = source.Comp.Solution;
+        if (sourceSolution.Volume == 0)
+        {
+            _popup.PopupClient(Loc.GetString("comp-solution-transfer-is-empty", ("target", sourceEntity)), sourceEntity, user);
+            return FixedPoint2.Zero;
+        }
+
+        // Check if the target is cancelling the transfer
+        RaiseLocalEvent(targetEntity, ref transferAttempt);
+        if (transferAttempt.CancelReason is {} targetReason)
+        {
+            _popup.PopupClient(targetReason, targetEntity, user);
+            return FixedPoint2.Zero;
+        }
+
+        var targetSolution = target.Comp.Solution;
+        if (targetSolution.AvailableVolume == 0)
+        {
+            _popup.PopupClient(Loc.GetString("comp-solution-transfer-is-full", ("target", targetEntity)), targetEntity, user);
+            return FixedPoint2.Zero;
+        }
+
+        var actualAmount = FixedPoint2.Min(amount, FixedPoint2.Min(sourceSolution.Volume, targetSolution.AvailableVolume));
+
+        var solution = _solution.SplitSolution(source, actualAmount);
+        _solution.Refill(targetEntity, target, solution);
+
+        _adminLogger.Add(LogType.Action, LogImpact.Medium,
+            $"{ToPrettyString(user):player} transferred {SharedSolutionContainerSystem.ToPrettyString(solution)} to {ToPrettyString(targetEntity):target}, which now contains {SharedSolutionContainerSystem.ToPrettyString(targetSolution)}");
+
+        return actualAmount;
+    }
+}
+
+/// <summary>
+/// Raised when attempting to transfer from one solution to another.
+/// Raised on both the source and target entities so either can cancel the transfer.
+/// To not mispredict this should always be cancelled in shared code and not server or client.
+/// </summary>
+[ByRefEvent]
+public record struct SolutionTransferAttemptEvent(EntityUid From, EntityUid To, string? CancelReason = null)
+{
+    /// <summary>
+    /// Cancels the transfer.
+    /// </summary>
+    public void Cancel(string reason)
+    {
+        CancelReason = reason;
+    }
+}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
index 5bcb21fedb3..41eea55cca4 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
@@ -107,6 +107,7 @@ public readonly record struct ReagentEffectArgs(
         FixedPoint2 Quantity,
         IEntityManager EntityManager,
         ReactionMethod? Method,
-        float Scale
+        float Scale = 1f,
+        float QuantityMultiplier = 1f
     );
 }
diff --git a/Content.Shared/Climbing/Systems/BonkSystem.cs b/Content.Shared/Climbing/Systems/BonkSystem.cs
index c5cbb973766..08ca63368a8 100644
--- a/Content.Shared/Climbing/Systems/BonkSystem.cs
+++ b/Content.Shared/Climbing/Systems/BonkSystem.cs
@@ -57,9 +57,11 @@ public bool TryBonk(EntityUid user, EntityUid bonkableUid, BonkableComponent? bo
         if (user == source)
         {
             // Non-local, non-bonking players
-            _popupSystem.PopupEntity(Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName)), user, Filter.PvsExcept(user), true);
+            var othersMessage = Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName));
             // Local, bonking player
-            _popupSystem.PopupClient(Loc.GetString("bonkable-success-message-user", ("user", userName), ("bonkable", bonkableName)), user, user);
+            var selfMessage = Loc.GetString("bonkable-success-message-user", ("user", userName), ("bonkable", bonkableName));
+
+            _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
         }
         else if (source != null)
         {
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index 6a2976a8387..8f6e8046aa4 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -34,7 +34,6 @@ public sealed partial class ClimbSystem : VirtualController
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly FixtureSystem _fixtureSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
@@ -309,8 +308,7 @@ private void Climb(EntityUid uid, EntityUid user, EntityUid climbable, bool sile
                 ("climbable", climbable));
         }
 
-        _popupSystem.PopupEntity(othersMessage, uid, Filter.PvsExcept(user, entityManager: EntityManager), true);
-        _popupSystem.PopupClient(selfMessage, uid, user);
+        _popupSystem.PopupPredicted(selfMessage, othersMessage, uid, user);
     }
 
     /// <summary>
diff --git a/Content.Shared/Clothing/Components/WaddleWhenWornComponent.cs b/Content.Shared/Clothing/Components/WaddleWhenWornComponent.cs
new file mode 100644
index 00000000000..5cd7a724577
--- /dev/null
+++ b/Content.Shared/Clothing/Components/WaddleWhenWornComponent.cs
@@ -0,0 +1,35 @@
+using System.Numerics;
+
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+/// Defines something as causing waddling when worn.
+/// </summary>
+[RegisterComponent]
+public sealed partial class WaddleWhenWornComponent : Component
+{
+    ///<summary>
+    /// How high should they hop during the waddle? Higher hop = more energy.
+    /// </summary>
+    [DataField]
+    public Vector2 HopIntensity = new(0, 0.25f);
+
+    /// <summary>
+    /// How far should they rock backward and forward during the waddle?
+    /// Each step will alternate between this being a positive and negative rotation. More rock = more scary.
+    /// </summary>
+    [DataField]
+    public float TumbleIntensity = 20.0f;
+
+    /// <summary>
+    /// How long should a complete step take? Less time = more chaos.
+    /// </summary>
+    [DataField]
+    public float AnimationLength = 0.66f;
+
+    /// <summary>
+    /// How much shorter should the animation be when running?
+    /// </summary>
+    [DataField]
+    public float RunAnimationLengthMultiplier = 0.568f;
+}
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index 976682c9903..add47be5411 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -96,7 +96,7 @@ private void QuickEquip(
 
     private void ToggleVisualLayer(EntityUid equipee, HumanoidVisualLayers layer, string tag)
     {
-        InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee);
+        InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee, SlotFlags.HEAD ^ SlotFlags.MASK);
         bool shouldLayerShow = true;
 
         while (enumerator.NextItem(out EntityUid item))
@@ -169,7 +169,7 @@ private void OnEquipDoAfter(Entity<ClothingComponent> ent, ref ClothingEquipDoAf
     {
         if (args.Handled || args.Cancelled || args.Target is not { } target)
             return;
-        args.Handled = _invSystem.TryEquip(args.User, target, ent, args.Slot, clothing: ent.Comp,  predicted: true, checkDoafter: false);
+        args.Handled = _invSystem.TryEquip(args.User, target, ent, args.Slot, clothing: ent.Comp, predicted: true, checkDoafter: false);
     }
 
     private void OnUnequipDoAfter(Entity<ClothingComponent> ent, ref ClothingUnequipDoAfterEvent args)
diff --git a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
index 22a1d1a8f52..4abe7bc876a 100644
--- a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
@@ -27,6 +27,7 @@ public sealed class ToggleableClothingSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedStrippableSystem _strippable = default!;
+    [Dependency] private readonly ThievingSystem _thieving = default!;
 
     public override void Initialize()
     {
@@ -97,6 +98,8 @@ private void StartDoAfter(EntityUid user, EntityUid item, EntityUid wearer, Togg
 
         var (time, stealth) = _strippable.GetStripTimeModifiers(user, wearer, component.StripDelay.Value);
 
+        bool hidden = (stealth == ThievingStealth.Hidden);
+
         var args = new DoAfterArgs(EntityManager, user, time, new ToggleClothingDoAfterEvent(), item, wearer, item)
         {
             BreakOnDamage = true,
@@ -110,11 +113,8 @@ private void StartDoAfter(EntityUid user, EntityUid item, EntityUid wearer, Togg
         if (!_doAfter.TryStartDoAfter(args))
             return;
 
-        if (!stealth)
-        {
-            var popup = Loc.GetString("strippable-component-alert-owner-interact", ("user", Identity.Entity(user, EntityManager)), ("item", item));
-            _popupSystem.PopupEntity(popup, wearer, wearer, PopupType.Large);
-        }
+        if (!hidden)
+            _strippable.StripPopup("strippable-component-alert-owner-interact", stealth, wearer, user: Identity.Entity(user, EntityManager), item: item);
     }
 
     private void OnGetAttachedStripVerbsEvent(EntityUid uid, AttachedClothingComponent component, GetVerbsEvent<EquipmentVerb> args)
diff --git a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
index bf0f5195b71..604b067a84f 100644
--- a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
+++ b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
@@ -11,7 +11,7 @@ public partial class SharedCommunicationsConsoleComponent : Component
     public sealed class CommunicationsConsoleInterfaceState : BoundUserInterfaceState
     {
         public readonly bool CanAnnounce;
-        public readonly bool CanBroadcast;
+        public readonly bool CanBroadcast = true;
         public readonly bool CanCall;
         public readonly TimeSpan? ExpectedCountdownEnd;
         public readonly bool CountdownStarted;
@@ -19,10 +19,9 @@ public sealed class CommunicationsConsoleInterfaceState : BoundUserInterfaceStat
         public string CurrentAlert;
         public float CurrentAlertDelay;
 
-        public CommunicationsConsoleInterfaceState(bool canAnnounce, bool canBroadcast, bool canCall, List<string>? alertLevels, string currentAlert, float currentAlertDelay, TimeSpan? expectedCountdownEnd = null)
+        public CommunicationsConsoleInterfaceState(bool canAnnounce, bool canCall, List<string>? alertLevels, string currentAlert, float currentAlertDelay, TimeSpan? expectedCountdownEnd = null)
         {
             CanAnnounce = canAnnounce;
-            CanBroadcast = canBroadcast;
             CanCall = canCall;
             ExpectedCountdownEnd = expectedCountdownEnd;
             CountdownStarted = expectedCountdownEnd != null;
diff --git a/Content.Shared/Construction/Components/ComputerBoardComponent.cs b/Content.Shared/Construction/Components/ComputerBoardComponent.cs
index f80a6687781..539e09245d3 100644
--- a/Content.Shared/Construction/Components/ComputerBoardComponent.cs
+++ b/Content.Shared/Construction/Components/ComputerBoardComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Construction.Components
@@ -9,7 +9,7 @@ namespace Content.Shared.Construction.Components
     [RegisterComponent]
     public sealed partial class ComputerBoardComponent : Component
     {
-        [DataField("prototype", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+        [DataField("prototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? Prototype { get; private set; }
     }
 }
diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
index 70bcfbab43f..c041cf1ba06 100644
--- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
+++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
@@ -6,16 +6,15 @@
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Popups;
-using Content.Shared.Pulling;
-using Content.Shared.Pulling.Components;
 using Content.Shared.Tools;
 using Content.Shared.Tools.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Content.Shared.Tag;
-using Robust.Shared.Player;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
@@ -27,7 +26,7 @@ public sealed partial class AnchorableSystem : EntitySystem
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedPullingSystem _pulling = default!;
+    [Dependency] private readonly PullingSystem _pulling = default!;
     [Dependency] private readonly SharedToolSystem _tool = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private   readonly TagSystem _tagSystem = default!;
@@ -132,9 +131,9 @@ private void OnAnchorComplete(EntityUid uid, AnchorableComponent component, TryA
         var rot = xform.LocalRotation;
         xform.LocalRotation = Math.Round(rot / (Math.PI / 2)) * (Math.PI / 2);
 
-        if (TryComp<SharedPullableComponent>(uid, out var pullable) && pullable.Puller != null)
+        if (TryComp<PullableComponent>(uid, out var pullable) && pullable.Puller != null)
         {
-            _pulling.TryStopPull(pullable);
+            _pulling.TryStopPull(uid, pullable);
         }
 
         // TODO: Anchoring snaps rn anyway!
@@ -175,7 +174,7 @@ private void OnAnchorComplete(EntityUid uid, AnchorableComponent component, TryA
     public void TryToggleAnchor(EntityUid uid, EntityUid userUid, EntityUid usingUid,
         AnchorableComponent? anchorable = null,
         TransformComponent? transform = null,
-        SharedPullableComponent? pullable = null,
+        PullableComponent? pullable = null,
         ToolComponent? usingTool = null)
     {
         if (!Resolve(uid, ref transform))
@@ -198,7 +197,7 @@ public void TryToggleAnchor(EntityUid uid, EntityUid userUid, EntityUid usingUid
     private void TryAnchor(EntityUid uid, EntityUid userUid, EntityUid usingUid,
             AnchorableComponent? anchorable = null,
             TransformComponent? transform = null,
-            SharedPullableComponent? pullable = null,
+            PullableComponent? pullable = null,
             ToolComponent? usingTool = null)
     {
         if (!Resolve(uid, ref anchorable, ref transform))
@@ -271,7 +270,7 @@ private bool TileFree(EntityCoordinates coordinates, PhysicsComponent anchorBody
         // Probably ignore CanCollide on the anchoring body?
         var gridUid = coordinates.GetGridUid(EntityManager);
 
-        if (!_mapManager.TryGetGrid(gridUid, out var grid))
+        if (!TryComp<MapGridComponent>(gridUid, out var grid))
             return false;
 
         var tileIndices = grid.TileIndicesFor(coordinates);
diff --git a/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs b/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
index 7bb1eadb6a1..b4f7a6b9ee0 100644
--- a/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
+++ b/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Construction.Conditions;
+using Content.Shared.Construction.Conditions;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
diff --git a/Content.Shared/Construction/SharedFlatpackSystem.cs b/Content.Shared/Construction/SharedFlatpackSystem.cs
index a62488d6f38..8b21bca52ae 100644
--- a/Content.Shared/Construction/SharedFlatpackSystem.cs
+++ b/Content.Shared/Construction/SharedFlatpackSystem.cs
@@ -114,8 +114,7 @@ public void SetupFlatpack(Entity<FlatpackComponent?> ent, EntityUid? board)
         if (!Resolve(ent, ref ent.Comp))
             return;
 
-        EntProtoId machinePrototypeId;
-        string? entityPrototype;
+        var machinePrototypeId = new EntProtoId();
         if (TryComp<MachineBoardComponent>(board, out var machineBoard) && machineBoard.Prototype is not null)
             machinePrototypeId = machineBoard.Prototype;
         else if (TryComp<ComputerBoardComponent>(board, out var computerBoard) && computerBoard.Prototype is not null)
diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
index fb50803596e..9cb21e882e3 100644
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
@@ -279,7 +279,7 @@ public bool CanInsert(EntityUid uid, EntityUid usedUid, EntityUid? user, ItemSlo
             if (ev.Cancelled)
                 return false;
 
-            return _containers.CanInsert(usedUid, slot.ContainerSlot, assumeEmpty: true);
+            return _containers.CanInsert(usedUid, slot.ContainerSlot, assumeEmpty: swap);
         }
 
         /// <summary>
diff --git a/Content.Shared/Contests/ContestsSystem.cs b/Content.Shared/Contests/ContestsSystem.cs
new file mode 100644
index 00000000000..47924f4d795
--- /dev/null
+++ b/Content.Shared/Contests/ContestsSystem.cs
@@ -0,0 +1,330 @@
+using Content.Shared.CCVar;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
+using Content.Shared.Mobs.Systems;
+using Robust.Shared.Configuration;
+using Robust.Shared.Physics.Components;
+
+namespace Content.Shared.Contests
+{
+    public sealed partial class ContestsSystem : EntitySystem
+    {
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
+
+        /// <summary>
+        ///     The presumed average mass of a player entity
+        ///     Defaulted to the average mass of an adult human
+        /// </summary>
+        private const float AverageMass = 71f;
+
+        #region Mass Contests
+        /// <summary>
+        ///     Outputs the ratio of mass between a performer and the average human mass
+        /// </summary>
+        /// <param name="performerUid">Uid of Performer</param>
+        public float MassContest(EntityUid performerUid, bool bypassClamp = false, float rangeFactor = 1f, float otherMass = AverageMass)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoMassContests)
+                || !TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+                || performerPhysics.Mass == 0)
+                return 1f;
+
+            return _cfg.GetCVar(CCVars.AllowClampOverride) && bypassClamp
+                ? performerPhysics.Mass / otherMass
+                : Math.Clamp(performerPhysics.Mass / otherMass,
+                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor);
+        }
+
+        /// <inheritdoc cref="MassContest(EntityUid, bool, float, float)"/>
+        /// <remarks>
+        ///     MaybeMassContest, in case your entity doesn't exist
+        /// </remarks>
+        public float MassContest(EntityUid? performerUid, bool bypassClamp = false, float rangeFactor = 1f, float otherMass = AverageMass)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoMassContests)
+                || performerUid is null)
+                return 1f;
+
+            return MassContest(performerUid.Value, bypassClamp, rangeFactor, otherMass);
+        }
+
+        /// <summary>
+        ///     Outputs the ratio of mass between a performer and the average human mass
+        ///     If a function already has the performer's physics component, this is faster
+        /// </summary>
+        /// <param name="performerPhysics"></param>
+        public float MassContest(PhysicsComponent performerPhysics, bool bypassClamp = false, float rangeFactor = 1f, float otherMass = AverageMass)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoMassContests)
+                || performerPhysics.Mass == 0)
+                return 1f;
+
+            return _cfg.GetCVar(CCVars.AllowClampOverride) && bypassClamp
+                ? performerPhysics.Mass / otherMass
+                : Math.Clamp(performerPhysics.Mass / otherMass,
+                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor);
+        }
+
+        /// <summary>
+        ///     Outputs the ratio of mass between a performer and a target, accepts either EntityUids or PhysicsComponents in any combination
+        ///     If you have physics components already in your function, use <see cref="MassContest(PhysicsComponent, float)" /> instead
+        /// </summary>
+        /// <param name="performerUid"></param>
+        /// <param name="targetUid"></param>
+        public float MassContest(EntityUid performerUid, EntityUid targetUid, bool bypassClamp = false, float rangeFactor = 1f)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoMassContests)
+                || !TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+                || !TryComp<PhysicsComponent>(targetUid, out var targetPhysics)
+                || performerPhysics.Mass == 0
+                || targetPhysics.InvMass == 0)
+                return 1f;
+
+            return _cfg.GetCVar(CCVars.AllowClampOverride) && bypassClamp
+                ? performerPhysics.Mass * targetPhysics.InvMass
+                : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
+                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor);
+        }
+
+        /// <inheritdoc cref="MassContest(EntityUid, EntityUid, bool, float)"/>
+        public float MassContest(EntityUid performerUid, PhysicsComponent targetPhysics, bool bypassClamp = false, float rangeFactor = 1f)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoMassContests)
+                || !TryComp<PhysicsComponent>(performerUid, out var performerPhysics)
+                || performerPhysics.Mass == 0
+                || targetPhysics.InvMass == 0)
+                return 1f;
+
+            return _cfg.GetCVar(CCVars.AllowClampOverride) && bypassClamp
+                ? performerPhysics.Mass * targetPhysics.InvMass
+                : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
+                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor);
+        }
+
+        /// <inheritdoc cref="MassContest(EntityUid, EntityUid, bool, float)"/>
+        public float MassContest(PhysicsComponent performerPhysics, EntityUid targetUid, bool bypassClamp = false, float rangeFactor = 1f)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoMassContests)
+                || !TryComp<PhysicsComponent>(targetUid, out var targetPhysics)
+                || performerPhysics.Mass == 0
+                || targetPhysics.InvMass == 0)
+                return 1f;
+
+            return _cfg.GetCVar(CCVars.AllowClampOverride) && bypassClamp
+                ? performerPhysics.Mass * targetPhysics.InvMass
+                : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
+                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor);
+        }
+
+        /// <inheritdoc cref="MassContest(EntityUid, EntityUid, bool, float)"/>
+        public float MassContest(PhysicsComponent performerPhysics, PhysicsComponent targetPhysics, bool bypassClamp = false, float rangeFactor = 1f)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoMassContests)
+                || performerPhysics.Mass == 0
+                || targetPhysics.InvMass == 0)
+                return 1f;
+
+            return _cfg.GetCVar(CCVars.AllowClampOverride) && bypassClamp
+                ? performerPhysics.Mass * targetPhysics.InvMass
+                : Math.Clamp(performerPhysics.Mass * targetPhysics.InvMass,
+                    1 - _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor,
+                    1 + _cfg.GetCVar(CCVars.MassContestsMaxPercentage) * rangeFactor);
+        }
+
+        #endregion
+        #region Stamina Contests
+
+        public float StaminaContest(EntityUid performer, bool bypassClamp = false, float rangeFactor = 1f)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoStaminaContests)
+                || !TryComp<StaminaComponent>(performer, out var perfStamina)
+                || perfStamina.StaminaDamage == 0)
+                return 1f;
+
+            return _cfg.GetCVar(CCVars.AllowClampOverride) && bypassClamp
+                ? 1 - perfStamina.StaminaDamage / perfStamina.CritThreshold
+                : 1 - Math.Clamp(perfStamina.StaminaDamage / perfStamina.CritThreshold, 0, 0.25f * rangeFactor);
+        }
+
+        public float StaminaContest(StaminaComponent perfStamina, bool bypassClamp = false, float rangeFactor = 1f)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoStaminaContests))
+                return 1f;
+
+            return _cfg.GetCVar(CCVars.AllowClampOverride) && bypassClamp
+                ? 1 - perfStamina.StaminaDamage / perfStamina.CritThreshold
+                : 1 - Math.Clamp(perfStamina.StaminaDamage / perfStamina.CritThreshold, 0, 0.25f * rangeFactor);
+        }
+
+        public float StaminaContest(EntityUid performer, EntityUid target, bool bypassClamp = false, float rangeFactor = 1f)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoStaminaContests)
+                || !TryComp<StaminaComponent>(performer, out var perfStamina)
+                || !TryComp<StaminaComponent>(target, out var targetStamina))
+                return 1f;
+
+            return _cfg.GetCVar(CCVars.AllowClampOverride) && bypassClamp
+                ? (1 - perfStamina.StaminaDamage / perfStamina.CritThreshold)
+                    / (1 - targetStamina.StaminaDamage / targetStamina.CritThreshold)
+                : (1 - Math.Clamp(perfStamina.StaminaDamage / perfStamina.CritThreshold, 0, 0.25f * rangeFactor))
+                    / (1 - Math.Clamp(targetStamina.StaminaDamage / targetStamina.CritThreshold, 0, 0.25f * rangeFactor));
+        }
+
+        #endregion
+
+        #region Health Contests
+
+        public float HealthContest(EntityUid performer, bool bypassClamp = false, float rangeFactor = 1f)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoHealthContests)
+                || !TryComp<DamageableComponent>(performer, out var damage)
+                || !_mobThreshold.TryGetThresholdForState(performer, Mobs.MobState.Critical, out var threshold))
+                return 1f;
+
+            return _cfg.GetCVar(CCVars.AllowClampOverride) && bypassClamp
+                ? 1 - damage.TotalDamage.Float() / threshold.Value.Float()
+                : 1 - Math.Clamp(damage.TotalDamage.Float() / threshold.Value.Float(), 0, 0.25f * rangeFactor);
+        }
+
+        public float HealthContest(EntityUid performer, EntityUid target, bool bypassClamp = false, float rangeFactor = 1f)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoHealthContests)
+                || !TryComp<DamageableComponent>(performer, out var perfDamage)
+                || !TryComp<DamageableComponent>(target, out var targetDamage)
+                || !_mobThreshold.TryGetThresholdForState(performer, Mobs.MobState.Critical, out var perfThreshold)
+                || !_mobThreshold.TryGetThresholdForState(target, Mobs.MobState.Critical, out var targetThreshold))
+                return 1f;
+
+            return _cfg.GetCVar(CCVars.AllowClampOverride) && bypassClamp
+                ? (1 - perfDamage.TotalDamage.Float() / perfThreshold.Value.Float())
+                    / (1 - targetDamage.TotalDamage.Float() / targetThreshold.Value.Float())
+                : (1 - Math.Clamp(perfDamage.TotalDamage.Float() / perfThreshold.Value.Float(), 0, 0.25f * rangeFactor))
+                    / (1 - Math.Clamp(targetDamage.TotalDamage.Float() / targetThreshold.Value.Float(), 0, 0.25f * rangeFactor));
+        }
+        #endregion
+
+        #region Mind Contests
+
+        /// <summary>
+        ///     These cannot be implemented until AFTER the psychic refactor, but can still be factored into other systems before that point.
+        ///     Same rule here as other Contest functions, simply multiply or divide by the function.
+        /// </summary>
+        /// <param name="performer"></param>
+        /// <param name="bypassClamp"></param>
+        /// <param name="rangeFactor"></param>
+        /// <returns></returns>
+        public float MindContest(EntityUid performer, bool bypassClamp = false, float rangeFactor = 1f)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoMindContests))
+                return 1f;
+
+            return 1f;
+        }
+
+        public float MindContest(EntityUid performer, EntityUid target, bool bypassClamp = false, float rangeFactor = 1f)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem)
+                || !_cfg.GetCVar(CCVars.DoMindContests))
+                return 1f;
+
+            return 1f;
+        }
+
+        #endregion
+
+        #region EVERY CONTESTS
+
+        public float EveryContest(
+        	EntityUid performer,
+            bool bypassClampMass = false,
+            bool bypassClampStamina = false,
+            bool bypassClampHealth = false,
+            bool bypassClampMind = false,
+            float rangeFactorMass = 1f,
+            float rangeFactorStamina = 1f,
+            float rangeFactorHealth = 1f,
+            float rangeFactorMind = 1f,
+            float weightMass = 1f,
+            float weightStamina = 1f,
+            float weightHealth = 1f,
+            float weightMind = 1f,
+            bool sumOrMultiply = false)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem))
+                return 1f;
+
+            var weightTotal = weightMass + weightStamina + weightHealth + weightMind;
+            var massMultiplier = weightMass / weightTotal;
+            var staminaMultiplier = weightStamina / weightTotal;
+            var healthMultiplier = weightHealth / weightTotal;
+            var mindMultiplier = weightMind / weightTotal;
+
+            return sumOrMultiply
+                ? MassContest(performer, bypassClampMass, rangeFactorMass) * massMultiplier
+                    + StaminaContest(performer, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
+                    + HealthContest(performer, bypassClampHealth, rangeFactorHealth) * healthMultiplier
+                    + MindContest(performer, bypassClampMind, rangeFactorMind) * mindMultiplier
+                : MassContest(performer, bypassClampMass, rangeFactorMass) * massMultiplier
+                    * StaminaContest(performer, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
+                    * HealthContest(performer, bypassClampHealth, rangeFactorHealth) * healthMultiplier
+                    * MindContest(performer, bypassClampMind, rangeFactorMind) * mindMultiplier;
+        }
+
+        public float EveryContest(
+        	EntityUid performer,
+        	EntityUid target,
+            bool bypassClampMass = false,
+            bool bypassClampStamina = false,
+            bool bypassClampHealth = false,
+            bool bypassClampMind = false,
+            float rangeFactorMass = 1f,
+            float rangeFactorStamina = 1f,
+            float rangeFactorHealth = 1f,
+            float rangeFactorMind = 1f,
+            float weightMass = 1f,
+            float weightStamina = 1f,
+            float weightHealth = 1f,
+            float weightMind = 1f,
+            bool sumOrMultiply = false)
+        {
+            if (!_cfg.GetCVar(CCVars.DoContestsSystem))
+                return 1f;
+
+            var weightTotal = weightMass + weightStamina + weightHealth + weightMind;
+            var massMultiplier = weightMass / weightTotal;
+            var staminaMultiplier = weightStamina / weightTotal;
+            var healthMultiplier = weightHealth / weightTotal;
+            var mindMultiplier = weightMind / weightTotal;
+
+            return sumOrMultiply
+                ? MassContest(performer, target, bypassClampMass, rangeFactorMass) * massMultiplier
+                    + StaminaContest(performer, target, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
+                    + HealthContest(performer, target, bypassClampHealth, rangeFactorHealth) * healthMultiplier
+                    + MindContest(performer, target, bypassClampMind, rangeFactorMind) * mindMultiplier
+                : MassContest(performer, target, bypassClampMass, rangeFactorMass) * massMultiplier
+                    * StaminaContest(performer, target, bypassClampStamina, rangeFactorStamina) * staminaMultiplier
+                    * HealthContest(performer, target, bypassClampHealth, rangeFactorHealth) * healthMultiplier
+                    * MindContest(performer, target, bypassClampMind, rangeFactorMind) * mindMultiplier;
+        }
+        #endregion
+    }
+}
diff --git a/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs b/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
index b9083eabe19..47d359d3875 100644
--- a/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
+++ b/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
@@ -1,6 +1,5 @@
 using System.Numerics;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 
 namespace Content.Shared.Coordinates
 {
@@ -20,17 +19,5 @@ public static EntityCoordinates ToCoordinates(this EntityUid id, float x, float
         {
             return new EntityCoordinates(id, x, y);
         }
-
-        [Obsolete]
-        public static EntityCoordinates ToCoordinates(this MapGridComponent grid, float x, float y)
-        {
-            return ToCoordinates(grid.Owner, x, y);
-        }
-
-        [Obsolete]
-        public static EntityCoordinates ToCoordinates(this MapGridComponent grid)
-        {
-            return ToCoordinates(grid.Owner, Vector2.Zero);
-        }
     }
 }
diff --git a/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs b/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs
index 567a600388e..db9ee85a0cd 100644
--- a/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs
+++ b/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs
@@ -22,7 +22,7 @@ public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, I
                 return EntityCoordinates.FromMap(coordinates.EntityId, mapPos, xformSys);
             }
 
-            var grid = mapManager.GetGrid(gridId.Value);
+            var grid = entMan.GetComponent<MapGridComponent>(gridId.Value);
             var tileSize = grid.TileSize;
             var localPos = coordinates.WithEntityId(gridId.Value).Position;
             var x = (int)Math.Floor(localPos.X / tileSize) + tileSize / 2f;
diff --git a/Content.Shared/Cuffs/Components/HandcuffComponent.cs b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
index 77a77cf2f84..07468a4dab0 100644
--- a/Content.Shared/Cuffs/Components/HandcuffComponent.cs
+++ b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
@@ -12,37 +12,37 @@ public sealed partial class HandcuffComponent : Component
     /// <summary>
     ///     The time it takes to cuff an entity.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float CuffTime = 3.5f;
 
     /// <summary>
     ///     The time it takes to uncuff an entity.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float UncuffTime = 3.5f;
 
     /// <summary>
     ///     The time it takes for a cuffed entity to uncuff itself.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float BreakoutTime = 15f;
 
     /// <summary>
     ///     If an entity being cuffed is stunned, this amount of time is subtracted from the time it takes to add/remove their cuffs.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float StunBonus = 2f;
 
     /// <summary>
     ///     Will the cuffs break when removed?
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool BreakOnRemove;
 
     /// <summary>
     ///     Will the cuffs break when removed?
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public EntProtoId? BrokenPrototype;
 
     /// <summary>
@@ -52,42 +52,57 @@ public sealed partial class HandcuffComponent : Component
     [DataField]
     public bool Removing;
 
+    /// <summary>
+    /// Whether the cuffs are currently being used to cuff someone.
+    /// We need the extra information for when the virtual item is deleted because that can happen when you simply stop
+    /// pulling them on the ground.
+    /// </summary>
+    [DataField]
+    public bool Used;
+
     /// <summary>
     ///     The path of the RSI file used for the player cuffed overlay.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public string? CuffedRSI = "Objects/Misc/handcuffs.rsi";
 
     /// <summary>
     ///     The iconstate used with the RSI file for the player cuffed overlay.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public string? BodyIconState = "body-overlay";
 
     /// <summary>
     /// An opptional color specification for <see cref="BodyIconState"/>
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public Color Color = Color.White;
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier StartCuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_start.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier EndCuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_end.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier StartBreakoutSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_breakout_start.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier StartUncuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_start.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier EndUncuffSound = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_end.ogg");
+
+    /// <summary>
+    ///     Acts as a two-state option for handcuff speed. When true, handcuffs will be easier to get out of if you are larger than average. Representing the use of strength to break things like zipties.
+    ///     When false, handcuffs are easier to get out of if you are smaller than average, representing the use of dexterity to slip the cuffs.
+    /// </summary>
+    [DataField]
+    public bool UncuffEasierWhenLarge = false;
 }
 
 /// <summary>
-/// Event fired on the User when the User attempts to cuff the Target.
+/// Event fired on the User when the User attempts to uncuff the Target.
 /// Should generate popups on the User.
 /// </summary>
 [ByRefEvent]
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index fc005fd30fa..b47fa08bc78 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -3,12 +3,11 @@
 using Content.Shared.Administration.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Alert;
-using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Buckle.Components;
+using Content.Shared.Contests;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
-using Content.Shared.Effects;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -19,23 +18,22 @@
 using Content.Shared.Inventory.Events;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Item;
-using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Events;
-using Content.Shared.Physics.Pull;
+using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Popups;
-using Content.Shared.Pulling.Components;
 using Content.Shared.Pulling.Events;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Stunnable;
 using Content.Shared.Timing;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee.Events;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent;
 
 namespace Content.Shared.Cuffs
 {
@@ -47,8 +45,6 @@ public abstract partial class SharedCuffableSystem : EntitySystem
         [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
         [Dependency] private readonly AlertsSystem _alerts = default!;
-        [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
-        [Dependency] private readonly MobStateSystem _mobState = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedContainerSystem _container = default!;
         [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
@@ -58,6 +54,7 @@ public abstract partial class SharedCuffableSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly UseDelaySystem _delay = default!;
+        [Dependency] private readonly ContestsSystem _contests = default!;
 
         public override void Initialize()
         {
@@ -70,7 +67,7 @@ public override void Initialize()
             SubscribeLocalEvent<CuffableComponent, EntInsertedIntoContainerMessage>(OnCuffsInsertedIntoContainer);
             SubscribeLocalEvent<CuffableComponent, RejuvenateEvent>(OnRejuvenate);
             SubscribeLocalEvent<CuffableComponent, ComponentInit>(OnStartup);
-            SubscribeLocalEvent<CuffableComponent, StopPullingEvent>(HandleStopPull);
+            SubscribeLocalEvent<CuffableComponent, AttemptStopPullingEvent>(HandleStopPull);
             SubscribeLocalEvent<CuffableComponent, UpdateCanMoveEvent>(HandleMoveAttempt);
             SubscribeLocalEvent<CuffableComponent, IsEquippingAttemptEvent>(OnEquipAttempt);
             SubscribeLocalEvent<CuffableComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt);
@@ -95,9 +92,8 @@ public override void Initialize()
         private void OnUncuffAttempt(ref UncuffAttemptEvent args)
         {
             if (args.Cancelled)
-            {
                 return;
-            }
+
             if (!Exists(args.User) || Deleted(args.User))
             {
                 // Should this even be possible?
@@ -109,23 +105,29 @@ private void OnUncuffAttempt(ref UncuffAttemptEvent args)
             // This is because the CanInteract blocking of the cuffs prevents self-uncuff.
             if (args.User == args.Target)
             {
-                // This UncuffAttemptEvent check should probably be In MobStateSystem, not here?
-                if (_mobState.IsIncapacitated(args.User))
-                {
-                    args.Cancelled = true;
-                }
-                else
+                if (!TryComp<CuffableComponent>(args.User, out var cuffable))
                 {
-                    // TODO Find a way for cuffable to check ActionBlockerSystem.CanInteract() without blocking itself
+                    DebugTools.Assert($"{args.User} tried to uncuff themselves but they are not cuffable.");
+                    return;
                 }
+
+                // We temporarily allow interactions so the cuffable system does not block itself.
+                // It's assumed that this will always be false.
+                // Otherwise they would not be trying to uncuff themselves.
+                cuffable.CanStillInteract = true;
+                Dirty(args.User, cuffable);
+
+                if (!_actionBlocker.CanInteract(args.User, args.User))
+                    args.Cancelled = true;
+
+                cuffable.CanStillInteract = false;
+                Dirty(args.User, cuffable);
             }
             else
             {
                 // Check if the user can interact.
                 if (!_actionBlocker.CanInteract(args.User, args.Target))
-                {
                     args.Cancelled = true;
-                }
             }
 
             if (args.Cancelled)
@@ -182,7 +184,7 @@ public void UpdateCuffState(EntityUid uid, CuffableComponent component)
 
         private void OnBeingPulledAttempt(EntityUid uid, CuffableComponent component, BeingPulledAttemptEvent args)
         {
-            if (!TryComp<SharedPullableComponent>(uid, out var pullable))
+            if (!TryComp<PullableComponent>(uid, out var pullable))
                 return;
 
             if (pullable.Puller != null && !component.CanStillInteract) // If we are being pulled already and cuffed, we can't get pulled again.
@@ -214,19 +216,19 @@ private void OnPull(EntityUid uid, CuffableComponent component, PullMessage args
 
         private void HandleMoveAttempt(EntityUid uid, CuffableComponent component, UpdateCanMoveEvent args)
         {
-            if (component.CanStillInteract || !EntityManager.TryGetComponent(uid, out SharedPullableComponent? pullable) || !pullable.BeingPulled)
+            if (component.CanStillInteract || !EntityManager.TryGetComponent(uid, out PullableComponent? pullable) || !pullable.BeingPulled)
                 return;
 
             args.Cancel();
         }
 
-        private void HandleStopPull(EntityUid uid, CuffableComponent component, StopPullingEvent args)
+        private void HandleStopPull(EntityUid uid, CuffableComponent component, AttemptStopPullingEvent args)
         {
             if (args.User == null || !Exists(args.User.Value))
                 return;
 
             if (args.User.Value == uid && !component.CanStillInteract)
-                args.Cancel();
+                args.Cancelled = true;
         }
 
         private void AddUncuffVerb(EntityUid uid, CuffableComponent component, GetVerbsEvent<Verb> args)
@@ -310,6 +312,7 @@ private void OnAddCuffDoAfter(EntityUid uid, HandcuffComponent component, AddCuf
 
             if (!args.Cancelled && TryAddNewCuffs(target, user, uid, cuffable))
             {
+                component.Used = true;
                 _audio.PlayPredicted(component.EndCuffSound, uid, user);
 
                 _popup.PopupEntity(Loc.GetString("handcuff-component-cuff-observer-success-message",
@@ -559,7 +562,7 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove
                 return;
             }
 
-            var uncuffTime = isOwner ? cuff.BreakoutTime : cuff.UncuffTime;
+            var uncuffTime = (isOwner ? cuff.BreakoutTime : cuff.UncuffTime) * (cuff.UncuffEasierWhenLarge ? 1 / _contests.MassContest(user) : _contests.MassContest(user));
 
             if (isOwner)
             {
@@ -611,7 +614,7 @@ public void Uncuff(EntityUid target, EntityUid? user, EntityUid cuffsToRemove, C
             if (!Resolve(target, ref cuffable) || !Resolve(cuffsToRemove, ref cuff))
                 return;
 
-            if (cuff.Removing || TerminatingOrDeleted(cuffsToRemove) || TerminatingOrDeleted(target))
+            if (!cuff.Used || cuff.Removing || TerminatingOrDeleted(cuffsToRemove) || TerminatingOrDeleted(target))
                 return;
 
             if (user != null)
@@ -623,10 +626,9 @@ public void Uncuff(EntityUid target, EntityUid? user, EntityUid cuffsToRemove, C
             }
 
             cuff.Removing = true;
+            cuff.Used = false;
             _audio.PlayPredicted(cuff.EndUncuffSound, target, user);
 
-            var isOwner = user == target;
-
             _container.Remove(cuffsToRemove, cuffable.Container);
 
             if (_net.IsServer)
@@ -642,43 +644,42 @@ public void Uncuff(EntityUid target, EntityUid? user, EntityUid cuffsToRemove, C
                 {
                     _hands.PickupOrDrop(user, cuffsToRemove);
                 }
+            }
+
+            if (cuffable.CuffedHandCount == 0)
+            {
+                if (user != null)
+                    _popup.PopupPredicted(Loc.GetString("cuffable-component-remove-cuffs-success-message"), user.Value, user.Value);
 
-                // Only play popups on server because popups suck
-                if (cuffable.CuffedHandCount == 0)
+                if (target != user && user != null)
                 {
-                    if (user != null)
-                        _popup.PopupEntity(Loc.GetString("cuffable-component-remove-cuffs-success-message"), user.Value, user.Value);
-
-                    if (target != user && user != null)
-                    {
-                        _popup.PopupEntity(Loc.GetString("cuffable-component-remove-cuffs-by-other-success-message",
-                            ("otherName", Identity.Name(user.Value, EntityManager, user))), target, target);
-                        _adminLog.Add(LogType.Action, LogImpact.Medium,
-                            $"{ToPrettyString(user):player} has successfully uncuffed {ToPrettyString(target):player}");
-                    }
-                    else
-                    {
-                        _adminLog.Add(LogType.Action, LogImpact.Medium,
-                            $"{ToPrettyString(user):player} has successfully uncuffed themselves");
-                    }
+                    _popup.PopupPredicted(Loc.GetString("cuffable-component-remove-cuffs-by-other-success-message",
+                        ("otherName", Identity.Name(user.Value, EntityManager, user))), target, target);
+                    _adminLog.Add(LogType.Action, LogImpact.Medium,
+                        $"{ToPrettyString(user):player} has successfully uncuffed {ToPrettyString(target):player}");
                 }
-                else if (user != null)
+                else
+                {
+                    _adminLog.Add(LogType.Action, LogImpact.Medium,
+                        $"{ToPrettyString(user):player} has successfully uncuffed themselves");
+                }
+            }
+            else if (user != null)
+            {
+                if (user != target)
+                {
+                    _popup.PopupPredicted(Loc.GetString("cuffable-component-remove-cuffs-partial-success-message",
+                        ("cuffedHandCount", cuffable.CuffedHandCount),
+                        ("otherName", Identity.Name(user.Value, EntityManager, user.Value))), user.Value, user.Value);
+                    _popup.PopupPredicted(Loc.GetString(
+                        "cuffable-component-remove-cuffs-by-other-partial-success-message",
+                        ("otherName", Identity.Name(user.Value, EntityManager, user.Value)),
+                        ("cuffedHandCount", cuffable.CuffedHandCount)), target, target);
+                }
+                else
                 {
-                    if (user != target)
-                    {
-                        _popup.PopupEntity(Loc.GetString("cuffable-component-remove-cuffs-partial-success-message",
-                            ("cuffedHandCount", cuffable.CuffedHandCount),
-                            ("otherName", Identity.Name(user.Value, EntityManager, user.Value))), user.Value, user.Value);
-                        _popup.PopupEntity(Loc.GetString(
-                            "cuffable-component-remove-cuffs-by-other-partial-success-message",
-                            ("otherName", Identity.Name(user.Value, EntityManager, user.Value)),
-                            ("cuffedHandCount", cuffable.CuffedHandCount)), target, target);
-                    }
-                    else
-                    {
-                        _popup.PopupEntity(Loc.GetString("cuffable-component-remove-cuffs-partial-success-message",
-                            ("cuffedHandCount", cuffable.CuffedHandCount)), user.Value, user.Value);
-                    }
+                    _popup.PopupPredicted(Loc.GetString("cuffable-component-remove-cuffs-partial-success-message",
+                        ("cuffedHandCount", cuffable.CuffedHandCount)), user.Value, user.Value);
                 }
             }
             cuff.Removing = false;
diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.cs b/Content.Shared/Customization/Systems/CharacterRequirements.cs
index b7200c60e85..134dca8e487 100644
--- a/Content.Shared/Customization/Systems/CharacterRequirements.cs
+++ b/Content.Shared/Customization/Systems/CharacterRequirements.cs
@@ -310,7 +310,7 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-too-high",
-                    ("time", playtime.Minutes - Max.Minutes),
+                    ("time", playtime.TotalMinutes - Max.TotalMinutes),
                     ("department", Loc.GetString($"department-{department.ID}")),
                     ("departmentColor", department.Color)));
             return false;
@@ -322,7 +322,7 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-department-insufficient",
-                    ("time", Min.Minutes - playtime.Minutes),
+                    ("time", Min.TotalMinutes - playtime.TotalMinutes),
                     ("department", Loc.GetString($"department-{department.ID}")),
                     ("departmentColor", department.Color)));
             return false;
@@ -367,7 +367,7 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-too-high",
-                    ("time", overallTime.Minutes - Max.Minutes)));
+                    ("time", overallTime.TotalMinutes - Max.TotalMinutes)));
             return false;
         }
 
@@ -377,7 +377,7 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-overall-insufficient",
-                    ("time", Min.Minutes - overallTime.Minutes)));
+                    ("time", Min.TotalMinutes - overallTime.TotalMinutes)));
             return false;
         }
 
@@ -424,6 +424,7 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
 
         // Get the JobPrototype of the Tracker
         var trackerJob = jobSystem.GetJobPrototype(Tracker);
+        var jobStr = prototypeManager.Index<JobPrototype>(trackerJob).LocalizedName;
 
         // Get the primary department of the Tracker
         if (!jobSystem.TryGetPrimaryDepartment(trackerJob, out var department) &&
@@ -444,8 +445,8 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-too-high",
-                    ("time", time.Minutes - Max.Minutes),
-                    ("job", trackerJob),
+                    ("time", time.TotalMinutes - Max.TotalMinutes),
+                    ("job", jobStr),
                     ("departmentColor", department.Color)));
             return false;
         }
@@ -456,8 +457,8 @@ public override bool IsValid(IPrototype prototype, JobPrototype job, HumanoidCha
             reason = Inverted
                 ? null
                 : FormattedMessage.FromMarkup(Loc.GetString("character-timer-role-insufficient",
-                    ("time", Min.Minutes - time.Minutes),
-                    ("job", trackerJob),
+                    ("time", Min.TotalMinutes - time.TotalMinutes),
+                    ("job", jobStr),
                     ("departmentColor", department.Color)));
             return false;
         }
diff --git a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
index 72586be1ec6..4948cb6640e 100644
--- a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
@@ -1,4 +1,5 @@
 using Robust.Shared.Audio;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
@@ -17,6 +18,18 @@ public abstract partial class SharedDisposalUnitComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("soundFlush")]
     public SoundSpecifier? FlushSound = new SoundPathSpecifier("/Audio/Machines/disposalflush.ogg");
 
+    /// <summary>
+    /// Blacklists (prevents) entities listed from being placed inside.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// Whitelists (allows) entities listed from being placed inside.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
     /// <summary>
     /// Sound played when an object is inserted into the disposal unit.
     /// </summary>
@@ -33,20 +46,20 @@ public abstract partial class SharedDisposalUnitComponent : Component
     /// <summary>
     /// State for this disposals unit.
     /// </summary>
-    [DataField("state")]
+    [DataField]
     public DisposalsPressureState State;
 
     // TODO: Just make this use vaulting.
     /// <summary>
     /// We'll track whatever just left disposals so we know what collision we need to ignore until they stop intersecting our BB.
     /// </summary>
-    [ViewVariables, DataField("recentlyEjected")]
+    [ViewVariables, DataField]
     public List<EntityUid> RecentlyEjected = new();
 
     /// <summary>
     /// Next time the disposal unit will be pressurized.
     /// </summary>
-    [DataField("nextPressurized", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [DataField(customTypeSerializer:typeof(TimeOffsetSerializer))]
     public TimeSpan NextPressurized = TimeSpan.Zero;
 
     /// <summary>
@@ -58,63 +71,60 @@ public abstract partial class SharedDisposalUnitComponent : Component
     /// <summary>
     /// How long it takes from the start of a flush animation to return the sprite to normal.
     /// </summary>
-    [DataField("flushDelay")]
+    [DataField]
     public TimeSpan FlushDelay = TimeSpan.FromSeconds(3);
 
-    [DataField("mobsCanEnter")]
-    public bool MobsCanEnter = true;
-
     /// <summary>
     /// Removes the pressure requirement for flushing.
     /// </summary>
-    [DataField("disablePressure"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public bool DisablePressure;
 
     /// <summary>
-    ///     Last time that an entity tried to exit this disposal unit.
+    /// Last time that an entity tried to exit this disposal unit.
     /// </summary>
     [ViewVariables]
     public TimeSpan LastExitAttempt;
 
-    [DataField("autoEngageEnabled")]
+    [DataField]
     public bool AutomaticEngage = true;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("autoEngageTime")]
+    [DataField]
     public TimeSpan AutomaticEngageTime = TimeSpan.FromSeconds(30);
 
     /// <summary>
-    ///     Delay from trying to enter disposals ourselves.
+    /// Delay from trying to enter disposals ourselves.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("entryDelay")]
+    [DataField]
     public float EntryDelay = 0.5f;
 
     /// <summary>
-    ///     Delay from trying to shove someone else into disposals.
+    /// Delay from trying to shove someone else into disposals.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
     public float DraggedEntryDelay = 2.0f;
 
     /// <summary>
-    ///     Container of entities inside this disposal unit.
+    /// Container of entities inside this disposal unit.
     /// </summary>
     [ViewVariables] public Container Container = default!;
 
     // TODO: Network power shit instead fam.
-    [ViewVariables, DataField("powered")]
+    [ViewVariables, DataField]
     public bool Powered;
 
     /// <summary>
     /// Was the disposals unit engaged for a manual flush.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("engaged")]
+    [ViewVariables(VVAccess.ReadWrite), DataField]
     public bool Engaged;
 
     /// <summary>
     /// Next time this unit will flush. Is the lesser of <see cref="FlushDelay"/> and <see cref="AutomaticEngageTime"/>
     /// </summary>
-    [ViewVariables, DataField("nextFlush", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [ViewVariables, DataField(customTypeSerializer:typeof(TimeOffsetSerializer))]
     public TimeSpan? NextFlush;
 
     [Serializable, NetSerializable]
@@ -130,8 +140,8 @@ public enum VisualState : byte
     {
         UnAnchored,
         Anchored,
-        Flushing,
-        Charging
+        OverlayFlushing,
+        OverlayCharging
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
index 600036a8910..c39139f9a57 100644
--- a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
@@ -1,12 +1,10 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Body.Components;
 using Content.Shared.Disposal.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Item;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
 using Content.Shared.Throwing;
 using Robust.Shared.Audio;
 using Robust.Shared.Physics.Components;
@@ -26,7 +24,6 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
 {
     [Dependency] protected readonly IGameTiming GameTiming = default!;
     [Dependency] protected readonly MetaDataSystem Metadata = default!;
-    [Dependency] private   readonly MobStateSystem _mobState = default!;
     [Dependency] protected readonly SharedJointSystem Joints = default!;
 
     protected static TimeSpan ExitAttemptDelay = TimeSpan.FromSeconds(0.5);
@@ -112,24 +109,23 @@ public virtual bool CanInsert(EntityUid uid, SharedDisposalUnitComponent compone
         if (!Transform(uid).Anchored)
             return false;
 
-        // TODO: Probably just need a disposable tag.
         var storable = HasComp<ItemComponent>(entity);
         if (!storable && !HasComp<BodyComponent>(entity))
             return false;
 
-        //Check if the entity is a mob and if mobs can be inserted
-        if (TryComp<MobStateComponent>(entity, out var damageState) && !component.MobsCanEnter)
+        if (component.Blacklist?.IsValid(entity, EntityManager) == true)
             return false;
 
-        if (TryComp<PhysicsComponent>(entity, out var physics) && (physics.CanCollide || storable))
+        if (component.Whitelist != null && component.Whitelist?.IsValid(entity, EntityManager) != true)
+            return false;
+
+        if (TryComp<PhysicsComponent>(entity, out var physics) && (physics.CanCollide) || storable)
             return true;
+        else
+            return false;
 
-        return damageState != null && (!component.MobsCanEnter || _mobState.IsDead(entity, damageState));
     }
 
-    /// <summary>
-    /// TODO: Proper prediction
-    /// </summary>
     public abstract void DoInsertDisposalUnit(EntityUid uid, EntityUid toInsert, EntityUid user, SharedDisposalUnitComponent? disposal = null);
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Doors/Electronics/DoorElectronicsComponent.cs b/Content.Shared/Doors/Electronics/DoorElectronicsComponent.cs
new file mode 100644
index 00000000000..3e9f279ee5d
--- /dev/null
+++ b/Content.Shared/Doors/Electronics/DoorElectronicsComponent.cs
@@ -0,0 +1,42 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+using Robust.Shared.Prototypes;
+using Content.Shared.Access;
+
+namespace Content.Shared.Doors.Electronics;
+
+/// <summary>
+/// Allows an entity's AccessReader to be configured via UI.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DoorElectronicsComponent : Component
+{
+}
+
+[Serializable, NetSerializable]
+public sealed class DoorElectronicsUpdateConfigurationMessage : BoundUserInterfaceMessage
+{
+    public List<ProtoId<AccessLevelPrototype>> AccessList;
+
+    public DoorElectronicsUpdateConfigurationMessage(List<ProtoId<AccessLevelPrototype>> accessList)
+    {
+        AccessList = accessList;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class DoorElectronicsConfigurationState : BoundUserInterfaceState
+{
+    public List<ProtoId<AccessLevelPrototype>> AccessList;
+
+    public DoorElectronicsConfigurationState(List<ProtoId<AccessLevelPrototype>> accessList)
+    {
+        AccessList = accessList;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum DoorElectronicsConfigurationUiKey : byte
+{
+    Key
+}
diff --git a/Content.Shared/Drunk/DrunkSystem.cs b/Content.Shared/Drunk/DrunkSystem.cs
index 161d4729ede..ed022cae31b 100644
--- a/Content.Shared/Drunk/DrunkSystem.cs
+++ b/Content.Shared/Drunk/DrunkSystem.cs
@@ -18,9 +18,6 @@ public void TryApplyDrunkenness(EntityUid uid, float boozePower, bool applySlur
         if (!Resolve(uid, ref status, false))
             return;
 
-        if (TryComp<LightweightDrunkComponent>(uid, out var trait))
-            boozePower *= trait.BoozeStrengthMultiplier;
-
         if (applySlur)
         {
             _slurredSystem.DoSlur(uid, TimeSpan.FromSeconds(boozePower), status);
diff --git a/Content.Shared/Explosion/ExplosionPrototype.cs b/Content.Shared/Explosion/ExplosionPrototype.cs
index 1be3e31939d..b2aa83c40dd 100644
--- a/Content.Shared/Explosion/ExplosionPrototype.cs
+++ b/Content.Shared/Explosion/ExplosionPrototype.cs
@@ -71,6 +71,13 @@ public sealed partial class ExplosionPrototype : IPrototype
     [DataField("smallSoundIterationThreshold")]
     public int SmallSoundIterationThreshold = 6;
 
+    /// <summary>
+    /// How far away another explosion in the same tick can be and be combined.
+    /// Total intensity is added to the original queued explosion.
+    /// </summary>
+    [DataField]
+    public float MaxCombineDistance = 1f;
+
     [DataField("sound")]
     public SoundSpecifier Sound = new SoundCollectionSpecifier("Explosion");
 
diff --git a/Content.Shared/Fluids/Components/PreventSpillerComponent.cs b/Content.Shared/Fluids/Components/PreventSpillerComponent.cs
new file mode 100644
index 00000000000..e396d9faf52
--- /dev/null
+++ b/Content.Shared/Fluids/Components/PreventSpillerComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Fluids.Components;
+
+/// <summary>
+/// Blocks this entity's ability to spill solution containing entities via the verb menu.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PreventSpillerComponent : Component
+{
+
+}
diff --git a/Content.Shared/Fluids/Components/SpillableComponent.cs b/Content.Shared/Fluids/Components/SpillableComponent.cs
index a1b5fa17eb8..51bb73a11fe 100644
--- a/Content.Shared/Fluids/Components/SpillableComponent.cs
+++ b/Content.Shared/Fluids/Components/SpillableComponent.cs
@@ -2,6 +2,12 @@
 
 namespace Content.Shared.Fluids.Components;
 
+/// <summary>
+/// Makes a solution contained in this entity spillable.
+/// Spills can occur when a container with this component overflows,
+/// is used to melee attack something, is equipped (see <see cref="SpillWorn"/>),
+/// lands after being thrown, or has the Spill verb used.
+/// </summary>
 [RegisterComponent]
 public sealed partial class SpillableComponent : Component
 {
@@ -23,4 +29,10 @@ public sealed partial class SpillableComponent : Component
     /// </summary>
     [DataField]
     public FixedPoint2 MaxMeleeSpillAmount = FixedPoint2.New(20);
+
+    /// <summary>
+    ///     Should this item be spilled when thrown?
+    /// </summary>
+    [DataField]
+    public bool SpillWhenThrown = true;
 }
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
index 77730e5afc5..52e6a6cb980 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
@@ -1,14 +1,24 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
 using Content.Shared.Examine;
+using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Spillable;
+using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee;
 
 namespace Content.Shared.Fluids;
 
 public abstract partial class SharedPuddleSystem
 {
+    [Dependency] protected readonly OpenableSystem Openable = default!;
+
     protected virtual void InitializeSpillable()
     {
         SubscribeLocalEvent<SpillableComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<SpillableComponent, GetVerbsEvent<Verb>>(AddSpillVerb);
     }
 
     private void OnExamined(Entity<SpillableComponent> entity, ref ExaminedEvent args)
@@ -21,4 +31,61 @@ private void OnExamined(Entity<SpillableComponent> entity, ref ExaminedEvent arg
                 args.PushMarkup(Loc.GetString("spill-examine-spillable-weapon"));
         }
     }
+
+    private void AddSpillVerb(Entity<SpillableComponent> entity, ref GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract)
+            return;
+
+        if (!_solutionContainerSystem.TryGetSolution(args.Target, entity.Comp.SolutionName, out var soln, out var solution))
+            return;
+
+        if (Openable.IsClosed(args.Target))
+            return;
+
+        if (solution.Volume == FixedPoint2.Zero)
+            return;
+
+        if (HasComp<PreventSpillerComponent>(args.User))
+            return;
+
+
+        Verb verb = new()
+        {
+            Text = Loc.GetString("spill-target-verb-get-data-text")
+        };
+
+        // TODO VERB ICONS spill icon? pouring out a glass/beaker?
+        if (entity.Comp.SpillDelay == null)
+        {
+            var target = args.Target;
+            verb.Act = () =>
+            {
+                var puddleSolution = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume);
+                TrySpillAt(Transform(target).Coordinates, puddleSolution, out _);
+
+                if (TryComp<InjectorComponent>(entity, out var injectorComp))
+                {
+                    injectorComp.ToggleState = InjectorToggleMode.Draw;
+                    Dirty(entity, injectorComp);
+                }
+            };
+        }
+        else
+        {
+            var user = args.User;
+            verb.Act = () =>
+            {
+                _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, entity.Comp.SpillDelay ?? 0, new SpillDoAfterEvent(), entity.Owner, target: entity.Owner)
+                {
+                    BreakOnDamage = true,
+                    BreakOnUserMove = true,
+                    NeedHand = true,
+                });
+            };
+        }
+        verb.Impact = LogImpact.Medium; // dangerous reagent reaction are logged separately.
+        verb.DoContactInteraction = true;
+        args.Verbs.Add(verb);
+    }
 }
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs
index e4bd61baa8e..f573c042c55 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.cs
@@ -1,12 +1,14 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.StepTrigger.Components;
+using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Fluids;
@@ -15,6 +17,7 @@ public abstract partial class SharedPuddleSystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
 
     /// <summary>
     /// The lowest threshold to be considered for puddle sprite states as well as slipperiness of a puddle.
@@ -106,4 +109,54 @@ private void HandlePuddleExamined(Entity<PuddleComponent> entity, ref ExaminedEv
                 args.PushMarkup(Loc.GetString("puddle-component-examine-evaporating-no"));
         }
     }
+
+    #region Spill
+    // These methods are in Shared to make it easier to interact with PuddleSystem in Shared code.
+    // Note that they always fail when run on the client, not creating a puddle and returning false.
+    // Adding proper prediction to this system would require spawning temporary puddle entities on the
+    // client and replacing or merging them with the ones spawned by the server when the client goes to
+    // replicate those, and I am not enough of a wizard to attempt implementing that.
+
+    /// <summary>
+    ///     First splashes reagent on reactive entities near the spilling entity, then spills the rest regularly to a
+    ///     puddle. This is intended for 'destructive' spills, like when entities are destroyed or thrown.
+    /// </summary>
+    /// <remarks>
+    /// On the client, this will always set <paramref name="puddleUid"/> to <see cref="EntityUid.Invalid"> and return false.
+    /// </remarks>
+    public abstract bool TrySplashSpillAt(EntityUid uid,
+        EntityCoordinates coordinates,
+        Solution solution,
+        out EntityUid puddleUid,
+        bool sound = true,
+        EntityUid? user = null);
+
+    /// <summary>
+    ///     Spills solution at the specified coordinates.
+    /// Will add to an existing puddle if present or create a new one if not.
+    /// </summary>
+    /// <remarks>
+    /// On the client, this will always set <paramref name="puddleUid"/> to <see cref="EntityUid.Invalid"> and return false.
+    /// </remarks>
+    public abstract bool TrySpillAt(EntityCoordinates coordinates, Solution solution, out EntityUid puddleUid, bool sound = true);
+
+    /// <summary>
+    /// <see cref="TrySpillAt(EntityCoordinates, Solution, out EntityUid, bool)"/>
+    /// </summary>
+    /// <remarks>
+    /// On the client, this will always set <paramref name="puddleUid"/> to <see cref="EntityUid.Invalid"> and return false.
+    /// </remarks>
+    public abstract bool TrySpillAt(EntityUid uid, Solution solution, out EntityUid puddleUid, bool sound = true,
+        TransformComponent? transformComponent = null);
+
+    /// <summary>
+    /// <see cref="TrySpillAt(EntityCoordinates, Solution, out EntityUid, bool)"/>
+    /// </summary>
+    /// <remarks>
+    /// On the client, this will always set <paramref name="puddleUid"/> to <see cref="EntityUid.Invalid"> and return false.
+    /// </remarks>
+    public abstract bool TrySpillAt(TileRef tileRef, Solution solution, out EntityUid puddleUid, bool sound = true,
+        bool tileReact = true);
+
+    #endregion Spill
 }
diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
index 5656778a3f9..fc7cccf9bd6 100644
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@ -4,8 +4,8 @@
 using Content.Shared.Ghost;
 using Content.Shared.Hands;
 using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Movement.Systems;
-using Content.Shared.Physics.Pull;
 using Content.Shared.Tag;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
diff --git a/Content.Shared/Friction/TileFrictionController.cs b/Content.Shared/Friction/TileFrictionController.cs
index ba4d9fc24f8..3583947ee36 100644
--- a/Content.Shared/Friction/TileFrictionController.cs
+++ b/Content.Shared/Friction/TileFrictionController.cs
@@ -2,8 +2,8 @@
 using Content.Shared.CCVar;
 using Content.Shared.Gravity;
 using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Systems;
-using Content.Shared.Pulling.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
@@ -23,6 +23,12 @@ public sealed class TileFrictionController : VirtualController
         [Dependency] private readonly SharedMoverController _mover = default!;
         [Dependency] private readonly SharedPhysicsSystem _physics = default!;
 
+        private EntityQuery<TileFrictionModifierComponent> _frictionQuery;
+        private EntityQuery<TransformComponent> _xformQuery;
+        private EntityQuery<PullerComponent> _pullerQuery;
+        private EntityQuery<PullableComponent> _pullableQuery;
+        private EntityQuery<MapGridComponent> _gridQuery;
+
         private float _stopSpeed;
         private float _frictionModifier;
         public const float DefaultFriction = 0.3f;
@@ -33,18 +39,17 @@ public override void Initialize()
 
             Subs.CVar(_configManager, CCVars.TileFrictionModifier, value => _frictionModifier = value, true);
             Subs.CVar(_configManager, CCVars.StopSpeed, value => _stopSpeed = value, true);
+            _frictionQuery = GetEntityQuery<TileFrictionModifierComponent>();
+            _xformQuery = GetEntityQuery<TransformComponent>();
+            _pullerQuery = GetEntityQuery<PullerComponent>();
+            _pullableQuery = GetEntityQuery<PullableComponent>();
+            _gridQuery = GetEntityQuery<MapGridComponent>();
         }
 
         public override void UpdateBeforeMapSolve(bool prediction, PhysicsMapComponent mapComponent, float frameTime)
         {
             base.UpdateBeforeMapSolve(prediction, mapComponent, frameTime);
 
-            var frictionQuery = GetEntityQuery<TileFrictionModifierComponent>();
-            var xformQuery = GetEntityQuery<TransformComponent>();
-            var pullerQuery = GetEntityQuery<SharedPullerComponent>();
-            var pullableQuery = GetEntityQuery<SharedPullableComponent>();
-            var gridQuery = GetEntityQuery<MapGridComponent>();
-
             foreach (var body in mapComponent.AwakeBodies)
             {
                 var uid = body.Owner;
@@ -60,16 +65,16 @@ public override void UpdateBeforeMapSolve(bool prediction, PhysicsMapComponent m
                 if (body.LinearVelocity.Equals(Vector2.Zero) && body.AngularVelocity.Equals(0f))
                     continue;
 
-                if (!xformQuery.TryGetComponent(uid, out var xform))
+                if (!_xformQuery.TryGetComponent(uid, out var xform))
                 {
                     Log.Error($"Unable to get transform for {ToPrettyString(uid)} in tilefrictioncontroller");
                     continue;
                 }
 
-                var surfaceFriction = GetTileFriction(uid, body, xform, gridQuery, frictionQuery);
+                var surfaceFriction = GetTileFriction(uid, body, xform);
                 var bodyModifier = 1f;
 
-                if (frictionQuery.TryGetComponent(uid, out var frictionComp))
+                if (_frictionQuery.TryGetComponent(uid, out var frictionComp))
                 {
                     bodyModifier = frictionComp.Modifier;
                 }
@@ -82,8 +87,8 @@ public override void UpdateBeforeMapSolve(bool prediction, PhysicsMapComponent m
                 // If we're sandwiched between 2 pullers reduce friction
                 // Might be better to make this dynamic and check how many are in the pull chain?
                 // Either way should be much faster for now.
-                if (pullerQuery.TryGetComponent(uid, out var puller) && puller.Pulling != null &&
-                    pullableQuery.TryGetComponent(uid, out var pullable) && pullable.BeingPulled)
+                if (_pullerQuery.TryGetComponent(uid, out var puller) && puller.Pulling != null &&
+                    _pullableQuery.TryGetComponent(uid, out var pullable) && pullable.BeingPulled)
                 {
                     bodyModifier *= 0.2f;
                 }
@@ -163,9 +168,7 @@ private void ReduceAngularVelocity(EntityUid uid, bool prediction, PhysicsCompon
         private float GetTileFriction(
             EntityUid uid,
             PhysicsComponent body,
-            TransformComponent xform,
-            EntityQuery<MapGridComponent> gridQuery,
-            EntityQuery<TileFrictionModifierComponent> frictionQuery)
+            TransformComponent xform)
         {
             // TODO: Make IsWeightless event-based; we already have grid traversals tracked so just raise events
             if (_gravity.IsWeightless(uid, body, xform))
@@ -175,9 +178,9 @@ private float GetTileFriction(
                 return 0.0f;
 
             // If not on a grid then return the map's friction.
-            if (!gridQuery.TryGetComponent(xform.GridUid, out var grid))
+            if (!_gridQuery.TryGetComponent(xform.GridUid, out var grid))
             {
-                return frictionQuery.TryGetComponent(xform.MapUid, out var friction)
+                return _frictionQuery.TryGetComponent(xform.MapUid, out var friction)
                     ? friction.Modifier
                     : DefaultFriction;
             }
@@ -197,7 +200,7 @@ private float GetTileFriction(
 
             while (anc.MoveNext(out var tileEnt))
             {
-                if (frictionQuery.TryGetComponent(tileEnt, out var friction))
+                if (_frictionQuery.TryGetComponent(tileEnt, out var friction))
                     return friction.Modifier;
             }
 
diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs
index 904b10b3bdc..f1f25a69f7a 100644
--- a/Content.Shared/Hands/Components/HandsComponent.cs
+++ b/Content.Shared/Hands/Components/HandsComponent.cs
@@ -31,6 +31,12 @@ public sealed partial class HandsComponent : Component
     /// </summary>
     public List<string> SortedHands = new();
 
+    /// <summary>
+    ///     If true, the items in the hands won't be affected by explosions.
+    /// </summary>
+    [DataField]
+    public bool DisableExplosionRecursion = false;
+
     /// <summary>
     ///     The amount of throw impulse per distance the player is from the throw target.
     /// </summary>
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
index e071cdc6938..7b169b5d0a6 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
@@ -134,8 +134,10 @@ public bool TryDrop(EntityUid uid, Hand hand, EntityCoordinates? targetDropLocat
             return true;
         }
 
+        var (itemPos, itemRot) = TransformSystem.GetWorldPositionRotation(entity);
+        var origin = new MapCoordinates(itemPos, itemXform.MapID);
         var target = targetDropLocation.Value.ToMap(EntityManager, TransformSystem);
-        TransformSystem.SetWorldPosition(itemXform, GetFinalDropCoordinates(uid, userXform.MapPosition, target));
+        TransformSystem.SetWorldPositionRotation(entity, GetFinalDropCoordinates(uid, origin, target), itemRot);
         return true;
     }
 
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index 8268d0d7c74..340ce5acd03 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -66,14 +66,14 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// <summary>
     ///     Humanoid species variant used by this entity.
     /// </summary>
-    [DataField(required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string Prototype { get; private set; } = default!;
+    [DataField(required: true)]
+    public EntProtoId Prototype { get; private set; }
 
     /// <summary>
     /// Prototype used by the species for the dress-up doll in various menus.
     /// </summary>
-    [DataField(required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string DollPrototype { get; private set; } = default!;
+    [DataField(required: true)]
+    public EntProtoId DollPrototype { get; private set; }
 
     /// <summary>
     /// Method of skin coloration used by the species.
@@ -121,12 +121,6 @@ public sealed partial class SpeciesPrototype : IPrototype
     [DataField]
     public int MaxAge = 120;
 
-    /// <summary>
-    ///     The Style used for the guidebook info link in the character profile editor
-    /// </summary>
-    [DataField]
-    public string GuideBookIcon = "SpeciesInfoDefault";
-
     /// <summary>
     ///     The minimum height for this species
     /// </summary>
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 6062bec8b05..ece4b59e91a 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -1,8 +1,10 @@
 using System.Linq;
 using System.Numerics;
 using Content.Shared.Decals;
+using Content.Shared.Examine;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Preferences;
 using Content.Shared.HeightAdjust;
 using Robust.Shared.GameObjects.Components.Localization;
@@ -23,7 +25,7 @@ namespace Content.Shared.Humanoid;
 public abstract class SharedHumanoidAppearanceSystem : EntitySystem
 {
     [Dependency] private readonly INetManager _netManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly MarkingManager _markingManager = default!;
     [Dependency] private readonly HeightAdjustSystem _heightAdjust = default!;
 
@@ -33,7 +35,9 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<HumanoidAppearanceComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<HumanoidAppearanceComponent, ExaminedEvent>(OnExamined);
     }
 
     private void OnInit(EntityUid uid, HumanoidAppearanceComponent humanoid, ComponentInit args)
@@ -44,7 +48,7 @@ private void OnInit(EntityUid uid, HumanoidAppearanceComponent humanoid, Compone
         }
 
         if (string.IsNullOrEmpty(humanoid.Initial)
-            || !_prototypeManager.TryIndex(humanoid.Initial, out HumanoidProfilePrototype? startingSet))
+            || !_proto.TryIndex(humanoid.Initial, out HumanoidProfilePrototype? startingSet))
         {
             LoadProfile(uid, HumanoidCharacterProfile.DefaultWithSpecies(humanoid.Species), humanoid);
             return;
@@ -59,6 +63,15 @@ private void OnInit(EntityUid uid, HumanoidAppearanceComponent humanoid, Compone
         LoadProfile(uid, startingSet.Profile, humanoid);
     }
 
+    private void OnExamined(EntityUid uid, HumanoidAppearanceComponent component, ExaminedEvent args)
+    {
+        var identity = Identity.Entity(uid, EntityManager);
+        var species = GetSpeciesRepresentation(component.Species).ToLower();
+        var age = GetAgeRepresentation(component.Species, component.Age);
+
+        args.PushText(Loc.GetString("humanoid-appearance-component-examine", ("user", identity), ("age", age), ("species", species)));
+    }
+
     /// <summary>
     ///     Toggles a humanoid's sprite layer visibility.
     /// </summary>
@@ -139,7 +152,7 @@ protected virtual void SetLayerVisibility(
     /// <param name="humanoid">Humanoid component of the entity</param>
     public void SetSpecies(EntityUid uid, string species, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
     {
-        if (!Resolve(uid, ref humanoid) || !_prototypeManager.TryIndex<SpeciesPrototype>(species, out var prototype))
+        if (!Resolve(uid, ref humanoid) || !_proto.TryIndex<SpeciesPrototype>(species, out var prototype))
         {
             return;
         }
@@ -147,7 +160,7 @@ public void SetSpecies(EntityUid uid, string species, bool sync = true, Humanoid
         humanoid.Species = species;
         humanoid.MarkingSet.EnsureSpecies(species, humanoid.SkinColor, _markingManager);
         var oldMarkings = humanoid.MarkingSet.GetForwardEnumerator().ToList();
-        humanoid.MarkingSet = new(oldMarkings, prototype.MarkingPoints, _markingManager, _prototypeManager);
+        humanoid.MarkingSet = new(oldMarkings, prototype.MarkingPoints, _markingManager, _proto);
 
         if (sync)
             Dirty(humanoid);
@@ -167,7 +180,7 @@ public virtual void SetSkinColor(EntityUid uid, Color skinColor, bool sync = tru
         if (!Resolve(uid, ref humanoid))
             return;
 
-        if (!_prototypeManager.TryIndex<SpeciesPrototype>(humanoid.Species, out var species))
+        if (!_proto.TryIndex<SpeciesPrototype>(humanoid.Species, out var species))
         {
             return;
         }
@@ -263,7 +276,7 @@ public void SetHeight(EntityUid uid, float height, bool sync = true, HumanoidApp
         if (!Resolve(uid, ref humanoid) || MathHelper.CloseTo(humanoid.Height, height, 0.001f))
             return;
 
-        var species = _prototypeManager.Index(humanoid.Species);
+        var species = _proto.Index(humanoid.Species);
         humanoid.Height = Math.Clamp(height, species.MinHeight, species.MaxHeight);
 
         if (sync)
@@ -282,7 +295,7 @@ public void SetWidth(EntityUid uid, float width, bool sync = true, HumanoidAppea
         if (!Resolve(uid, ref humanoid) || MathHelper.CloseTo(humanoid.Width, width, 0.001f))
             return;
 
-        var species = _prototypeManager.Index(humanoid.Species);
+        var species = _proto.Index(humanoid.Species);
         humanoid.Width = Math.Clamp(width, species.MinWidth, species.MaxWidth);
 
         if (sync)
@@ -301,7 +314,7 @@ public void SetScale(EntityUid uid, Vector2 scale, bool sync = true, HumanoidApp
         if (!Resolve(uid, ref humanoid))
             return;
 
-        var species = _prototypeManager.Index(humanoid.Species);
+        var species = _proto.Index(humanoid.Species);
         humanoid.Height = Math.Clamp(scale.Y, species.MinHeight, species.MaxHeight);
         humanoid.Width = Math.Clamp(scale.X, species.MinWidth, species.MaxWidth);
 
@@ -349,24 +362,24 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile,
 
         // Hair/facial hair - this may eventually be deprecated.
         // We need to ensure hair before applying it or coloring can try depend on markings that can be invalid
-        var hairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.Hair, out var hairAlpha, _prototypeManager)
+        var hairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.Hair, out var hairAlpha, _proto)
             ? profile.Appearance.SkinColor.WithAlpha(hairAlpha) : profile.Appearance.HairColor;
-        var facialHairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.FacialHair, out var facialHairAlpha, _prototypeManager)
+        var facialHairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.FacialHair, out var facialHairAlpha, _proto)
             ? profile.Appearance.SkinColor.WithAlpha(facialHairAlpha) : profile.Appearance.FacialHairColor;
 
         if (_markingManager.Markings.TryGetValue(profile.Appearance.HairStyleId, out var hairPrototype) &&
-            _markingManager.CanBeApplied(profile.Species, profile.Sex, hairPrototype, _prototypeManager))
+            _markingManager.CanBeApplied(profile.Species, profile.Sex, hairPrototype, _proto))
         {
             AddMarking(uid, profile.Appearance.HairStyleId, hairColor, false);
         }
 
         if (_markingManager.Markings.TryGetValue(profile.Appearance.FacialHairStyleId, out var facialHairPrototype) &&
-            _markingManager.CanBeApplied(profile.Species, profile.Sex, facialHairPrototype, _prototypeManager))
+            _markingManager.CanBeApplied(profile.Species, profile.Sex, facialHairPrototype, _proto))
         {
             AddMarking(uid, profile.Appearance.FacialHairStyleId, facialHairColor, false);
         }
 
-        humanoid.MarkingSet.EnsureSpecies(profile.Species, profile.Appearance.SkinColor, _markingManager, _prototypeManager);
+        humanoid.MarkingSet.EnsureSpecies(profile.Species, profile.Appearance.SkinColor, _markingManager, _proto);
 
         // Finally adding marking with forced colors
         foreach (var (marking, prototype) in markingFColored)
@@ -463,4 +476,39 @@ public void AddMarking(EntityUid uid, string marking, IReadOnlyList<Color> color
         if (sync)
             Dirty(humanoid);
     }
+
+    /// <summary>
+    /// Takes ID of the species prototype, returns UI-friendly name of the species.
+    /// </summary>
+    public string GetSpeciesRepresentation(string speciesId)
+    {
+        if (_proto.TryIndex<SpeciesPrototype>(speciesId, out var species))
+        {
+            return Loc.GetString(species.Name);
+        }
+
+        Log.Error("Tried to get representation of unknown species: {speciesId}");
+        return Loc.GetString("humanoid-appearance-component-unknown-species");
+    }
+
+    public string GetAgeRepresentation(string species, int age)
+    {
+        if (!_proto.TryIndex<SpeciesPrototype>(species, out var speciesPrototype))
+        {
+            Log.Error("Tried to get age representation of species that couldn't be indexed: " + species);
+            return Loc.GetString("identity-age-young");
+        }
+
+        if (age < speciesPrototype.YoungAge)
+        {
+            return Loc.GetString("identity-age-young");
+        }
+
+        if (age < speciesPrototype.OldAge)
+        {
+            return Loc.GetString("identity-age-middle-aged");
+        }
+
+        return Loc.GetString("identity-age-old");
+    }
 }
diff --git a/Content.Shared/IdentityManagement/Components/IdentityBlockerComponent.cs b/Content.Shared/IdentityManagement/Components/IdentityBlockerComponent.cs
index 3857063783d..e7a88b6ef29 100644
--- a/Content.Shared/IdentityManagement/Components/IdentityBlockerComponent.cs
+++ b/Content.Shared/IdentityManagement/Components/IdentityBlockerComponent.cs
@@ -6,6 +6,7 @@ namespace Content.Shared.IdentityManagement.Components;
 [RegisterComponent, NetworkedComponent]
 public sealed partial class IdentityBlockerComponent : Component
 {
+    [DataField]
     public bool Enabled = true;
 
     /// <summary>
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index 0b72ac5ee74..dac780783c7 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -37,6 +37,7 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction SwapHands = "SwapHands";
         public static readonly BoundKeyFunction MoveStoredItem = "MoveStoredItem";
         public static readonly BoundKeyFunction RotateStoredItem = "RotateStoredItem";
+        public static readonly BoundKeyFunction SaveItemLocation = "SaveItemLocation";
         public static readonly BoundKeyFunction ThrowItemInHand = "ThrowItemInHand";
         public static readonly BoundKeyFunction TryPullObject = "TryPullObject";
         public static readonly BoundKeyFunction MovePulledObject = "MovePulledObject";
@@ -54,6 +55,8 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction ZoomOut = "ZoomOut";
         public static readonly BoundKeyFunction ZoomIn = "ZoomIn";
         public static readonly BoundKeyFunction ResetZoom = "ResetZoom";
+        public static readonly BoundKeyFunction OfferItem = "OfferItem";
+        public static readonly BoundKeyFunction ToggleStanding = "ToggleStanding";
 
         public static readonly BoundKeyFunction ArcadeUp = "ArcadeUp";
         public static readonly BoundKeyFunction ArcadeDown = "ArcadeDown";
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 0e390ecea45..8d49ce31f0a 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -15,10 +15,10 @@
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item;
 using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
-using Content.Shared.Pulling;
-using Content.Shared.Pulling.Components;
 using Content.Shared.Tag;
 using Content.Shared.Timing;
 using Content.Shared.Verbs;
@@ -60,7 +60,7 @@ public abstract partial class SharedInteractionSystem : EntitySystem
         [Dependency] private readonly SharedVerbSystem _verbSystem = default!;
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly UseDelaySystem _useDelay = default!;
-        [Dependency] private readonly SharedPullingSystem _pullSystem = default!;
+        [Dependency] private readonly PullingSystem _pullSystem = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly TagSystem _tagSystem = default!;
@@ -185,10 +185,10 @@ private bool HandleTryPullObject(ICommonSession? session, EntityCoordinates coor
             if (!InRangeUnobstructed(userEntity.Value, uid, popup: true))
                 return false;
 
-            if (!TryComp(uid, out SharedPullableComponent? pull))
+            if (!TryComp(uid, out PullableComponent? pull))
                 return false;
 
-            _pullSystem.TogglePull(userEntity.Value, pull);
+            _pullSystem.TogglePull(uid, userEntity.Value, pull);
             return false;
         }
 
@@ -682,7 +682,7 @@ public bool InRangeUnobstructed(
             if (!inRange && popup && _gameTiming.IsFirstTimePredicted)
             {
                 var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
-                _popupSystem.PopupEntity(message, origin, origin);
+                _popupSystem.PopupClient(message, origin, origin);
             }
 
             return inRange;
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
index 3ea80ec7357..620ddfd1942 100644
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
@@ -16,7 +16,7 @@ public sealed partial class ItemToggleComponent : Component
     /// <summary>
     ///     The item's toggle state.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool Activated = false;
 
     /// <summary>
@@ -45,6 +45,12 @@ public sealed partial class ItemToggleComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
     public SoundSpecifier? SoundFailToActivate;
+
+    /// <summary>
+    /// Whether or not to toggle the entity's lights on or off.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public bool ToggleLight = true;
 }
 
 /// <summary>
@@ -55,6 +61,11 @@ public record struct ItemToggleActivateAttemptEvent(EntityUid? User)
 {
     public bool Cancelled = false;
     public readonly EntityUid? User = User;
+
+    /// <summary>
+    /// Pop-up that gets shown to users explaining why the attempt was cancelled.
+    /// </summary>
+    public string? Popup { get; set; }
 }
 
 /// <summary>
@@ -77,21 +88,3 @@ public readonly record struct ItemToggledEvent(bool Predicted, bool Activated, E
     public readonly bool Activated = Activated;
     public readonly EntityUid? User = User;
 }
-
-/// <summary>
-/// Raised directed on an entity when an itemtoggle is activated.
-/// </summary>
-[ByRefEvent]
-public readonly record struct ItemToggleActivatedEvent(EntityUid? User)
-{
-    public readonly EntityUid? User = User;
-}
-
-/// <summary>
-/// Raised directed on an entity when an itemtoggle is deactivated.
-/// </summary>
-[ByRefEvent]
-public readonly record struct ItemToggleDeactivatedEvent(EntityUid? User)
-{
-    public readonly EntityUid? User = User;
-}
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleHotComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleHotComponent.cs
index c3eb1d1e58b..4bcd6e25c08 100644
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleHotComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleHotComponent.cs
@@ -5,12 +5,7 @@ namespace Content.Shared.Item.ItemToggle.Components;
 /// <summary>
 /// Handles whether the item is hot when toggled on.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class ItemToggleHotComponent : Component
 {
-    /// <summary>
-    ///     Item becomes hot when active.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
-    public bool IsHotWhenActivated = true;
 }
diff --git a/Content.Shared/Item/ItemToggle/SharedItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/SharedItemToggleSystem.cs
index e2e5fc2e3c3..523f67bac3d 100644
--- a/Content.Shared/Item/ItemToggle/SharedItemToggleSystem.cs
+++ b/Content.Shared/Item/ItemToggle/SharedItemToggleSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Popups;
 using Content.Shared.Temperature;
 using Content.Shared.Toggleable;
 using Content.Shared.Wieldable;
@@ -20,11 +21,13 @@ public abstract class SharedItemToggleSystem : EntitySystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedPointLightSystem _light = default!;
     [Dependency] private readonly INetManager _netManager = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<ItemToggleComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<ItemToggleComponent, ItemUnwieldedEvent>(TurnOffonUnwielded);
         SubscribeLocalEvent<ItemToggleComponent, ItemWieldedEvent>(TurnOnonWielded);
         SubscribeLocalEvent<ItemToggleComponent, UseInHandEvent>(OnUseInHand);
@@ -34,6 +37,11 @@ public override void Initialize()
         SubscribeLocalEvent<ItemToggleActiveSoundComponent, ItemToggledEvent>(UpdateActiveSound);
     }
 
+    private void OnStartup(Entity<ItemToggleComponent> ent, ref ComponentStartup args)
+    {
+        UpdateVisuals(ent);
+    }
+
     private void OnUseInHand(EntityUid uid, ItemToggleComponent itemToggle, UseInHandEvent args)
     {
         if (args.Handled)
@@ -73,6 +81,9 @@ public bool TryActivate(EntityUid uid, EntityUid? user = null, bool predicted =
         if (itemToggle.Activated)
             return true;
 
+        if (!itemToggle.Predictable && _netManager.IsClient)
+            return true;
+
         var attempt = new ItemToggleActivateAttemptEvent(user);
         RaiseLocalEvent(uid, ref attempt);
 
@@ -83,12 +94,16 @@ public bool TryActivate(EntityUid uid, EntityUid? user = null, bool predicted =
             else
                 _audio.PlayPvs(itemToggle.SoundFailToActivate, uid);
 
+            if (attempt.Popup != null && user != null)
+            {
+                if (predicted)
+                    _popup.PopupClient(attempt.Popup, uid, user.Value);
+                else
+                    _popup.PopupEntity(attempt.Popup, uid, user.Value);
+            }
+
             return false;
         }
-        // If the item's toggle is unpredictable because of something like requiring fuel or charge, then clients exit here.
-        // Otherwise you get stuff like an item activating client-side and then turning back off when it synchronizes with the server.
-        if (predicted == false && _netManager.IsClient)
-            return true;
 
         Activate(uid, itemToggle, predicted, user);
 
@@ -103,6 +118,9 @@ public bool TryDeactivate(EntityUid uid, EntityUid? user = null, bool predicted
         if (!Resolve(uid, ref itemToggle))
             return false;
 
+        if (!itemToggle.Predictable && _netManager.IsClient)
+            return true;
+
         if (!itemToggle.Activated)
             return true;
 
@@ -114,10 +132,6 @@ public bool TryDeactivate(EntityUid uid, EntityUid? user = null, bool predicted
             return false;
         }
 
-        // If the item's toggle is unpredictable because of something like requiring fuel or charge, then clients exit here.
-        if (predicted == false && _netManager.IsClient)
-            return true;
-
         Deactivate(uid, itemToggle, predicted, user);
         return true;
     }
@@ -135,7 +149,6 @@ private void Activate(EntityUid uid, ItemToggleComponent itemToggle, bool predic
         }
 
         var soundToPlay = itemToggle.SoundActivate;
-
         if (predicted)
             _audio.PlayPredicted(soundToPlay, uid, user);
         else
@@ -146,10 +159,8 @@ private void Activate(EntityUid uid, ItemToggleComponent itemToggle, bool predic
         var toggleUsed = new ItemToggledEvent(predicted, Activated: true, user);
         RaiseLocalEvent(uid, ref toggleUsed);
 
-        var activev = new ItemToggleActivatedEvent(user);
-        RaiseLocalEvent(uid, ref activev);
-
         itemToggle.Activated = true;
+        UpdateVisuals((uid, itemToggle));
         Dirty(uid, itemToggle);
     }
 
@@ -158,35 +169,38 @@ private void Activate(EntityUid uid, ItemToggleComponent itemToggle, bool predic
     /// </summary>
     private void Deactivate(EntityUid uid, ItemToggleComponent itemToggle, bool predicted, EntityUid? user = null)
     {
-        // TODO: Fix this hardcoding
-        TryComp(uid, out AppearanceComponent? appearance);
-        _appearance.SetData(uid, ToggleableLightVisuals.Enabled, false, appearance);
-        _appearance.SetData(uid, ToggleVisuals.Toggled, false, appearance);
-
-        if (_light.TryGetLight(uid, out var light))
-        {
-            _light.SetEnabled(uid, false, light);
-        }
-
         var soundToPlay = itemToggle.SoundDeactivate;
-
         if (predicted)
             _audio.PlayPredicted(soundToPlay, uid, user);
         else
             _audio.PlayPvs(soundToPlay, uid);
-
         // END FIX HARDCODING
 
         var toggleUsed = new ItemToggledEvent(predicted, Activated: false, user);
         RaiseLocalEvent(uid, ref toggleUsed);
 
-        var activev = new ItemToggleDeactivatedEvent(user);
-        RaiseLocalEvent(uid, ref activev);
-
         itemToggle.Activated = false;
+        UpdateVisuals((uid, itemToggle));
         Dirty(uid, itemToggle);
     }
 
+    private void UpdateVisuals(Entity<ItemToggleComponent> ent)
+    {
+        if (TryComp(ent, out AppearanceComponent? appearance))
+        {
+            _appearance.SetData(ent, ToggleVisuals.Toggled, ent.Comp.Activated, appearance);
+
+            if (ent.Comp.ToggleLight)
+                _appearance.SetData(ent, ToggleableLightVisuals.Enabled, ent.Comp.Activated, appearance);
+        }
+
+        if (!ent.Comp.ToggleLight)
+            return;
+
+        if (_light.TryGetLight(ent, out var light))
+            _light.SetEnabled(ent, ent.Comp.Activated, light);
+    }
+
     /// <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>
@@ -218,8 +232,7 @@ public bool IsActivated(EntityUid uid, ItemToggleComponent? comp = null)
     /// </summary>
     private void OnIsHotEvent(EntityUid uid, ItemToggleHotComponent itemToggleHot, IsHotEvent args)
     {
-        if (itemToggleHot.IsHotWhenActivated)
-            args.IsHot = IsActivated(uid);
+        args.IsHot |= IsActivated(uid);
     }
 
     /// <summary>
diff --git a/Content.Shared/Kitchen/SharedReagentGrinder.cs b/Content.Shared/Kitchen/SharedReagentGrinder.cs
index f5d679c293d..579db239c80 100644
--- a/Content.Shared/Kitchen/SharedReagentGrinder.cs
+++ b/Content.Shared/Kitchen/SharedReagentGrinder.cs
@@ -10,6 +10,12 @@ public sealed class SharedReagentGrinder
         public static string InputContainerId = "inputContainer";
     }
 
+    [Serializable, NetSerializable]
+    public sealed class ReagentGrinderToggleAutoModeMessage : BoundUserInterfaceMessage
+    {
+        public ReagentGrinderToggleAutoModeMessage() { }
+    }
+
     [Serializable, NetSerializable]
     public sealed class ReagentGrinderStartMessage : BoundUserInterfaceMessage
     {
@@ -75,6 +81,13 @@ public enum ReagentGrinderUiKey : byte
         Key
     }
 
+    public enum GrinderAutoMode : byte
+    {
+        Off,
+        Grind,
+        Juice
+    }
+
     [NetSerializable, Serializable]
     public sealed class ReagentGrinderInterfaceState : BoundUserInterfaceState
     {
@@ -85,13 +98,16 @@ public sealed class ReagentGrinderInterfaceState : BoundUserInterfaceState
         public bool CanGrind;
         public NetEntity[] ChamberContents;
         public ReagentQuantity[]? ReagentQuantities;
-        public ReagentGrinderInterfaceState(bool isBusy, bool hasBeaker, bool powered, bool canJuice, bool canGrind, NetEntity[] chamberContents, ReagentQuantity[]? heldBeakerContents)
+        public GrinderAutoMode AutoMode;
+
+        public ReagentGrinderInterfaceState(bool isBusy, bool hasBeaker, bool powered, bool canJuice, bool canGrind, GrinderAutoMode autoMode, NetEntity[] chamberContents, ReagentQuantity[]? heldBeakerContents)
         {
             IsBusy = isBusy;
             HasBeakerIn = hasBeaker;
             Powered = powered;
             CanJuice = canJuice;
             CanGrind = canGrind;
+            AutoMode = autoMode;
             ChamberContents = chamberContents;
             ReagentQuantities = heldBeakerContents;
         }
diff --git a/Content.Shared/Labels/Components/PaperLabelTypeComponent.cs b/Content.Shared/Labels/Components/PaperLabelTypeComponent.cs
new file mode 100644
index 00000000000..b045a6af3b2
--- /dev/null
+++ b/Content.Shared/Labels/Components/PaperLabelTypeComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Labels.Components;
+
+/// <summary>                                                                                                                                                 
+/// Specifies the paper type (see textures/storage/crates/labels.rsi to see currently supported paper types)  to show on crates this label is attached to.                                                                     
+/// </summary>                                                                                                                                                
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PaperLabelTypeComponent : Component
+{
+    /// <summary>                                                                                                                                             
+    /// The type of label to show.                                                                                                                                    
+    /// </summary>
+    [DataField]
+    public string PaperType = "Paper";
+}
diff --git a/Content.Shared/Labels/LabelEvents.cs b/Content.Shared/Labels/LabelEvents.cs
index 362500b7681..9f00354af24 100644
--- a/Content.Shared/Labels/LabelEvents.cs
+++ b/Content.Shared/Labels/LabelEvents.cs
@@ -13,9 +13,11 @@ public enum HandLabelerUiKey
     }
 
     [Serializable, NetSerializable]
-    public enum PaperLabelVisuals
+    public enum PaperLabelVisuals : byte
     {
+        Layer,
         HasLabel,
+        LabelType
     }
 
     /// <summary>
diff --git a/Content.Shared/Language/Components/LanguageKnowledgeComponent.cs b/Content.Shared/Language/Components/LanguageKnowledgeComponent.cs
new file mode 100644
index 00000000000..ddbdc742be4
--- /dev/null
+++ b/Content.Shared/Language/Components/LanguageKnowledgeComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+
+namespace Content.Shared.Language.Components;
+
+// TODO: move to server side, it's never synchronized!
+
+/// <summary>
+///     Stores data about entities' intrinsic language knowledge.
+/// </summary>
+[RegisterComponent]
+public sealed partial class LanguageKnowledgeComponent : Component
+{
+    /// <summary>
+    ///     List of languages this entity can speak without any external tools.
+    /// </summary>
+    [DataField("speaks", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
+    public List<string> SpokenLanguages = new();
+
+    /// <summary>
+    ///     List of languages this entity can understand without any external tools.
+    /// </summary>
+    [DataField("understands", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
+    public List<string> UnderstoodLanguages = new();
+}
diff --git a/Content.Shared/Language/Components/LanguageSpeakerComponent.cs b/Content.Shared/Language/Components/LanguageSpeakerComponent.cs
index 95232ffe6ff..e8ebccb3ddf 100644
--- a/Content.Shared/Language/Components/LanguageSpeakerComponent.cs
+++ b/Content.Shared/Language/Components/LanguageSpeakerComponent.cs
@@ -1,29 +1,32 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
 namespace Content.Shared.Language;
 
-[RegisterComponent, AutoGenerateComponentState]
+// TODO: either move all language speaker-related components to server side, or make everything else shared.
+// The current approach leads to confusion, as the server never informs the client of updates in these components.
+
+/// <summary>
+///     Stores the current state of the languages the entity can speak and understand.
+/// </summary>
+/// <remarks>
+///     All fields of this component are populated during a DetermineEntityLanguagesEvent.
+///     They are not to be modified externally.
+/// </remarks>
+[RegisterComponent]
 public sealed partial class LanguageSpeakerComponent : Component
 {
     /// <summary>
-    ///     The current language the entity may use to speak.
+    ///     The current language the entity uses when speaking.
     ///     Other listeners will hear the entity speak in this language.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public string CurrentLanguage = default!;
+    [DataField]
+    public string CurrentLanguage = ""; // The language system will override it on init  
 
     /// <summary>
-    ///     List of languages this entity can speak.
+    ///     List of languages this entity can speak at the current moment.
     /// </summary>
-    [ViewVariables]
-    [DataField("speaks", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
-    public List<string> SpokenLanguages = new();
+    public List<string> SpokenLanguages = [];
 
     /// <summary>
-    ///     List of languages this entity can understand.
+    ///     List of languages this entity can understand at the current moment.
     /// </summary>
-    [ViewVariables]
-    [DataField("understands", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>), required: true)]
-    public List<string> UnderstoodLanguages = new();
+    public List<string> UnderstoodLanguages = [];
 }
diff --git a/Content.Shared/Language/Components/TranslatorImplantComponent.cs b/Content.Shared/Language/Components/TranslatorImplantComponent.cs
new file mode 100644
index 00000000000..cb8c666c82f
--- /dev/null
+++ b/Content.Shared/Language/Components/TranslatorImplantComponent.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Language.Components.Translators;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+
+namespace Content.Shared.Language.Components;
+
+/// <summary>
+///     An implant that allows the implantee to speak and understand other languages.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TranslatorImplantComponent : BaseTranslatorComponent
+{
+    /// <summary>
+    ///     Whether the implantee knows the languages necessary to speak using this implant.
+    /// </summary>
+    public bool SpokenRequirementSatisfied = false;
+
+    /// <summary>
+    ///     Whether the implantee knows the languages necessary to understand translations of this implant.
+    /// </summary>
+    public bool UnderstoodRequirementSatisfied = false;
+}
diff --git a/Content.Shared/Language/Components/TranslatorImplanterComponent.cs b/Content.Shared/Language/Components/TranslatorImplanterComponent.cs
deleted file mode 100644
index 401e8a8b8aa..00000000000
--- a/Content.Shared/Language/Components/TranslatorImplanterComponent.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Language.Components;
-
-/// <summary>
-///   An item that, when used on a mob, adds an intrinsic translator to it.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TranslatorImplanterComponent : Component
-{
-    [DataField("spoken", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> SpokenLanguages = new();
-
-    [DataField("understood", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> UnderstoodLanguages = new();
-
-    /// <summary>
-    ///   The list of languages the mob must understand in order for this translator to have effect.
-    ///   Knowing one language is enough.
-    /// </summary>
-    [DataField("requires", customTypeSerializer: typeof(PrototypeIdListSerializer<LanguagePrototype>))]
-    public List<string> RequiredLanguages = new();
-
-    /// <summary>
-    ///   If true, only allows to use this implanter on mobs.
-    /// </summary>
-    [DataField]
-    public bool MobsOnly = true;
-
-    /// <summary>
-    ///   Whether this implant has been used already.
-    /// </summary>
-    [DataField]
-    public bool Used = false;
-}
diff --git a/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
index a66c9be082e..072480031d5 100644
--- a/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
+++ b/Content.Shared/Language/Components/Translators/BaseTranslatorComponent.cs
@@ -4,15 +4,6 @@ namespace Content.Shared.Language.Components.Translators;
 
 public abstract partial class BaseTranslatorComponent : Component
 {
-    // TODO may need to be removed completely, it's a part of legacy code that never ended up being used.
-    /// <summary>
-    ///   The language this translator changes the speaker's language to when they don't specify one.
-    ///   If null, does not modify the default language.
-    /// </summary>
-    [DataField("defaultLanguage")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? DefaultLanguageOverride = null;
-
     /// <summary>
     ///   The list of additional languages this translator allows the wielder to speak.
     /// </summary>
diff --git a/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs b/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
index f900603f01d..7e3de0eca61 100644
--- a/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
+++ b/Content.Shared/Language/Components/Translators/HandheldTranslatorComponent.cs
@@ -7,9 +7,18 @@ namespace Content.Shared.Language.Components.Translators;
 public sealed partial class HandheldTranslatorComponent : Translators.BaseTranslatorComponent
 {
     /// <summary>
-    ///   Whether or not interacting with this translator
-    ///   toggles it on or off.
+    ///   Whether interacting with this translator toggles it on and off.
     /// </summary>
-    [DataField("toggleOnInteract")]
+    [DataField]
     public bool ToggleOnInteract = true;
+
+    /// <summary>
+    ///     If true, when this translator is turned on, the entities' current spoken language will be set
+    ///     to the first new language added by this translator.
+    /// </summary>
+    /// <remarks>
+    ///      This should generally be used for translators that translate speech between two languages.
+    /// </remarks>
+    [DataField]
+    public bool SetLanguageOnInteract = true;
 }
diff --git a/Content.Shared/Language/LanguagePrototype.cs b/Content.Shared/Language/LanguagePrototype.cs
index 801ab8a393b..79c17daccd8 100644
--- a/Content.Shared/Language/LanguagePrototype.cs
+++ b/Content.Shared/Language/LanguagePrototype.cs
@@ -1,4 +1,3 @@
-using System.Runtime.CompilerServices;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Language;
@@ -9,19 +8,26 @@ public sealed class LanguagePrototype : IPrototype
     [IdDataField]
     public string ID { get; private set;  } = default!;
 
+    [DataField("color")]
+    public Color? Color;
+
+    [DataField("fontId")]
+    public string? FontId;
+
+    [DataField("fontSize")]
+    public int? FontSize;
+
     /// <summary>
-    ///     If true, obfuscated phrases of creatures speaking this language will have their syllables replaced with "replacement" syllables.
-    ///     Otherwise entire sentences will be replaced.
+    /// 	If true, will mark the language as a SignLanguage and will be handled as such.
     /// </summary>
-    [DataField(required: true)]
-    public bool ObfuscateSyllables;
+    [DataField("signLanguage")]
+    public bool? SignLanguage;
 
     /// <summary>
-    ///     Lists all syllables that are used to obfuscate a message a listener cannot understand if obfuscateSyllables is true.
-    ///     Otherwise uses all possible phrases the creature can make when trying to say anything.
+    ///     Obfuscation method used by this language. By default, uses <see cref="ObfuscationMethod.Default"/>
     /// </summary>
-    [DataField(required: true)]
-    public List<string> Replacement = [];
+    [DataField("obfuscation")]
+    public ObfuscationMethod Obfuscation = ObfuscationMethod.Default;
 
     #region utility
     /// <summary>
diff --git a/Content.Shared/Language/ObfuscationMethods.cs b/Content.Shared/Language/ObfuscationMethods.cs
new file mode 100644
index 00000000000..51230c47970
--- /dev/null
+++ b/Content.Shared/Language/ObfuscationMethods.cs
@@ -0,0 +1,184 @@
+using System.Text;
+using Content.Shared.Language.Systems;
+
+namespace Content.Shared.Language;
+
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class ObfuscationMethod
+{
+    /// <summary>
+    ///     The fallback obfuscation method, replaces the message with the string "&lt;?&gt;".
+    /// </summary>
+    public static readonly ObfuscationMethod Default = new ReplacementObfuscation
+    {
+        Replacement = new List<string> { "<?>" }
+    };
+
+    /// <summary>
+    ///     Obfuscates the provided message and writes the result into the provided StringBuilder.
+    ///     Implementations should use the context's pseudo-random number generator and provide stable obfuscations.
+    /// </summary>
+    internal abstract void Obfuscate(StringBuilder builder, string message, SharedLanguageSystem context);
+
+    /// <summary>
+    ///     Obfuscates the provided message. This method should only be used for debugging purposes.
+    ///     For all other purposes, use <see cref="SharedLanguageSystem.ObfuscateSpeech"/> instead.
+    /// </summary>
+    public string Obfuscate(string message)
+    {
+        var builder = new StringBuilder();
+        Obfuscate(builder, message, IoCManager.Resolve<EntitySystemManager>().GetEntitySystem<SharedLanguageSystem>());
+        return builder.ToString();
+    }
+}
+
+/// <summary>
+///     The most primitive method of obfuscation - replaces the entire message with one random replacement phrase.
+///     Similar to ReplacementAccent. Base for all replacement-based obfuscation methods.
+/// </summary>
+public partial class ReplacementObfuscation : ObfuscationMethod
+{
+    /// <summary>
+    ///     A list of replacement phrases used in the obfuscation process.
+    /// </summary>
+    [DataField(required: true)]
+    public List<string> Replacement = [];
+
+    internal override void Obfuscate(StringBuilder builder, string message, SharedLanguageSystem context)
+    {
+        var idx = context.PseudoRandomNumber(message.GetHashCode(), 0, Replacement.Count - 1);
+        builder.Append(Replacement[idx]);
+    }
+}
+
+/// <summary>
+///     Obfuscates the provided message by replacing each word with a random number of syllables in the range (min, max),
+///     preserving the original punctuation to a resonable extent.
+/// </summary>
+/// <remarks>
+///     The words are obfuscated in a stable manner, such that every particular word will be obfuscated the same way throughout one round.
+///     This means that particular words can be memorized within a round, but not across rounds.
+/// </remarks>
+public sealed partial class SyllableObfuscation : ReplacementObfuscation
+{
+    [DataField]
+    public int MinSyllables = 1;
+
+    [DataField]
+    public int MaxSyllables = 4;
+
+    internal override void Obfuscate(StringBuilder builder, string message, SharedLanguageSystem context)
+    {
+        const char eof = (char) 0; // Special character to mark the end of the message in the code below
+
+        var wordBeginIndex = 0;
+        var hashCode = 0;
+
+        for (var i = 0; i <= message.Length; i++)
+        {
+            var ch = i < message.Length ? char.ToLower(message[i]) : eof;
+            var isWordEnd = char.IsWhiteSpace(ch) || IsPunctuation(ch) || ch == eof;
+
+            // If this is a normal char, add it to the hash sum
+            if (!isWordEnd)
+                hashCode = hashCode * 31 + ch;
+
+            // If a word ends before this character, construct a new word and append it to the new message.
+            if (isWordEnd)
+            {
+                var wordLength = i - wordBeginIndex;
+                if (wordLength > 0)
+                {
+                    var newWordLength = context.PseudoRandomNumber(hashCode, MinSyllables, MaxSyllables);
+
+                    for (var j = 0; j < newWordLength; j++)
+                    {
+                        var index = context.PseudoRandomNumber(hashCode + j, 0, Replacement.Count - 1);
+                        builder.Append(Replacement[index]);
+                    }
+                }
+
+                hashCode = 0;
+                wordBeginIndex = i + 1;
+            }
+
+            // If this message concludes a word (i.e. is a whitespace or a punctuation mark), append it to the message
+            if (isWordEnd && ch != eof)
+                builder.Append(ch);
+        }
+    }
+
+    private static bool IsPunctuation(char ch)
+    {
+        return ch is '.' or '!' or '?' or ',' or ':';
+    }
+}
+
+/// <summary>
+///     Obfuscates each sentence in the message by concatenating a number of obfuscation phrases.
+///     The number of phrases in the obfuscated message is proportional to the length of the original message.
+/// </summary>
+public sealed partial class PhraseObfuscation : ReplacementObfuscation
+{
+    [DataField]
+    public int MinPhrases = 1;
+
+    [DataField]
+    public int MaxPhrases = 4;
+
+    /// <summary>
+    ///     A string used to separate individual phrases within one sentence. Default is a space.
+    /// </summary>
+    [DataField]
+    public string Separator = " ";
+
+    /// <summary>
+    ///     A power to which the number of characters in the original message is raised to determine the number of phrases in the result.
+    ///     Default is 1/3, i.e. the cubic root of the original number.
+    /// </summary>
+    /// <remarks>
+    ///     Using the default proportion, you will need at least 27 characters for 2 phrases, at least 64 for 3, at least 125 for 4, etc.
+    ///     Increasing the proportion to 1/4 will result in the numbers changing to 81, 256, 625, etc.
+    /// </remarks>
+    [DataField]
+    public float Proportion = 1f / 3;
+
+    internal override void Obfuscate(StringBuilder builder, string message, SharedLanguageSystem context)
+    {
+        var sentenceBeginIndex = 0;
+        var hashCode = 0;
+
+        for (var i = 0; i < message.Length; i++)
+        {
+            var ch = char.ToLower(message[i]);
+            if (!IsPunctuation(ch) && i != message.Length - 1)
+            {
+                hashCode = hashCode * 31 + ch;
+                continue;
+            }
+
+            var length = i - sentenceBeginIndex;
+            if (length > 0)
+            {
+                var newLength = (int) Math.Clamp(Math.Pow(length, Proportion) - 1, MinPhrases, MaxPhrases);
+
+                for (var j = 0; j < newLength; j++)
+                {
+                    var phraseIdx = context.PseudoRandomNumber(hashCode + j, 0, Replacement.Count - 1);
+                    var phrase = Replacement[phraseIdx];
+                    builder.Append(phrase);
+                    builder.Append(Separator);
+                }
+            }
+            sentenceBeginIndex = i + 1;
+
+            if (IsPunctuation(ch))
+                builder.Append(ch).Append(' '); // TODO: this will turn '...' into '. . . '
+        }
+    }
+
+    private static bool IsPunctuation(char ch)
+    {
+        return ch is '.' or '!' or '?'; // Doesn't include mid-sentence punctuation like the comma
+    }
+}
diff --git a/Content.Shared/Language/Systems/SharedLanguageSystem.cs b/Content.Shared/Language/Systems/SharedLanguageSystem.cs
index e2eeb8bb493..0a03086ebe1 100644
--- a/Content.Shared/Language/Systems/SharedLanguageSystem.cs
+++ b/Content.Shared/Language/Systems/SharedLanguageSystem.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Actions;
+using System.Text;
+using Content.Shared.GameTicking;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 
 namespace Content.Shared.Language.Systems;
 
@@ -24,7 +24,7 @@ public abstract class SharedLanguageSystem : EntitySystem
     public static LanguagePrototype Universal { get; private set; } = default!;
 
     [Dependency] protected readonly IPrototypeManager _prototype = default!;
-    [Dependency] protected readonly IRobustRandom _random = default!;
+    [Dependency] protected readonly SharedGameTicker _ticker = default!;
 
     public override void Initialize()
     {
@@ -36,4 +36,32 @@ public override void Initialize()
         _prototype.TryIndex<LanguagePrototype>(id, out var proto);
         return proto;
     }
+
+    /// <summary>
+    ///     Obfuscate a message using the given language.
+    /// </summary>
+    public string ObfuscateSpeech(string message, LanguagePrototype language)
+    {
+        var builder = new StringBuilder();
+        var method = language.Obfuscation;
+        method.Obfuscate(builder, message, this);
+
+        return builder.ToString();
+    }
+
+    /// <summary>
+    ///     Generates a stable pseudo-random number in the range (min, max) (inclusively) for the given seed.
+    ///     One seed always corresponds to one number, however the resulting number also depends on the current round number.
+    ///     This method is meant to be used in <see cref="ObfuscationMethod"/> to provide stable obfuscation.
+    /// </summary>
+    internal int PseudoRandomNumber(int seed, int min, int max)
+    {
+        // Using RobustRandom or System.Random here is a bad idea because this method can get called hundreds of times per message.
+        // Each call would require us to allocate a new instance of random, which would lead to lots of unnecessary calculations.
+        // Instead, we use a simple but effective algorithm derived from the C language.
+        // It does not produce a truly random number, but for the purpose of obfuscating messages in an RP-based game it's more than alright.
+        seed = seed ^ (_ticker.RoundId * 127);
+        var random = seed * 1103515245 + 12345;
+        return min + Math.Abs(random) % (max - min + 1);
+    }
 }
diff --git a/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs b/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs
deleted file mode 100644
index a13225378cd..00000000000
--- a/Content.Shared/Language/Systems/SharedTranslatorImplanterSystem.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Examine;
-using Content.Shared.Implants.Components;
-using Content.Shared.Language.Components;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Language.Systems;
-
-public abstract class SharedTranslatorImplanterSystem : EntitySystem
-{
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<TranslatorImplanterComponent, ExaminedEvent>(OnExamined);
-    }
-
-    private void OnExamined(EntityUid uid, TranslatorImplanterComponent component, ExaminedEvent args)
-    {
-        if (!args.IsInDetailsRange)
-            return;
-
-        var text = !component.Used
-            ? Loc.GetString("translator-implanter-ready")
-            : Loc.GetString("translator-implanter-used");
-
-        args.PushText(text);
-    }
-
-    protected void OnAppearanceChange(EntityUid implanter, TranslatorImplanterComponent component)
-    {
-        var used = component.Used;
-        _appearance.SetData(implanter, ImplanterVisuals.Full, !used);
-    }
-}
diff --git a/Content.Shared/Language/Systems/SharedTranslatorSystem.cs b/Content.Shared/Language/Systems/SharedTranslatorSystem.cs
index 08a016efa9c..4a72de791f0 100644
--- a/Content.Shared/Language/Systems/SharedTranslatorSystem.cs
+++ b/Content.Shared/Language/Systems/SharedTranslatorSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Examine;
 using Content.Shared.Toggleable;
 using Content.Shared.Language.Components.Translators;
@@ -17,11 +18,20 @@ public override void Initialize()
 
     private void OnExamined(EntityUid uid, HandheldTranslatorComponent component, ExaminedEvent args)
     {
-        var state = Loc.GetString(component.Enabled
-            ? "translator-enabled"
-            : "translator-disabled");
+        var understoodLanguageNames = component.UnderstoodLanguages
+            .Select(it => Loc.GetString($"language-{it}-name"));
+        var spokenLanguageNames = component.SpokenLanguages
+            .Select(it => Loc.GetString($"language-{it}-name"));
+        var requiredLanguageNames = component.RequiredLanguages
+            .Select(it => Loc.GetString($"language-{it}-name"));
 
-        args.PushMarkup(state);
+        args.PushMarkup(Loc.GetString("translator-examined-langs-understood", ("languages", string.Join(", ", understoodLanguageNames))));
+        args.PushMarkup(Loc.GetString("translator-examined-langs-spoken", ("languages", string.Join(", ", spokenLanguageNames))));
+
+        args.PushMarkup(Loc.GetString(component.RequiresAllLanguages ? "translator-examined-requires-all" : "translator-examined-requires-any",
+            ("languages", string.Join(", ", requiredLanguageNames))));
+
+        args.PushMarkup(Loc.GetString(component.Enabled ? "translator-examined-enabled" : "translator-examined-disabled"));
     }
 
     protected void OnAppearanceChange(EntityUid translator, HandheldTranslatorComponent? comp = null)
diff --git a/Content.Shared/Light/Components/SharedExpendableLightComponent.cs b/Content.Shared/Light/Components/SharedExpendableLightComponent.cs
index c802700b62c..e40174ab783 100644
--- a/Content.Shared/Light/Components/SharedExpendableLightComponent.cs
+++ b/Content.Shared/Light/Components/SharedExpendableLightComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Light.Components;
 [NetworkedComponent]
 public abstract partial class SharedExpendableLightComponent : Component
 {
-    public static readonly AudioParams LoopedSoundParams = new(0, 1, "Master", 62.5f, 1, 1, true, 0.3f);
+    public static readonly AudioParams LoopedSoundParams = new(0, 1, 62.5f, 1, 1, true, 0.3f);
 
     [ViewVariables(VVAccess.ReadOnly)]
     public ExpendableLightState CurrentState { get; set; }
diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs
index 0a06d9ba4f3..3c311f43821 100644
--- a/Content.Shared/Localizations/ContentLocalizationManager.cs
+++ b/Content.Shared/Localizations/ContentLocalizationManager.cs
@@ -119,6 +119,14 @@ public static string FormatList(List<string> list)
             };
         }
 
+        /// <summary>
+        /// Formats a direction struct as a human-readable string.
+        /// </summary>
+        public static string FormatDirection(Direction dir)
+        {
+            return Loc.GetString($"zzzz-fmt-direction-{dir.ToString()}");
+        }
+
         private static ILocValue FormatLoc(LocArgs args)
         {
             var id = ((LocValueString) args.Args[0]).Value;
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 53c199e4108..165e01f70d9 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.Construction.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Examine;
@@ -9,6 +10,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
+using Content.Shared.Wires;
 using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
@@ -40,8 +42,11 @@ public override void Initialize()
         SubscribeLocalEvent<LockComponent, GotEmaggedEvent>(OnEmagged);
         SubscribeLocalEvent<LockComponent, LockDoAfter>(OnDoAfterLock);
         SubscribeLocalEvent<LockComponent, UnlockDoAfter>(OnDoAfterUnlock);
-    }
 
+        SubscribeLocalEvent<LockedWiresPanelComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
+        SubscribeLocalEvent<LockedWiresPanelComponent, AttemptChangePanelEvent>(OnAttemptChangePanel);
+        SubscribeLocalEvent<LockedAnchorableComponent, UnanchorAttemptEvent>(OnUnanchorAttempt);
+    }
     private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
     {
         _appearanceSystem.SetData(uid, LockVisuals.Locked, lockComp.Locked);
@@ -226,18 +231,18 @@ private bool HasUserAccess(EntityUid uid, EntityUid user, AccessReaderComponent?
 
     private void AddToggleLockVerb(EntityUid uid, LockComponent component, GetVerbsEvent<AlternativeVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || !CanToggleLock(uid, args.User))
+        if (!args.CanAccess || !args.CanInteract)
             return;
 
         AlternativeVerb verb = new()
         {
-            Act = component.Locked ?
-                () => TryUnlock(uid, args.User, component) :
-                () => TryLock(uid, args.User, component),
+            Act = component.Locked
+                ? () => TryUnlock(uid, args.User, component)
+                : () => TryLock(uid, args.User, component),
             Text = Loc.GetString(component.Locked ? "toggle-lock-verb-unlock" : "toggle-lock-verb-lock"),
-            Icon = component.Locked ?
-                new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/unlock.svg.192dpi.png")) :
-                new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/lock.svg.192dpi.png")),
+            Icon = !component.Locked
+                ? new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/lock.svg.192dpi.png"))
+                : new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/unlock.svg.192dpi.png")),
         };
         args.Verbs.Add(verb);
     }
@@ -275,5 +280,53 @@ private void OnDoAfterUnlock(EntityUid uid, LockComponent component, UnlockDoAft
 
         TryUnlock(uid, args.User, skipDoAfter: true);
     }
+
+    private void OnLockToggleAttempt(Entity<LockedWiresPanelComponent> ent, ref LockToggleAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!TryComp<WiresPanelComponent>(ent, out var panel) || !panel.Open)
+            return;
+
+        if (!args.Silent)
+        {
+            _sharedPopupSystem.PopupClient(Loc.GetString("construction-step-condition-wire-panel-close"),
+                ent,
+                args.User);
+        }
+        args.Cancelled = true;
+    }
+
+
+    private void OnAttemptChangePanel(Entity<LockedWiresPanelComponent> ent, ref AttemptChangePanelEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!TryComp<LockComponent>(ent, out var lockComp) || !lockComp.Locked)
+            return;
+
+        _sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-generic-fail",
+            ("target", Identity.Entity(ent, EntityManager))),
+            ent,
+            args.User);
+        args.Cancelled = true;
+    }
+
+    private void OnUnanchorAttempt(Entity<LockedAnchorableComponent> ent, ref UnanchorAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!TryComp<LockComponent>(ent, out var lockComp) || !lockComp.Locked)
+            return;
+
+        _sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-generic-fail",
+                ("target", Identity.Entity(ent, EntityManager))),
+            ent,
+            args.User);
+        args.Cancel();
+    }
 }
 
diff --git a/Content.Shared/Lock/LockedAnchorableComponent.cs b/Content.Shared/Lock/LockedAnchorableComponent.cs
new file mode 100644
index 00000000000..781b7f65322
--- /dev/null
+++ b/Content.Shared/Lock/LockedAnchorableComponent.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Construction.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock;
+
+/// <summary>
+/// This is used for a <see cref="AnchorableComponent"/> that cannot be unanchored while locked.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(LockSystem))]
+public sealed partial class LockedAnchorableComponent : Component
+{
+
+}
diff --git a/Content.Shared/Lock/LockedWiresPanelComponent.cs b/Content.Shared/Lock/LockedWiresPanelComponent.cs
new file mode 100644
index 00000000000..1dbe6a4932d
--- /dev/null
+++ b/Content.Shared/Lock/LockedWiresPanelComponent.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Wires;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock;
+
+/// <summary>
+/// This is used for a <see cref="WiresPanelComponent"/> that cannot be opened while locked.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(LockSystem))]
+public sealed partial class LockedWiresPanelComponent : Component
+{
+
+}
diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index 32f5db0e821..be171559d02 100644
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -121,5 +121,11 @@ public void AssignTileId(ushort id)
         {
             TileId = id;
         }
+
+        [DataField]
+        public bool Reinforced = false;
+
+        [DataField]
+        public float TileRipResistance = 125f;
     }
 }
diff --git a/Content.Shared/Maps/TurfHelpers.cs b/Content.Shared/Maps/TurfHelpers.cs
index 58a5d133b55..f1c1beef7d1 100644
--- a/Content.Shared/Maps/TurfHelpers.cs
+++ b/Content.Shared/Maps/TurfHelpers.cs
@@ -3,6 +3,7 @@
 using System.Runtime.CompilerServices;
 using Content.Shared.Physics;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
 
 namespace Content.Shared.Maps
@@ -11,6 +12,22 @@ namespace Content.Shared.Maps
     // That, or make the interface arguments non-optional so people stop failing to pass them in.
     public static class TurfHelpers
     {
+        /// <summary>
+        ///     Attempts to get the turf at map indices with grid id or null if no such turf is found.
+        /// </summary>
+        public static TileRef GetTileRef(this Vector2i vector2i, EntityUid gridId, IEntityManager? entityManager = null)
+        {
+            entityManager ??= IoCManager.Resolve<IEntityManager>();
+
+            if (!entityManager.TryGetComponent<MapGridComponent>(gridId, out var grid))
+                return default;
+
+            if (!grid.TryGetTileRef(vector2i, out var tile))
+                return default;
+
+            return tile;
+        }
+
         /// <summary>
         ///     Attempts to get the turf at a certain coordinates or null if no such turf is found.
         /// </summary>
@@ -119,9 +136,8 @@ public static bool IsBlockedTurf(this TileRef turf, bool filterMobs, EntityLooku
         private static bool GetWorldTileBox(TileRef turf, out Box2Rotated res)
         {
             var entManager = IoCManager.Resolve<IEntityManager>();
-            var map = IoCManager.Resolve<IMapManager>();
 
-            if (map.TryGetGrid(turf.GridUid, out var tileGrid))
+            if (entManager.TryGetComponent<MapGridComponent>(turf.GridUid, out var tileGrid))
             {
                 var gridRot = entManager.GetComponent<TransformComponent>(turf.GridUid).WorldRotation;
 
diff --git a/Content.Shared/Maps/TurfSystem.cs b/Content.Shared/Maps/TurfSystem.cs
index a344193f123..ad8b3ddea8d 100644
--- a/Content.Shared/Maps/TurfSystem.cs
+++ b/Content.Shared/Maps/TurfSystem.cs
@@ -13,7 +13,6 @@ public sealed class TurfSystem : EntitySystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly IMapManager _mapMan = default!;
 
     /// <summary>
     ///     Returns true if a given tile is blocked by physics-enabled entities.
@@ -92,7 +91,7 @@ public bool IsTileBlocked(EntityUid gridUid,
     /// </summary>
     public EntityCoordinates GetTileCenter(TileRef turf)
     {
-        var grid = _mapMan.GetGrid(turf.GridUid);
+        var grid = Comp<MapGridComponent>(turf.GridUid);
         var center = (turf.GridIndices + new Vector2(0.5f, 0.5f)) * grid.TileSize;
         return new EntityCoordinates(turf.GridUid, center);
     }
diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
index 5a9ada7f586..50dce3c7669 100644
--- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -1,7 +1,8 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Audio;
 using Content.Shared.Body.Components;
+using Content.Shared.Coordinates;
 using Content.Shared.Database;
 using Content.Shared.Emag.Components;
 using Content.Shared.Emag.Systems;
@@ -11,6 +12,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
+using Robust.Shared.Map;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Timing;
 
@@ -110,6 +112,9 @@ public bool TryStartProcessItem(EntityUid uid, EntityUid item, MaterialReclaimer
             component.NextSound = Timing.CurTime + component.SoundCooldown;
         }
 
+        var reclaimedEvent = new GotReclaimedEvent(Transform(uid).Coordinates);
+        RaiseLocalEvent(item, ref reclaimedEvent);
+
         var duration = GetReclaimingDuration(uid, item, component);
         // if it's instant, don't bother with all the active comp stuff.
         if (duration == TimeSpan.Zero)
@@ -238,3 +243,6 @@ public override void Update(float frameTime)
         }
     }
 }
+
+[ByRefEvent]
+public record struct GotReclaimedEvent(EntityCoordinates ReclaimerCoordinates);
diff --git a/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs b/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs
index 07e0eca33bd..e3ca466b085 100644
--- a/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs
+++ b/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs
@@ -23,6 +23,8 @@ public SuitSensorStatus(NetEntity suitSensorUid, string name, string job, string
     public List<string> JobDepartments;
     public bool IsAlive;
     public int? TotalDamage;
+    public int? TotalDamageThreshold;
+    public float? DamagePercentage => TotalDamageThreshold == null || TotalDamage == null ? null : TotalDamage / TotalDamageThreshold;
     public NetCoordinates? Coordinates;
 }
 
@@ -58,6 +60,7 @@ public static class SuitSensorConstants
     public const string NET_JOB_DEPARTMENTS = "jobDepartments";
     public const string NET_IS_ALIVE = "alive";
     public const string NET_TOTAL_DAMAGE = "vitals";
+    public const string NET_TOTAL_DAMAGE_THRESHOLD = "vitalsThreshold";
     public const string NET_COORDINATES = "coords";
     public const string NET_SUIT_SENSOR_UID = "uid";
 
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index 1d6d052f9a1..1898126d803 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -26,6 +26,7 @@ public abstract class SharedMindSystem : EntitySystem
     [Dependency] private readonly SharedObjectivesSystem _objectives = default!;
     [Dependency] private readonly SharedPlayerSystem _player = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
+    [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
 
     [ViewVariables]
     protected readonly Dictionary<NetUserId, EntityUid> UserMinds = new();
@@ -107,6 +108,7 @@ public virtual bool TryGetMind(NetUserId user, [NotNullWhen(true)] out EntityUid
             TryComp(mindIdValue, out mind))
         {
             DebugTools.Assert(mind.UserId == user);
+
             mindId = mindIdValue;
             return true;
         }
@@ -422,29 +424,26 @@ public bool TryGetMind(
         return TryComp(mindId, out mind);
     }
 
-    public bool TryGetMind(
-        ContentPlayerData contentPlayer,
-        out EntityUid mindId,
-        [NotNullWhen(true)] out MindComponent? mind)
-    {
-        mindId = contentPlayer.Mind ?? default;
-        return TryComp(mindId, out mind);
-    }
-
+    // TODO MIND make this return a nullable EntityUid or Entity<MindComponent>
     public bool TryGetMind(
         ICommonSession? player,
         out EntityUid mindId,
         [NotNullWhen(true)] out MindComponent? mind)
     {
-        mindId = default;
-        mind = null;
-        if (_player.ContentData(player) is not { } data)
+        if (player == null)
+        {
+            mindId = default;
+            mind = null;
             return false;
+        }
 
-        if (TryGetMind(data, out mindId, out mind))
+        if (TryGetMind(player.UserId, out var mindUid, out mind))
+        {
+            mindId = mindUid.Value;
             return true;
+        }
 
-        DebugTools.AssertNull(data.Mind);
+        mindId = default;
         return false;
     }
 
diff --git a/Content.Shared/Movement/Components/CanWalkComponent.cs b/Content.Shared/Movement/Components/CanWalkComponent.cs
new file mode 100644
index 00000000000..fab851595c7
--- /dev/null
+++ b/Content.Shared/Movement/Components/CanWalkComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// Indicates if the entity can toggle walking or not.
+/// </summary>
+[NetworkedComponent, RegisterComponent]
+public sealed partial class CanWalkComponent : Component
+{
+}
diff --git a/Content.Shared/Movement/Components/InputMoverComponent.cs b/Content.Shared/Movement/Components/InputMoverComponent.cs
index f1e34c90df4..263190d46fd 100644
--- a/Content.Shared/Movement/Components/InputMoverComponent.cs
+++ b/Content.Shared/Movement/Components/InputMoverComponent.cs
@@ -1,9 +1,11 @@
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.Movement.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Timing;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Movement.Components
 {
@@ -74,6 +76,9 @@ public sealed partial class InputMoverComponent : Component
 
         [ViewVariables(VVAccess.ReadWrite)]
         public bool CanMove = true;
+
+        [DataField]
+        public ProtoId<AlertPrototype> WalkingAlert = "Walking";
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Movement/Components/WaddleAnimationComponent.cs b/Content.Shared/Movement/Components/WaddleAnimationComponent.cs
new file mode 100644
index 00000000000..c43ef3042eb
--- /dev/null
+++ b/Content.Shared/Movement/Components/WaddleAnimationComponent.cs
@@ -0,0 +1,72 @@
+using System.Numerics;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// Declares that an entity has started to waddle like a duck/clown.
+/// </summary>
+/// <param name="Entity">The newly be-waddled.</param>
+[ByRefEvent]
+public record struct StartedWaddlingEvent(EntityUid Entity)
+{
+    public EntityUid Entity = Entity;
+}
+
+/// <summary>
+/// Declares that an entity has stopped waddling like a duck/clown.
+/// </summary>
+/// <param name="Entity">The former waddle-er.</param>
+[ByRefEvent]
+public record struct StoppedWaddlingEvent(EntityUid Entity)
+{
+    public EntityUid Entity = Entity;
+}
+
+/// <summary>
+/// Defines something as having a waddle animation when it moves.
+/// </summary>
+[RegisterComponent]
+public sealed partial class WaddleAnimationComponent : Component
+{
+    /// <summary>
+    /// What's the name of this animation? Make sure it's unique so it can play along side other animations.
+    /// This prevents someone accidentally causing two identical waddling effects to play on someone at the same time.
+    /// </summary>
+    [DataField]
+    public string KeyName = "Waddle";
+
+    ///<summary>
+    /// How high should they hop during the waddle? Higher hop = more energy.
+    /// </summary>
+    [DataField]
+    public Vector2 HopIntensity = new(0, 0.25f);
+
+    /// <summary>
+    /// How far should they rock backward and forward during the waddle?
+    /// Each step will alternate between this being a positive and negative rotation. More rock = more scary.
+    /// </summary>
+    [DataField]
+    public float TumbleIntensity = 20.0f;
+
+    /// <summary>
+    /// How long should a complete step take? Less time = more chaos.
+    /// </summary>
+    [DataField]
+    public float AnimationLength = 0.66f;
+
+    /// <summary>
+    /// How much shorter should the animation be when running?
+    /// </summary>
+    [DataField]
+    public float RunAnimationLengthMultiplier = 0.568f;
+
+    /// <summary>
+    /// Stores which step we made last, so if someone cancels out of the animation mid-step then restarts it looks more natural.
+    /// </summary>
+    public bool LastStep;
+
+    /// <summary>
+    /// Stores if we're currently waddling so we can start/stop as appropriate and can tell other systems our state.
+    /// </summary>
+    public bool IsCurrentlyWaddling;
+}
diff --git a/Content.Shared/Movement/Pulling/Components/PullableComponent.cs b/Content.Shared/Movement/Pulling/Components/PullableComponent.cs
new file mode 100644
index 00000000000..db889e7e3bd
--- /dev/null
+++ b/Content.Shared/Movement/Pulling/Components/PullableComponent.cs
@@ -0,0 +1,39 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Pulling.Components;
+
+/// <summary>
+/// Specifies an entity as being pullable by an entity with <see cref="PullerComponent"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(Systems.PullingSystem))]
+public sealed partial class PullableComponent : Component
+{
+    /// <summary>
+    /// The current entity pulling this component.
+    /// </summary>
+    [AutoNetworkedField, DataField]
+    public EntityUid? Puller;
+
+    /// <summary>
+    /// The pull joint.
+    /// </summary>
+    [AutoNetworkedField, DataField]
+    public string? PullJointId;
+
+    public bool BeingPulled => Puller != null;
+
+    /// <summary>
+    /// If the physics component has FixedRotation should we keep it upon being pulled
+    /// </summary>
+    [Access(typeof(Systems.PullingSystem), Other = AccessPermissions.ReadExecute)]
+    [ViewVariables(VVAccess.ReadWrite), DataField("fixedRotation")]
+    public bool FixedRotationOnPull;
+
+    /// <summary>
+    /// What the pullable's fixedrotation was set to before being pulled.
+    /// </summary>
+    [Access(typeof(Systems.PullingSystem), Other = AccessPermissions.ReadExecute)]
+    [AutoNetworkedField, DataField]
+    public bool PrevFixedRotation;
+}
diff --git a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
new file mode 100644
index 00000000000..1fc9b731bd5
--- /dev/null
+++ b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
@@ -0,0 +1,41 @@
+using Content.Shared.Movement.Pulling.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Movement.Pulling.Components;
+
+/// <summary>
+/// Specifies an entity as being able to pull another entity with <see cref="PullableComponent"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(PullingSystem))]
+public sealed partial class PullerComponent : Component
+{
+    // My raiding guild
+    /// <summary>
+    /// Next time the puller can throw what is being pulled.
+    /// Used to avoid spamming it for infinite spin + velocity.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
+    public TimeSpan NextThrow;
+
+    [DataField]
+    public TimeSpan ThrowCooldown = TimeSpan.FromSeconds(1);
+
+    // Before changing how this is updated, please see SharedPullerSystem.RefreshMovementSpeed
+    public float WalkSpeedModifier => Pulling == default ? 1.0f : 0.95f;
+
+    public float SprintSpeedModifier => Pulling == default ? 1.0f : 0.95f;
+
+    /// <summary>
+    /// Entity currently being pulled if applicable.
+    /// </summary>
+    [AutoNetworkedField, DataField]
+    public EntityUid? Pulling;
+
+    /// <summary>
+    ///     Does this entity need hands to be able to pull something?
+    /// </summary>
+    [DataField]
+    public bool NeedsHands = true;
+}
diff --git a/Content.Shared/Movement/Pulling/Events/AttemptPullEvent.cs b/Content.Shared/Movement/Pulling/Events/AttemptPullEvent.cs
new file mode 100644
index 00000000000..b0101c46996
--- /dev/null
+++ b/Content.Shared/Movement/Pulling/Events/AttemptPullEvent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Physics.Components;
+
+namespace Content.Shared.Movement.Pulling.Events;
+
+/// <summary>
+/// Raised directed on puller and pullable to determine if it can be pulled.
+/// </summary>
+public sealed class PullAttemptEvent : PullMessage
+{
+    public PullAttemptEvent(EntityUid pullerUid, EntityUid pullableUid) : base(pullerUid, pullableUid) { }
+
+    public bool Cancelled { get; set; }
+}
diff --git a/Content.Shared/Movement/Pulling/Events/AttemptStopPullingEvent.cs b/Content.Shared/Movement/Pulling/Events/AttemptStopPullingEvent.cs
new file mode 100644
index 00000000000..cd7edc5f623
--- /dev/null
+++ b/Content.Shared/Movement/Pulling/Events/AttemptStopPullingEvent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Pulling.Events;
+
+/// <summary>
+/// Raised when a request is made to stop pulling an entity.
+/// </summary>
+public record struct AttemptStopPullingEvent(EntityUid? User = null)
+{
+    public readonly EntityUid? User = User;
+    public bool Cancelled;
+}
\ No newline at end of file
diff --git a/Content.Shared/Pulling/Events/BeingPulledAttemptEvent.cs b/Content.Shared/Movement/Pulling/Events/BeingPulledAttemptEvent.cs
similarity index 100%
rename from Content.Shared/Pulling/Events/BeingPulledAttemptEvent.cs
rename to Content.Shared/Movement/Pulling/Events/BeingPulledAttemptEvent.cs
diff --git a/Content.Shared/Movement/Pulling/Events/PullMessage.cs b/Content.Shared/Movement/Pulling/Events/PullMessage.cs
new file mode 100644
index 00000000000..a427e448d5c
--- /dev/null
+++ b/Content.Shared/Movement/Pulling/Events/PullMessage.cs
@@ -0,0 +1,13 @@
+namespace Content.Shared.Movement.Pulling.Events;
+
+public abstract class PullMessage : EntityEventArgs
+{
+    public readonly EntityUid PullerUid;
+    public readonly EntityUid PulledUid;
+
+    protected PullMessage(EntityUid pullerUid, EntityUid pulledUid)
+    {
+        PullerUid = pullerUid;
+        PulledUid = pulledUid;
+    }
+}
diff --git a/Content.Shared/Movement/Pulling/Events/PullStartedMessage.cs b/Content.Shared/Movement/Pulling/Events/PullStartedMessage.cs
new file mode 100644
index 00000000000..29460e1dfc1
--- /dev/null
+++ b/Content.Shared/Movement/Pulling/Events/PullStartedMessage.cs
@@ -0,0 +1,9 @@
+namespace Content.Shared.Movement.Pulling.Events;
+
+public sealed class PullStartedMessage : PullMessage
+{
+    public PullStartedMessage(EntityUid pullerUid, EntityUid pullableUid) :
+        base(pullerUid, pullableUid)
+    {
+    }
+}
diff --git a/Content.Shared/Movement/Pulling/Events/PullStoppedMessage.cs b/Content.Shared/Movement/Pulling/Events/PullStoppedMessage.cs
new file mode 100644
index 00000000000..47aa34562fb
--- /dev/null
+++ b/Content.Shared/Movement/Pulling/Events/PullStoppedMessage.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Physics.Components;
+
+namespace Content.Shared.Movement.Pulling.Events;
+
+/// <summary>
+/// Raised directed on both puller and pullable.
+/// </summary>
+public sealed class PullStoppedMessage : PullMessage
+{
+    public PullStoppedMessage(EntityUid pullerUid, EntityUid pulledUid) : base(pullerUid, pulledUid)
+    {
+    }
+}
diff --git a/Content.Shared/Pulling/Events/StartPullAttemptEvent.cs b/Content.Shared/Movement/Pulling/Events/StartPullAttemptEvent.cs
similarity index 100%
rename from Content.Shared/Pulling/Events/StartPullAttemptEvent.cs
rename to Content.Shared/Movement/Pulling/Events/StartPullAttemptEvent.cs
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
new file mode 100644
index 00000000000..3c265d5a027
--- /dev/null
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -0,0 +1,491 @@
+using System.Numerics;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Alert;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Database;
+using Content.Shared.Hands;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Input;
+using Content.Shared.Interaction;
+using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Events;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Pulling.Events;
+using Content.Shared.Throwing;
+using Content.Shared.Verbs;
+using Robust.Shared.Containers;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Map;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Events;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Movement.Pulling.Systems;
+
+/// <summary>
+/// Allows one entity to pull another behind them via a physics distance joint.
+/// </summary>
+public sealed class PullingSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly ActionBlockerSystem _blocker = default!;
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _modifierSystem = default!;
+    [Dependency] private readonly SharedJointSystem _joints = default!;
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedTransformSystem _xformSys = default!;
+    [Dependency] private readonly ThrowingSystem _throwing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        UpdatesAfter.Add(typeof(SharedPhysicsSystem));
+        UpdatesOutsidePrediction = true;
+
+        SubscribeLocalEvent<PullableComponent, MoveInputEvent>(OnPullableMoveInput);
+        SubscribeLocalEvent<PullableComponent, CollisionChangeEvent>(OnPullableCollisionChange);
+        SubscribeLocalEvent<PullableComponent, JointRemovedEvent>(OnJointRemoved);
+        SubscribeLocalEvent<PullableComponent, GetVerbsEvent<Verb>>(AddPullVerbs);
+        SubscribeLocalEvent<PullableComponent, EntGotInsertedIntoContainerMessage>(OnPullableContainerInsert);
+
+        SubscribeLocalEvent<PullerComponent, EntGotInsertedIntoContainerMessage>(OnPullerContainerInsert);
+        SubscribeLocalEvent<PullerComponent, EntityUnpausedEvent>(OnPullerUnpaused);
+        SubscribeLocalEvent<PullerComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
+        SubscribeLocalEvent<PullerComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
+
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.MovePulledObject, new PointerInputCmdHandler(OnRequestMovePulledObject))
+            .Bind(ContentKeyFunctions.ReleasePulledObject, InputCmdHandler.FromDelegate(OnReleasePulledObject, handle: false))
+            .Register<PullingSystem>();
+    }
+
+    private void OnPullerContainerInsert(Entity<PullerComponent> ent, ref EntGotInsertedIntoContainerMessage args)
+    {
+        if (ent.Comp.Pulling == null) return;
+
+        if (!TryComp(ent.Comp.Pulling.Value, out PullableComponent? pulling))
+            return;
+
+        TryStopPull(ent.Comp.Pulling.Value, pulling, ent.Owner);
+    }
+
+    private void OnPullableContainerInsert(Entity<PullableComponent> ent, ref EntGotInsertedIntoContainerMessage args)
+    {
+        TryStopPull(ent.Owner, ent.Comp);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        CommandBinds.Unregister<PullingSystem>();
+    }
+
+    private void OnPullerUnpaused(EntityUid uid, PullerComponent component, ref EntityUnpausedEvent args)
+    {
+        component.NextThrow += args.PausedTime;
+    }
+
+    private void OnVirtualItemDeleted(EntityUid uid, PullerComponent component, VirtualItemDeletedEvent args)
+    {
+        // If client deletes the virtual hand then stop the pull.
+        if (component.Pulling == null)
+            return;
+
+        if (component.Pulling != args.BlockingEntity)
+            return;
+
+        if (EntityManager.TryGetComponent(args.BlockingEntity, out PullableComponent? comp))
+        {
+            TryStopPull(args.BlockingEntity, comp, uid);
+        }
+    }
+
+    private void AddPullVerbs(EntityUid uid, PullableComponent component, GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract)
+            return;
+
+        // Are they trying to pull themselves up by their bootstraps?
+        if (args.User == args.Target)
+            return;
+
+        //TODO VERB ICONS add pulling icon
+        if (component.Puller == args.User)
+        {
+            Verb verb = new()
+            {
+                Text = Loc.GetString("pulling-verb-get-data-text-stop-pulling"),
+                Act = () => TryStopPull(uid, component, user: args.User),
+                DoContactInteraction = false // pulling handle its own contact interaction.
+            };
+            args.Verbs.Add(verb);
+        }
+        else if (CanPull(args.User, args.Target))
+        {
+            Verb verb = new()
+            {
+                Text = Loc.GetString("pulling-verb-get-data-text"),
+                Act = () => TryStartPull(args.User, args.Target),
+                DoContactInteraction = false // pulling handle its own contact interaction.
+            };
+            args.Verbs.Add(verb);
+        }
+    }
+
+    private void OnRefreshMovespeed(EntityUid uid, PullerComponent component, RefreshMovementSpeedModifiersEvent args)
+    {
+        args.ModifySpeed(component.WalkSpeedModifier, component.SprintSpeedModifier);
+    }
+
+    private void OnPullableMoveInput(EntityUid uid, PullableComponent component, ref MoveInputEvent args)
+    {
+        // If someone moves then break their pulling.
+        if (!component.BeingPulled)
+            return;
+
+        var entity = args.Entity;
+
+        if (!_blocker.CanMove(entity))
+            return;
+
+        TryStopPull(uid, component, user: uid);
+    }
+
+    private void OnPullableCollisionChange(EntityUid uid, PullableComponent component, ref CollisionChangeEvent args)
+    {
+        // IDK what this is supposed to be.
+        if (!_timing.ApplyingState && component.PullJointId != null && !args.CanCollide)
+        {
+            _joints.RemoveJoint(uid, component.PullJointId);
+        }
+    }
+
+    private void OnJointRemoved(EntityUid uid, PullableComponent component, JointRemovedEvent args)
+    {
+        // Just handles the joint getting nuked without going through pulling system (valid behavior).
+
+        // Not relevant / pullable state handle it.
+        if (component.Puller != args.OtherEntity ||
+            args.Joint.ID != component.PullJointId ||
+            _timing.ApplyingState)
+        {
+            return;
+        }
+
+        if (args.Joint.ID != component.PullJointId || component.Puller == null)
+            return;
+
+        StopPulling(uid, component);
+    }
+
+    /// <summary>
+    /// Forces pulling to stop and handles cleanup.
+    /// </summary>
+    private void StopPulling(EntityUid pullableUid, PullableComponent pullableComp)
+    {
+        if (!_timing.ApplyingState)
+        {
+            if (TryComp<PhysicsComponent>(pullableUid, out var pullablePhysics))
+            {
+                _physics.SetFixedRotation(pullableUid, pullableComp.PrevFixedRotation, body: pullablePhysics);
+            }
+        }
+
+        var oldPuller = pullableComp.Puller;
+        pullableComp.PullJointId = null;
+        pullableComp.Puller = null;
+        Dirty(pullableUid, pullableComp);
+
+        // No more joints with puller -> force stop pull.
+        if (TryComp<PullerComponent>(oldPuller, out var pullerComp))
+        {
+            var pullerUid = oldPuller.Value;
+            _alertsSystem.ClearAlert(pullerUid, AlertType.Pulling);
+            pullerComp.Pulling = null;
+            Dirty(oldPuller.Value, pullerComp);
+
+            // Messaging
+            var message = new PullStoppedMessage(pullerUid, pullableUid);
+            _modifierSystem.RefreshMovementSpeedModifiers(pullerUid);
+            _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(pullerUid):user} stopped pulling {ToPrettyString(pullableUid):target}");
+
+            RaiseLocalEvent(pullerUid, message);
+            RaiseLocalEvent(pullableUid, message);
+        }
+
+
+        _alertsSystem.ClearAlert(pullableUid, AlertType.Pulled);
+    }
+
+    public bool IsPulled(EntityUid uid, PullableComponent? component = null)
+    {
+        return Resolve(uid, ref component, false) && component.BeingPulled;
+    }
+
+    private bool OnRequestMovePulledObject(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+    {
+        if (session?.AttachedEntity is not { } player ||
+            !player.IsValid())
+        {
+            return false;
+        }
+
+        if (!TryComp<PullerComponent>(player, out var pullerComp))
+            return false;
+
+        var pulled = pullerComp.Pulling;
+
+        if (!HasComp<PullableComponent>(pulled))
+            return false;
+
+        if (_containerSystem.IsEntityInContainer(player))
+            return false;
+
+        // Cooldown buddy
+        if (_timing.CurTime < pullerComp.NextThrow)
+            return false;
+
+        pullerComp.NextThrow = _timing.CurTime + pullerComp.ThrowCooldown;
+
+        // Cap the distance
+        const float range = 2f;
+        var fromUserCoords = coords.WithEntityId(player, EntityManager);
+        var userCoords = new EntityCoordinates(player, Vector2.Zero);
+
+        if (!userCoords.InRange(EntityManager, _xformSys, fromUserCoords, range))
+        {
+            var userDirection = fromUserCoords.Position - userCoords.Position;
+            fromUserCoords = userCoords.Offset(userDirection.Normalized() * range);
+        }
+
+        Dirty(player, pullerComp);
+        _throwing.TryThrow(pulled.Value, fromUserCoords, user: player, strength: 4f, animated: false, recoil: false, playSound: false, doSpin: false);
+        return false;
+    }
+
+    public bool IsPulling(EntityUid puller, PullerComponent? component = null)
+    {
+        return Resolve(puller, ref component, false) && component.Pulling != null;
+    }
+
+    private void OnReleasePulledObject(ICommonSession? session)
+    {
+        if (session?.AttachedEntity is not {Valid: true} player)
+        {
+            return;
+        }
+
+        if (!TryComp(player, out PullerComponent? pullerComp) ||
+            !TryComp(pullerComp.Pulling, out PullableComponent? pullableComp))
+        {
+            return;
+        }
+
+        TryStopPull(pullerComp.Pulling.Value, pullableComp, user: player);
+    }
+
+    public bool CanPull(EntityUid puller, EntityUid pullableUid, PullerComponent? pullerComp = null)
+    {
+        if (!Resolve(puller, ref pullerComp, false))
+        {
+            return false;
+        }
+
+        if (pullerComp.NeedsHands
+            && !_handsSystem.TryGetEmptyHand(puller, out _)
+            && pullerComp.Pulling == null)
+        {
+            return false;
+        }
+
+        if (!_blocker.CanInteract(puller, pullableUid))
+        {
+            return false;
+        }
+
+        if (!EntityManager.TryGetComponent<PhysicsComponent>(pullableUid, out var physics))
+        {
+            return false;
+        }
+
+        if (physics.BodyType == BodyType.Static)
+        {
+            return false;
+        }
+
+        if (puller == pullableUid)
+        {
+            return false;
+        }
+
+        if (!_containerSystem.IsInSameOrNoContainer(puller, pullableUid))
+        {
+            return false;
+        }
+
+        if (EntityManager.TryGetComponent(puller, out BuckleComponent? buckle))
+        {
+            // Prevent people pulling the chair they're on, etc.
+            if (buckle is { PullStrap: false, Buckled: true } && (buckle.LastEntityBuckledTo == pullableUid))
+            {
+                return false;
+            }
+        }
+
+        var getPulled = new BeingPulledAttemptEvent(puller, pullableUid);
+        RaiseLocalEvent(pullableUid, getPulled, true);
+        var startPull = new StartPullAttemptEvent(puller, pullableUid);
+        RaiseLocalEvent(puller, startPull, true);
+        return !startPull.Cancelled && !getPulled.Cancelled;
+    }
+
+    public bool TogglePull(EntityUid pullableUid, EntityUid pullerUid, PullableComponent pullable)
+    {
+        if (pullable.Puller == pullerUid)
+        {
+            return TryStopPull(pullableUid, pullable);
+        }
+
+        return TryStartPull(pullerUid, pullableUid, pullableComp: pullable);
+    }
+
+    public bool TogglePull(EntityUid pullerUid, PullerComponent puller)
+    {
+        if (!TryComp<PullableComponent>(puller.Pulling, out var pullable))
+            return false;
+
+        return TogglePull(puller.Pulling.Value, pullerUid, pullable);
+    }
+
+    public bool TryStartPull(EntityUid pullerUid, EntityUid pullableUid,
+        PullerComponent? pullerComp = null, PullableComponent? pullableComp = null)
+    {
+        if (!Resolve(pullerUid, ref pullerComp, false) ||
+            !Resolve(pullableUid, ref pullableComp, false))
+        {
+            return false;
+        }
+
+        if (pullerComp.Pulling == pullableUid)
+            return true;
+
+        if (!CanPull(pullerUid, pullableUid))
+            return false;
+
+        if (!EntityManager.TryGetComponent<PhysicsComponent>(pullerUid, out var pullerPhysics) ||
+            !EntityManager.TryGetComponent<PhysicsComponent>(pullableUid, out var pullablePhysics))
+        {
+            return false;
+        }
+
+        // Ensure that the puller is not currently pulling anything.
+        if (TryComp<PullableComponent>(pullerComp.Pulling, out var oldPullable)
+            && !TryStopPull(pullerComp.Pulling.Value, oldPullable, pullerUid))
+            return false;
+
+        // Stop anyone else pulling the entity we want to pull
+        if (pullableComp.Puller != null)
+        {
+            // We're already pulling this item
+            if (pullableComp.Puller == pullerUid)
+                return false;
+
+            if (!TryStopPull(pullableUid, pullableComp, pullableComp.Puller))
+                return false;
+        }
+
+        var pullAttempt = new PullAttemptEvent(pullerUid, pullableUid);
+        RaiseLocalEvent(pullerUid, pullAttempt);
+
+        if (pullAttempt.Cancelled)
+            return false;
+
+        RaiseLocalEvent(pullableUid, pullAttempt);
+
+        if (pullAttempt.Cancelled)
+            return false;
+
+        // Pulling confirmed
+
+        _interaction.DoContactInteraction(pullableUid, pullerUid);
+
+        // Use net entity so it's consistent across client and server.
+        pullableComp.PullJointId = $"pull-joint-{GetNetEntity(pullableUid)}";
+
+        pullerComp.Pulling = pullableUid;
+        pullableComp.Puller = pullerUid;
+
+        // joint state handling will manage its own state
+        if (!_timing.ApplyingState)
+        {
+            // Joint startup
+            var union = _physics.GetHardAABB(pullerUid).Union(_physics.GetHardAABB(pullableUid, body: pullablePhysics));
+            var length = Math.Max((float) union.Size.X, (float) union.Size.Y) * 0.75f;
+
+            var joint = _joints.CreateDistanceJoint(pullableUid, pullerUid, id: pullableComp.PullJointId);
+            joint.CollideConnected = false;
+            // This maximum has to be there because if the object is constrained too closely, the clamping goes backwards and asserts.
+            joint.MaxLength = Math.Max(1.0f, length);
+            joint.Length = length * 0.75f;
+            joint.MinLength = 0f;
+            joint.Stiffness = 1f;
+
+            _physics.SetFixedRotation(pullableUid, pullableComp.FixedRotationOnPull, body: pullablePhysics);
+        }
+
+        pullableComp.PrevFixedRotation = pullablePhysics.FixedRotation;
+
+        // Messaging
+        var message = new PullStartedMessage(pullerUid, pullableUid);
+        _alertsSystem.ShowAlert(pullerUid, AlertType.Pulling);
+        _alertsSystem.ShowAlert(pullableUid, AlertType.Pulled);
+
+        RaiseLocalEvent(pullerUid, message);
+        RaiseLocalEvent(pullableUid, message);
+
+        Dirty(pullerUid, pullerComp);
+        Dirty(pullableUid, pullableComp);
+
+        _adminLogger.Add(LogType.Action, LogImpact.Low,
+            $"{ToPrettyString(pullerUid):user} started pulling {ToPrettyString(pullableUid):target}");
+        return true;
+    }
+
+    public bool TryStopPull(EntityUid pullableUid, PullableComponent pullable, EntityUid? user = null)
+    {
+        var pullerUidNull = pullable.Puller;
+
+        if (pullerUidNull == null)
+            return true;
+
+        var msg = new AttemptStopPullingEvent(user);
+        RaiseLocalEvent(pullableUid, msg, true);
+
+        if (msg.Cancelled)
+            return false;
+
+        // Stop pulling confirmed!
+        if (!_timing.ApplyingState)
+        {
+            // Joint shutdown
+            if (pullable.PullJointId != null)
+            {
+                _joints.RemoveJoint(pullableUid, pullable.PullJointId);
+                pullable.PullJointId = null;
+            }
+        }
+
+        StopPulling(pullableUid, pullable);
+        return true;
+    }
+}
diff --git a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
index 207f14a258a..6dc7fdfd899 100644
--- a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
@@ -1,9 +1,11 @@
 using System.Numerics;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Managers;
+using Content.Shared.CCVar;
 using Content.Shared.Ghost;
 using Content.Shared.Input;
 using Content.Shared.Movement.Components;
+using Robust.Shared.Configuration;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization;
@@ -16,10 +18,13 @@ namespace Content.Shared.Movement.Systems;
 public abstract class SharedContentEyeSystem : EntitySystem
 {
     [Dependency] private readonly ISharedAdminManager _admin = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
 
-    public const float ZoomMod = 1.5f;
-    public static readonly Vector2 DefaultZoom = Vector2.One;
-    public static readonly Vector2 MinZoom = DefaultZoom * (float)Math.Pow(ZoomMod, -3);
+    // Will be overridden according to config.
+    public readonly Vector2 DefaultZoom = Vector2.One;
+    public float ZoomMod { get; private set; } = 1f;
+    public int ZoomLevels { get; private set; } = 1;
+    public Vector2 MinZoom { get; private set; } = Vector2.One;
 
     [Dependency] private readonly SharedEyeSystem _eye = default!;
 
@@ -38,6 +43,17 @@ public override void Initialize()
 
         Log.Level = LogLevel.Info;
         UpdatesOutsidePrediction = true;
+
+        Subs.CVar(_config, CCVars.ZoomLevelStep, value =>
+        {
+            ZoomMod = value;
+            RecalculateZoomLevels();
+        }, true);
+        Subs.CVar(_config, CCVars.ZoomLevels, value =>
+        {
+            ZoomLevels = value;
+            RecalculateZoomLevels();
+        }, true);
     }
 
     public override void Shutdown()
@@ -46,6 +62,11 @@ public override void Shutdown()
         CommandBinds.Unregister<SharedContentEyeSystem>();
     }
 
+    private void RecalculateZoomLevels()
+    {
+        MinZoom = DefaultZoom * (float) Math.Pow(ZoomMod, -ZoomLevels);
+    }
+
     private void ResetZoom(ICommonSession? session)
     {
         if (TryComp(session?.AttachedEntity, out ContentEyeComponent? eye))
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index bce3aeff527..891bd518b1c 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.CCVar;
 using Content.Shared.Follower.Components;
 using Content.Shared.Input;
@@ -333,6 +334,7 @@ private void OnInputInit(EntityUid uid, InputMoverComponent component, Component
 
             component.RelativeEntity = xform.GridUid ?? xform.MapUid;
             component.TargetRelativeRotation = Angle.Zero;
+            WalkingAlert(uid, !component.Sprinting);
         }
 
         private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
@@ -344,6 +346,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)
                 {
+                    WalkingAlert(uid, walking);
                     SetMoveInput(moverComp, MoveButtons.None);
                 }
 
@@ -460,10 +463,11 @@ private void ResetSubtick(InputMoverComponent component)
             component.LastInputSubTick = 0;
         }
 
+
         public void SetSprinting(EntityUid entity, InputMoverComponent component, ushort subTick, bool walking)
         {
             // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}");
-
+            WalkingAlert(entity, walking);
             SetMoveInput(entity, component, subTick, walking, MoveButtons.Walk);
         }
 
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 4d9eedbf7c4..4c2c91db6a1 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.CCVar;
 using Content.Shared.Friction;
@@ -9,7 +10,7 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
-using Content.Shared.Pulling.Components;
+using Content.Shared.StepTrigger.Components;
 using Content.Shared.Tag;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -23,7 +24,8 @@
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Shared.StepTrigger.Components; // Delta V-NoShoesSilentFootstepsComponent
+using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent;
+
 
 namespace Content.Shared.Movement.Systems
 {
@@ -33,6 +35,7 @@ namespace Content.Shared.Movement.Systems
     /// </summary>
     public abstract partial class SharedMoverController : VirtualController
     {
+        [Dependency] private   readonly AlertsSystem _alerts = default!;
         [Dependency] private   readonly IConfigurationManager _configManager = default!;
         [Dependency] protected readonly IGameTiming Timing = default!;
         [Dependency] private   readonly IMapManager _mapManager = default!;
@@ -55,7 +58,7 @@ public abstract partial class SharedMoverController : VirtualController
         protected EntityQuery<MovementSpeedModifierComponent> ModifierQuery;
         protected EntityQuery<PhysicsComponent> PhysicsQuery;
         protected EntityQuery<RelayInputMoverComponent> RelayQuery;
-        protected EntityQuery<SharedPullableComponent> PullableQuery;
+        protected EntityQuery<PullableComponent> PullableQuery;
         protected EntityQuery<TransformComponent> XformQuery;
         protected EntityQuery<CanMoveInAirComponent> CanMoveInAirQuery;
         protected EntityQuery<NoRotateOnMoveComponent> NoRotateQuery;
@@ -87,7 +90,7 @@ public override void Initialize()
             RelayTargetQuery = GetEntityQuery<MovementRelayTargetComponent>();
             PhysicsQuery = GetEntityQuery<PhysicsComponent>();
             RelayQuery = GetEntityQuery<RelayInputMoverComponent>();
-            PullableQuery = GetEntityQuery<SharedPullableComponent>();
+            PullableQuery = GetEntityQuery<PullableComponent>();
             XformQuery = GetEntityQuery<TransformComponent>();
             NoRotateQuery = GetEntityQuery<NoRotateOnMoveComponent>();
             CanMoveInAirQuery = GetEntityQuery<CanMoveInAirComponent>();
@@ -165,6 +168,7 @@ protected void HandleMobMovement(
             var (walkDir, sprintDir) = GetVelocityInput(mover);
             var touching = false;
 
+
             // Handle wall-pushes.
             if (weightless)
             {
@@ -285,6 +289,14 @@ protected void HandleMobMovement(
             PhysicsSystem.SetAngularVelocity(physicsUid, 0, body: physicsComponent);
         }
 
+        public void WalkingAlert(EntityUid player, bool walking)
+        {
+            if (HasComp<CanWalkComponent>(player))
+            {
+                _alerts.ShowAlert(player, AlertType.Walking, walking ? (short) 0 : (short) 1);
+            }
+        }
+
         public void LerpRotation(EntityUid uid, InputMoverComponent mover, float frameTime)
         {
             var angleDiff = Angle.ShortestDistance(mover.RelativeRotation, mover.TargetRelativeRotation);
@@ -378,7 +390,7 @@ private bool IsAroundCollider(SharedPhysicsSystem broadPhaseSystem, TransformCom
                     !otherCollider.CanCollide ||
                     ((collider.CollisionMask & otherCollider.CollisionLayer) == 0 &&
                     (otherCollider.CollisionMask & collider.CollisionLayer) == 0) ||
-                    (TryComp(otherCollider.Owner, out SharedPullableComponent? pullable) && pullable.BeingPulled))
+                    (TryComp(otherCollider.Owner, out PullableComponent? pullable) && pullable.BeingPulled))
                 {
                     continue;
                 }
@@ -440,7 +452,7 @@ private bool TryGetSound(
                 sound = moverModifier.FootstepSoundCollection;
                 return true;
             }
-            
+
             // If got the component in yml and no shoes = no sound. Delta V
             if (_entities.TryGetComponent(uid, out NoShoesSilentFootstepsComponent? _) &
                 !_inventory.TryGetSlotEntity(uid, "shoes", out var _))
@@ -469,7 +481,7 @@ private bool TryGetFootstepSound(
             sound = null;
 
             // Fallback to the map?
-            if (!_mapManager.TryGetGrid(xform.GridUid, out var grid))
+            if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
             {
                 if (TryComp<FootstepModifierComponent>(xform.MapUid, out var modifier))
                 {
diff --git a/Content.Shared/Nutrition/Components/OpenableComponent.cs b/Content.Shared/Nutrition/Components/OpenableComponent.cs
index 3a230fc765d..0381888e282 100644
--- a/Content.Shared/Nutrition/Components/OpenableComponent.cs
+++ b/Content.Shared/Nutrition/Components/OpenableComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Shared.Nutrition.Components;
 /// Starts closed, open it with Z or E.
 /// </summary>
 [NetworkedComponent, AutoGenerateComponentState]
-[RegisterComponent, Access(typeof(SharedOpenableSystem))]
+[RegisterComponent, Access(typeof(OpenableSystem))]
 public sealed partial class OpenableComponent : Component
 {
     /// <summary>
diff --git a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
new file mode 100644
index 00000000000..0ad0877d222
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
@@ -0,0 +1,210 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Content.Shared.Weapons.Melee.Events;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+/// <summary>
+/// Provides API for openable food and drinks, handles opening on use and preventing transfer when closed.
+/// </summary>
+public sealed partial class OpenableSystem : EntitySystem
+{
+    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
+    [Dependency] protected readonly SharedAudioSystem Audio = default!;
+    [Dependency] protected readonly SharedPopupSystem Popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<OpenableComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<OpenableComponent, UseInHandEvent>(OnUse);
+        SubscribeLocalEvent<OpenableComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<OpenableComponent, MeleeHitEvent>(HandleIfClosed);
+        SubscribeLocalEvent<OpenableComponent, AfterInteractEvent>(HandleIfClosed);
+        SubscribeLocalEvent<OpenableComponent, GetVerbsEvent<Verb>>(AddOpenCloseVerbs);
+        SubscribeLocalEvent<OpenableComponent, SolutionTransferAttemptEvent>(OnTransferAttempt);
+    }
+
+    private void OnInit(EntityUid uid, OpenableComponent comp, ComponentInit args)
+    {
+        UpdateAppearance(uid, comp);
+    }
+
+    private void OnUse(EntityUid uid, OpenableComponent comp, UseInHandEvent args)
+    {
+        if (args.Handled || !comp.OpenableByHand)
+            return;
+
+        args.Handled = TryOpen(uid, comp, args.User);
+    }
+
+    private void OnExamined(EntityUid uid, OpenableComponent comp, ExaminedEvent args)
+    {
+        if (!comp.Opened || !args.IsInDetailsRange)
+            return;
+
+        var text = Loc.GetString(comp.ExamineText);
+        args.PushMarkup(text);
+    }
+
+    private void HandleIfClosed(EntityUid uid, OpenableComponent comp, HandledEntityEventArgs args)
+    {
+        // prevent spilling/pouring/whatever drinks when closed
+        args.Handled = !comp.Opened;
+    }
+
+    private void AddOpenCloseVerbs(EntityUid uid, OpenableComponent comp, GetVerbsEvent<Verb> args)
+    {
+        if (args.Hands == null || !args.CanAccess || !args.CanInteract)
+            return;
+
+        Verb verb;
+        if (comp.Opened)
+        {
+            if (!comp.Closeable)
+                return;
+
+            verb = new()
+            {
+                Text = Loc.GetString(comp.CloseVerbText),
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/close.svg.192dpi.png")),
+                Act = () => TryClose(args.Target, comp, args.User)
+            };
+        }
+        else
+        {
+            verb = new()
+            {
+                Text = Loc.GetString(comp.OpenVerbText),
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/open.svg.192dpi.png")),
+                Act = () => TryOpen(args.Target, comp, args.User)
+            };
+        }
+        args.Verbs.Add(verb);
+    }
+
+    private void OnTransferAttempt(Entity<OpenableComponent> ent, ref SolutionTransferAttemptEvent args)
+    {
+        if (!ent.Comp.Opened)
+        {
+            // message says its just for drinks, shouldn't matter since you typically dont have a food that is openable and can be poured out
+            args.Cancel(Loc.GetString("drink-component-try-use-drink-not-open", ("owner", ent.Owner)));
+        }
+    }
+
+    /// <summary>
+    /// Returns true if the entity either does not have OpenableComponent or it is opened.
+    /// Drinks that don't have OpenableComponent are automatically open, so it returns true.
+    /// </summary>
+    public bool IsOpen(EntityUid uid, OpenableComponent? comp = null)
+    {
+        if (!Resolve(uid, ref comp, false))
+            return true;
+
+        return comp.Opened;
+    }
+
+    /// <summary>
+    /// Returns true if the entity both has OpenableComponent and is not opened.
+    /// Drinks that don't have OpenableComponent are automatically open, so it returns false.
+    /// If user is not null a popup will be shown to them.
+    /// </summary>
+    public bool IsClosed(EntityUid uid, EntityUid? user = null, OpenableComponent? comp = null)
+    {
+        if (!Resolve(uid, ref comp, false))
+            return false;
+
+        if (comp.Opened)
+            return false;
+
+        if (user != null)
+            Popup.PopupEntity(Loc.GetString(comp.ClosedPopup, ("owner", uid)), user.Value, user.Value);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Update open visuals to the current value.
+    /// </summary>
+    public void UpdateAppearance(EntityUid uid, OpenableComponent? comp = null, AppearanceComponent? appearance = null)
+    {
+        if (!Resolve(uid, ref comp))
+            return;
+
+        Appearance.SetData(uid, OpenableVisuals.Opened, comp.Opened, appearance);
+    }
+
+    /// <summary>
+    /// Sets the opened field and updates open visuals.
+    /// </summary>
+    public void SetOpen(EntityUid uid, bool opened = true, OpenableComponent? comp = null)
+    {
+        if (!Resolve(uid, ref comp, false) || opened == comp.Opened)
+            return;
+
+        comp.Opened = opened;
+        Dirty(uid, comp);
+
+        if (opened)
+        {
+            var ev = new OpenableOpenedEvent();
+            RaiseLocalEvent(uid, ref ev);
+        }
+        else
+        {
+            var ev = new OpenableClosedEvent();
+            RaiseLocalEvent(uid, ref ev);
+        }
+
+        UpdateAppearance(uid, comp);
+    }
+
+    /// <summary>
+    /// If closed, opens it and plays the sound.
+    /// </summary>
+    /// <returns>Whether it got opened</returns>
+    public bool TryOpen(EntityUid uid, OpenableComponent? comp = null, EntityUid? user = null)
+    {
+        if (!Resolve(uid, ref comp, false) || comp.Opened)
+            return false;
+
+        SetOpen(uid, true, comp);
+        Audio.PlayPredicted(comp.Sound, uid, user);
+        return true;
+    }
+
+    /// <summary>
+    /// If opened, closes it and plays the close sound, if one is defined.
+    /// </summary>
+    /// <returns>Whether it got closed</returns>
+    public bool TryClose(EntityUid uid, OpenableComponent? comp = null, EntityUid? user = null)
+    {
+        if (!Resolve(uid, ref comp, false) || !comp.Opened || !comp.Closeable)
+            return false;
+
+        SetOpen(uid, false, comp);
+        if (comp.CloseSound != null)
+            Audio.PlayPredicted(comp.CloseSound, uid, user);
+        return true;
+    }
+}
+
+/// <summary>
+/// Raised after an Openable is opened.
+/// </summary>
+[ByRefEvent]
+public record struct OpenableOpenedEvent;
+
+/// <summary>
+/// Raised after an Openable is closed.
+/// </summary>
+[ByRefEvent]
+public record struct OpenableClosedEvent;
diff --git a/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs b/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs
index b0873f23a12..414b8d182b0 100644
--- a/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs
@@ -11,7 +11,7 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SealableComponent, ExaminedEvent>(OnExamined, after: new[] { typeof(SharedOpenableSystem) });
+        SubscribeLocalEvent<SealableComponent, ExaminedEvent>(OnExamined, after: new[] { typeof(OpenableSystem) });
         SubscribeLocalEvent<SealableComponent, OpenableOpenedEvent>(OnOpened);
     }
 
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs
deleted file mode 100644
index f3b1127578d..00000000000
--- a/Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-using Content.Shared.Examine;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Popups;
-using Content.Shared.Verbs;
-using Content.Shared.Weapons.Melee.Events;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Nutrition.EntitySystems;
-
-/// <summary>
-/// Provides API for openable food and drinks, handles opening on use and preventing transfer when closed.
-/// </summary>
-public abstract partial class SharedOpenableSystem : EntitySystem
-{
-    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
-    [Dependency] protected readonly SharedAudioSystem Audio = default!;
-    [Dependency] protected readonly SharedPopupSystem Popup = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<OpenableComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<OpenableComponent, UseInHandEvent>(OnUse);
-        SubscribeLocalEvent<OpenableComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<OpenableComponent, MeleeHitEvent>(HandleIfClosed);
-        SubscribeLocalEvent<OpenableComponent, AfterInteractEvent>(HandleIfClosed);
-        SubscribeLocalEvent<OpenableComponent, GetVerbsEvent<Verb>>(AddOpenCloseVerbs);
-    }
-
-    private void OnInit(EntityUid uid, OpenableComponent comp, ComponentInit args)
-    {
-        UpdateAppearance(uid, comp);
-    }
-
-    private void OnUse(EntityUid uid, OpenableComponent comp, UseInHandEvent args)
-    {
-        if (args.Handled || !comp.OpenableByHand)
-            return;
-
-        args.Handled = TryOpen(uid, comp, args.User);
-    }
-
-    private void OnExamined(EntityUid uid, OpenableComponent comp, ExaminedEvent args)
-    {
-        if (!comp.Opened || !args.IsInDetailsRange)
-            return;
-
-        var text = Loc.GetString(comp.ExamineText);
-        args.PushMarkup(text);
-    }
-
-    private void HandleIfClosed(EntityUid uid, OpenableComponent comp, HandledEntityEventArgs args)
-    {
-        // prevent spilling/pouring/whatever drinks when closed
-        args.Handled = !comp.Opened;
-    }
-
-    private void AddOpenCloseVerbs(EntityUid uid, OpenableComponent comp, GetVerbsEvent<Verb> args)
-    {
-        if (args.Hands == null || !args.CanAccess || !args.CanInteract)
-            return;
-
-        Verb verb;
-        if (comp.Opened)
-        {
-            if (!comp.Closeable)
-                return;
-
-            verb = new()
-            {
-                Text = Loc.GetString(comp.CloseVerbText),
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/close.svg.192dpi.png")),
-                Act = () => TryClose(args.Target, comp, args.User)
-            };
-        }
-        else
-        {
-            verb = new()
-            {
-                Text = Loc.GetString(comp.OpenVerbText),
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/open.svg.192dpi.png")),
-                Act = () => TryOpen(args.Target, comp, args.User)
-            };
-        }
-        args.Verbs.Add(verb);
-    }
-
-    /// <summary>
-    /// Returns true if the entity either does not have OpenableComponent or it is opened.
-    /// Drinks that don't have OpenableComponent are automatically open, so it returns true.
-    /// </summary>
-    public bool IsOpen(EntityUid uid, OpenableComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp, false))
-            return true;
-
-        return comp.Opened;
-    }
-
-    /// <summary>
-    /// Returns true if the entity both has OpenableComponent and is not opened.
-    /// Drinks that don't have OpenableComponent are automatically open, so it returns false.
-    /// If user is not null a popup will be shown to them.
-    /// </summary>
-    public bool IsClosed(EntityUid uid, EntityUid? user = null, OpenableComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp, false))
-            return false;
-
-        if (comp.Opened)
-            return false;
-
-        if (user != null)
-            Popup.PopupEntity(Loc.GetString(comp.ClosedPopup, ("owner", uid)), user.Value, user.Value);
-
-        return true;
-    }
-
-    /// <summary>
-    /// Update open visuals to the current value.
-    /// </summary>
-    public void UpdateAppearance(EntityUid uid, OpenableComponent? comp = null, AppearanceComponent? appearance = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return;
-
-        Appearance.SetData(uid, OpenableVisuals.Opened, comp.Opened, appearance);
-    }
-
-    /// <summary>
-    /// Sets the opened field and updates open visuals.
-    /// </summary>
-    public void SetOpen(EntityUid uid, bool opened = true, OpenableComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp, false) || opened == comp.Opened)
-            return;
-
-        comp.Opened = opened;
-        Dirty(uid, comp);
-
-        if (opened)
-        {
-            var ev = new OpenableOpenedEvent();
-            RaiseLocalEvent(uid, ref ev);
-        }
-        else
-        {
-            var ev = new OpenableClosedEvent();
-            RaiseLocalEvent(uid, ref ev);
-        }
-
-        UpdateAppearance(uid, comp);
-    }
-
-    /// <summary>
-    /// If closed, opens it and plays the sound.
-    /// </summary>
-    /// <returns>Whether it got opened</returns>
-    public bool TryOpen(EntityUid uid, OpenableComponent? comp = null, EntityUid? user = null)
-    {
-        if (!Resolve(uid, ref comp, false) || comp.Opened)
-            return false;
-
-        SetOpen(uid, true, comp);
-        Audio.PlayPredicted(comp.Sound, uid, user);
-        return true;
-    }
-
-    /// <summary>
-    /// If opened, closes it and plays the close sound, if one is defined.
-    /// </summary>
-    /// <returns>Whether it got closed</returns>
-    public bool TryClose(EntityUid uid, OpenableComponent? comp = null, EntityUid? user = null)
-    {
-        if (!Resolve(uid, ref comp, false) || !comp.Opened || !comp.Closeable)
-            return false;
-
-        SetOpen(uid, false, comp);
-        if (comp.CloseSound != null)
-            Audio.PlayPredicted(comp.CloseSound, uid, user);
-        return true;
-    }
-}
-
-/// <summary>
-/// Raised after an Openable is opened.
-/// </summary>
-[ByRefEvent]
-public record struct OpenableOpenedEvent;
-
-/// <summary>
-/// Raised after an Openable is closed.
-/// </summary>
-[ByRefEvent]
-public record struct OpenableClosedEvent;
diff --git a/Content.Shared/Nutrition/Events.cs b/Content.Shared/Nutrition/Events.cs
index e27603763fa..f2936d603d9 100644
--- a/Content.Shared/Nutrition/Events.cs
+++ b/Content.Shared/Nutrition/Events.cs
@@ -53,3 +53,9 @@ public VapeDoAfterEvent(Solution solution, bool forced)
 
     public override DoAfterEvent Clone() => this;
 }
+
+/// <summary>
+/// Raised before food is sliced
+/// </summary>
+[ByRefEvent]
+public record struct SliceFoodEvent();
diff --git a/Content.Shared/Nyanotrasen/Actions/FabricateCandyEvent.cs b/Content.Shared/Nyanotrasen/Actions/FabricateCandyEvent.cs
deleted file mode 100644
index 3c9371d27eb..00000000000
--- a/Content.Shared/Nyanotrasen/Actions/FabricateCandyEvent.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Shared.Actions.Events;
-
-public sealed partial class FabricateLollipopActionEvent : InstantActionEvent {}
-public sealed partial class FabricateGumballActionEvent : InstantActionEvent {}
diff --git a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
index 2e1bdc43831..07032a00ce9 100644
--- a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
+++ b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Mind;
 using Content.Shared.Objectives;
 using Content.Shared.Objectives.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Objectives.Systems;
@@ -11,6 +12,7 @@ namespace Content.Shared.Objectives.Systems;
 public abstract class SharedObjectivesSystem : EntitySystem
 {
     [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
 
     private EntityQuery<MetaDataComponent> _metaQuery;
 
@@ -55,6 +57,9 @@ public bool CanBeAssigned(EntityUid uid, EntityUid mindId, MindComponent mind, O
     /// </summary>
     public EntityUid? TryCreateObjective(EntityUid mindId, MindComponent mind, string proto)
     {
+        if (!_protoMan.HasIndex<EntityPrototype>(proto))
+            return null;
+
         var uid = Spawn(proto);
         if (!TryComp<ObjectiveComponent>(uid, out var comp))
         {
diff --git a/Content.Shared/OfferItem/OfferItemComponent.cs b/Content.Shared/OfferItem/OfferItemComponent.cs
new file mode 100644
index 00000000000..eb4d84932e5
--- /dev/null
+++ b/Content.Shared/OfferItem/OfferItemComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.OfferItem;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+[Access(typeof(SharedOfferItemSystem))]
+public sealed partial class OfferItemComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public bool IsInOfferMode;
+
+    [DataField, AutoNetworkedField]
+    public bool IsInReceiveMode;
+
+    [DataField, AutoNetworkedField]
+    public string? Hand;
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? Item;
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? Target;
+
+    [DataField]
+    public float MaxOfferDistance = 2f;
+}
diff --git a/Content.Shared/OfferItem/SharedOfferItemSystem.Interactions.cs b/Content.Shared/OfferItem/SharedOfferItemSystem.Interactions.cs
new file mode 100644
index 00000000000..230f59a380c
--- /dev/null
+++ b/Content.Shared/OfferItem/SharedOfferItemSystem.Interactions.cs
@@ -0,0 +1,74 @@
+using Content.Shared.Popups;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Input;
+using Content.Shared.Hands.Components;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Player;
+
+namespace Content.Shared.OfferItem;
+
+public abstract partial class SharedOfferItemSystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    private void InitializeInteractions()
+    {
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.OfferItem, InputCmdHandler.FromDelegate(SetInOfferMode, handle: false, outsidePrediction: false))
+            .Register<SharedOfferItemSystem>();
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        CommandBinds.Unregister<SharedOfferItemSystem>();
+    }
+
+    private void SetInOfferMode(ICommonSession? session)
+    {
+        if (session is not { } playerSession)
+            return;
+
+        if ((playerSession.AttachedEntity is not { Valid: true } uid || !Exists(uid)) ||
+            !_actionBlocker.CanInteract(uid, null))
+            return;
+
+        if (!TryComp<OfferItemComponent>(uid, out var offerItem))
+            return;
+
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
+            return;
+
+        offerItem.Item = hands.ActiveHand.HeldEntity;
+
+        if (offerItem.IsInOfferMode == false)
+        {
+            if (offerItem.Item == null)
+            {
+                _popup.PopupEntity(Loc.GetString("offer-item-empty-hand"), uid, uid);
+                return;
+            }
+
+            if (offerItem.Hand == null || offerItem.Target == null)
+            {
+                offerItem.IsInOfferMode = true;
+                offerItem.Hand = hands.ActiveHand.Name;
+
+                Dirty(uid, offerItem);
+                return;
+            }
+        }
+
+        if (offerItem.Target != null)
+        {
+            UnReceive(offerItem.Target.Value, offerItem: offerItem);
+            offerItem.IsInOfferMode = false;
+            Dirty(uid, offerItem);
+            return;
+        }
+
+        UnOffer(uid, offerItem);
+    }
+}
diff --git a/Content.Shared/OfferItem/SharedOfferItemSystem.cs b/Content.Shared/OfferItem/SharedOfferItemSystem.cs
new file mode 100644
index 00000000000..ffea2a67c0e
--- /dev/null
+++ b/Content.Shared/OfferItem/SharedOfferItemSystem.cs
@@ -0,0 +1,157 @@
+using Content.Shared.Interaction;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Hands.Components;
+
+namespace Content.Shared.OfferItem;
+
+public abstract partial class SharedOfferItemSystem : EntitySystem
+{
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<OfferItemComponent, InteractUsingEvent>(SetInReceiveMode);
+        SubscribeLocalEvent<OfferItemComponent, MoveEvent>(OnMove);
+
+        InitializeInteractions();
+    }
+
+    private void SetInReceiveMode(EntityUid uid, OfferItemComponent component, InteractUsingEvent args)
+    {
+        if (!TryComp<OfferItemComponent>(args.User, out var offerItem))
+            return;
+
+        if (args.User == uid || component.IsInReceiveMode || !offerItem.IsInOfferMode ||
+            (offerItem.IsInReceiveMode && offerItem.Target != uid))
+            return;
+
+        component.IsInReceiveMode = true;
+        component.Target = args.User;
+
+        Dirty(uid, component);
+
+        offerItem.Target = uid;
+        offerItem.IsInOfferMode = false;
+
+        Dirty(args.User, offerItem);
+
+        if (offerItem.Item == null)
+            return;
+
+        _popup.PopupEntity(Loc.GetString("offer-item-try-give",
+            ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+            ("target", Identity.Entity(uid, EntityManager))), component.Target.Value, component.Target.Value);
+        _popup.PopupEntity(Loc.GetString("offer-item-try-give-target",
+            ("user", Identity.Entity(component.Target.Value, EntityManager)),
+            ("item", Identity.Entity(offerItem.Item.Value, EntityManager))), component.Target.Value, uid);
+
+        args.Handled = true;
+    }
+
+    private void OnMove(EntityUid uid, OfferItemComponent component, MoveEvent args)
+    {
+        if (component.Target == null ||
+            args.NewPosition.InRange(EntityManager, _transform,
+                Transform(component.Target.Value).Coordinates, component.MaxOfferDistance))
+            return;
+
+        UnOffer(uid, component);
+    }
+
+    /// <summary>
+    /// Resets the <see cref="OfferItemComponent"/> of the user and the target
+    /// </summary>
+    protected void UnOffer(EntityUid uid, OfferItemComponent component)
+    {
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
+            return;
+
+
+        if (TryComp<OfferItemComponent>(component.Target, out var offerItem) && component.Target != null)
+        {
+
+            if (component.Item != null)
+            {
+                _popup.PopupEntity(Loc.GetString("offer-item-no-give",
+                    ("item", Identity.Entity(component.Item.Value, EntityManager)),
+                    ("target", Identity.Entity(component.Target.Value, EntityManager))), uid, uid);
+                _popup.PopupEntity(Loc.GetString("offer-item-no-give-target",
+                    ("user", Identity.Entity(uid, EntityManager)),
+                    ("item", Identity.Entity(component.Item.Value, EntityManager))), uid, component.Target.Value);
+            }
+
+            else if (offerItem.Item != null)
+            {
+                _popup.PopupEntity(Loc.GetString("offer-item-no-give",
+                    ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                    ("target", Identity.Entity(uid, EntityManager))), component.Target.Value, component.Target.Value);
+                _popup.PopupEntity(Loc.GetString("offer-item-no-give-target",
+                    ("user", Identity.Entity(component.Target.Value, EntityManager)),
+                    ("item", Identity.Entity(offerItem.Item.Value, EntityManager))), component.Target.Value, uid);
+            }
+
+            offerItem.IsInOfferMode = false;
+            offerItem.IsInReceiveMode = false;
+            offerItem.Hand = null;
+            offerItem.Target = null;
+            offerItem.Item = null;
+
+            Dirty(component.Target.Value, offerItem);
+        }
+
+        component.IsInOfferMode = false;
+        component.IsInReceiveMode = false;
+        component.Hand = null;
+        component.Target = null;
+        component.Item = null;
+
+        Dirty(uid, component);
+    }
+
+
+    /// <summary>
+    /// Cancels the transfer of the item
+    /// </summary>
+    protected void UnReceive(EntityUid uid, OfferItemComponent? component = null, OfferItemComponent? offerItem = null)
+    {
+        if (component == null && !TryComp(uid, out component))
+            return;
+
+        if (offerItem == null && !TryComp(component.Target, out offerItem))
+            return;
+
+        if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null ||
+            component.Target == null)
+            return;
+
+        if (offerItem.Item != null)
+        {
+            _popup.PopupEntity(Loc.GetString("offer-item-no-give",
+                ("item", Identity.Entity(offerItem.Item.Value, EntityManager)),
+                ("target", Identity.Entity(uid, EntityManager))), component.Target.Value, component.Target.Value);
+            _popup.PopupEntity(Loc.GetString("offer-item-no-give-target",
+                ("user", Identity.Entity(component.Target.Value, EntityManager)),
+                ("item", Identity.Entity(offerItem.Item.Value, EntityManager))), component.Target.Value, uid);
+        }
+
+        if (!offerItem.IsInReceiveMode)
+        {
+            offerItem.Target = null;
+            component.Target = null;
+        }
+
+        offerItem.Item = null;
+        offerItem.Hand = null;
+        component.IsInReceiveMode = false;
+
+        Dirty(uid, component);
+    }
+
+    /// <summary>
+    /// Returns true if <see cref="OfferItemComponent.IsInOfferMode"/> = true
+    /// </summary>
+    protected bool IsInOfferMode(EntityUid? entity, OfferItemComponent? component = null)
+    {
+        return entity != null && Resolve(entity.Value, ref component, false) && component.IsInOfferMode;
+    }
+}
diff --git a/Content.Shared/Paint/PaintComponent.cs b/Content.Shared/Paint/PaintComponent.cs
deleted file mode 100644
index ad09f4ca730..00000000000
--- a/Content.Shared/Paint/PaintComponent.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Audio;
-using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Paint;
-
-/// <summary>
-/// Entity when used on another entity will paint target entity.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(SharedPaintSystem))]
-public sealed partial class PaintComponent : Component
-{
-    /// <summary>
-    /// Noise made when paint applied.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier Spray = new SoundPathSpecifier("/Audio/Effects/spray2.ogg");
-
-    /// <summary>
-    /// Solution on the entity that contains the paint.
-    /// </summary>
-    [DataField]
-    public string Solution = "drink";
-
-    /// <summary>
-    /// How long the doafter will take.
-    /// </summary>
-    [DataField]
-    public int Delay = 2;
-
-    /// <summary>
-    /// Reagent that will be used as paint.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public ProtoId<ReagentPrototype> Reagent = "SpaceGlue";
-
-    /// <summary>
-    /// Color that the painting entity will instruct the painted entity to be.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Color Color = Color.FromHex("#c62121");
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public EntityWhitelist? Blacklist;
-    /// <summary>
-    /// Reagent consumption per use.
-    /// </summary>
-    [DataField]
-    public FixedPoint2 ConsumptionUnit = FixedPoint2.New(5);
-
-    /// <summary>
-    /// Duration per unit
-    /// </summary>
-    [DataField]
-    public TimeSpan DurationPerUnit = TimeSpan.FromSeconds(6);
-}
diff --git a/Content.Shared/Paint/PaintDoAfterEvent.cs b/Content.Shared/Paint/PaintDoAfterEvent.cs
deleted file mode 100644
index 0851f1541b4..00000000000
--- a/Content.Shared/Paint/PaintDoAfterEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Paint;
-
-[Serializable, NetSerializable]
-public sealed partial class PaintDoAfterEvent : SimpleDoAfterEvent
-{
-}
diff --git a/Content.Shared/Paint/PaintRemoverComponent.cs b/Content.Shared/Paint/PaintRemoverComponent.cs
deleted file mode 100644
index 54d0ed7a71b..00000000000
--- a/Content.Shared/Paint/PaintRemoverComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Audio;
-
-namespace Content.Shared.Paint;
-
-/// <summary>
-///  Removes paint from an entity that was painted with spray paint.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-[Access(typeof(PaintRemoverSystem))]
-public sealed partial class PaintRemoverComponent : Component
-{
-    /// <summary>
-    /// Sound when target is cleaned.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Fluids/watersplash.ogg");
-
-    /// <summary>
-    /// DoAfter wait time.
-    /// </summary>
-    [DataField]
-    public float CleanDelay = 2f;
-}
diff --git a/Content.Shared/Paint/PaintRemoverDoAfterEvent.cs b/Content.Shared/Paint/PaintRemoverDoAfterEvent.cs
deleted file mode 100644
index 940b1aa513c..00000000000
--- a/Content.Shared/Paint/PaintRemoverDoAfterEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Paint;
-
-[Serializable, NetSerializable]
-public sealed partial class PaintRemoverDoAfterEvent : SimpleDoAfterEvent
-{
-}
diff --git a/Content.Shared/Paint/PaintRemoverSystem.cs b/Content.Shared/Paint/PaintRemoverSystem.cs
deleted file mode 100644
index ac1cc624cfe..00000000000
--- a/Content.Shared/Paint/PaintRemoverSystem.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using Content.Shared.Popups;
-using Content.Shared.Interaction;
-using Content.Shared.DoAfter;
-using Content.Shared.Verbs;
-using Content.Shared.Sprite;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Paint;
-
-/// <summary>
-/// Removes paint from an entity.
-/// </summary>
-public sealed class PaintRemoverSystem : SharedPaintSystem
-{
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PaintRemoverComponent, AfterInteractEvent>(OnInteract);
-        SubscribeLocalEvent<PaintRemoverComponent, PaintRemoverDoAfterEvent>(OnDoAfter);
-        SubscribeLocalEvent<PaintRemoverComponent, GetVerbsEvent<UtilityVerb>>(OnPaintRemoveVerb);
-    }
-
-    // When entity is painted, remove paint from that entity.
-    private void OnInteract(EntityUid uid, PaintRemoverComponent component, AfterInteractEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        if (!args.CanReach || args.Target is not { Valid: true } target || !HasComp<PaintedComponent>(target))
-            return;
-
-        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.CleanDelay, new PaintRemoverDoAfterEvent(), uid, args.Target, uid)
-        {
-            BreakOnUserMove = true,
-            BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            MovementThreshold = 1.0f,
-        });
-        args.Handled = true;
-    }
-
-    private void OnDoAfter(EntityUid uid, PaintRemoverComponent component, DoAfterEvent args)
-    {
-        if (args.Cancelled || args.Handled || args.Args.Target == null)
-            return;
-
-        if (args.Target is not { Valid: true } target)
-            return;
-
-        if (!TryComp(target, out PaintedComponent? paint))
-            return;
-
-        paint.Enabled = false;
-        _audio.PlayPredicted(component.Sound, target, args.User);
-        _popup.PopupClient(Loc.GetString("paint-removed", ("target", target)), args.User, args.User, PopupType.Medium);
-        _appearanceSystem.SetData(target, PaintVisuals.Painted, false);
-        RemComp<PaintedComponent>(target);
-        Dirty(target, paint);
-
-        args.Handled = true;
-    }
-
-    private void OnPaintRemoveVerb(EntityUid uid, PaintRemoverComponent component, GetVerbsEvent<UtilityVerb> args)
-    {
-        if (!args.CanInteract || !args.CanAccess)
-            return;
-
-        var paintremovalText = Loc.GetString("paint-remove-verb");
-
-        var verb = new UtilityVerb()
-        {
-            Act = () => {
-
-                _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.CleanDelay, new PaintRemoverDoAfterEvent(), uid, args.Target, uid)
-                {
-                    BreakOnUserMove = true,
-                    BreakOnDamage = true,
-                    BreakOnTargetMove = true,
-                    MovementThreshold = 1.0f,
-                });
-            },
-
-            Text = paintremovalText
-        };
-
-        args.Verbs.Add(verb);
-    }
-}
diff --git a/Content.Shared/Paint/PaintedComponent.cs b/Content.Shared/Paint/PaintedComponent.cs
deleted file mode 100644
index a6ee7377e11..00000000000
--- a/Content.Shared/Paint/PaintedComponent.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Paint;
-
-/// <summary>
-/// Component applied to target entity when painted.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class PaintedComponent : Component
-{
-    /// <summary>
-    ///  Color of the paint.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Color Color = Color.FromHex("#2cdbd5");
-
-    /// <summary>
-    ///  Used to remove the color when component removed.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Color BeforeColor;
-
-    /// <summary>
-    /// If paint is enabled.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Enabled;
-
-    /// <summary>
-    /// Name of the shader.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public string ShaderName = "Greyscale";
-}
-
-[Serializable, NetSerializable]
-public enum PaintVisuals : byte
-{
-    Painted,
-}
diff --git a/Content.Shared/Paint/SharedPaintSystem.cs b/Content.Shared/Paint/SharedPaintSystem.cs
deleted file mode 100644
index 10185817b86..00000000000
--- a/Content.Shared/Paint/SharedPaintSystem.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Shared.Paint;
-
-/// <summary>
-/// Colors target and consumes reagent on each color success.
-/// </summary>
-public abstract class SharedPaintSystem : EntitySystem
-{
-    public virtual void UpdateAppearance(EntityUid uid, PaintedComponent? component = null)
-    {
-    }
-}
diff --git a/Content.Shared/Physics/Controllers/SharedConveyorController.cs b/Content.Shared/Physics/Controllers/SharedConveyorController.cs
index ec17df7a24f..c9ec77ba1c9 100644
--- a/Content.Shared/Physics/Controllers/SharedConveyorController.cs
+++ b/Content.Shared/Physics/Controllers/SharedConveyorController.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Gravity;
 using Content.Shared.Movement.Systems;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Controllers;
@@ -146,7 +147,7 @@ private static Vector2 Convey(Vector2 direction, float speed, float frameTime, V
         EntityQuery<PhysicsComponent> bodyQuery)
     {
         // Check if the thing's centre overlaps the grid tile.
-        var grid = MapManager.GetGrid(xform.GridUid!.Value);
+        var grid = Comp<MapGridComponent>(xform.GridUid!.Value);
         var tile = grid.GetTileRef(xform.Coordinates);
         var conveyorBounds = Lookup.GetLocalBounds(tile, grid.TileSize);
 
diff --git a/Content.Shared/Pinpointer/NavMapBeaconComponent.cs b/Content.Shared/Pinpointer/NavMapBeaconComponent.cs
index c3132ee37f3..0a86bdd9d2e 100644
--- a/Content.Shared/Pinpointer/NavMapBeaconComponent.cs
+++ b/Content.Shared/Pinpointer/NavMapBeaconComponent.cs
@@ -16,6 +16,13 @@ public sealed partial class NavMapBeaconComponent : Component
     [AutoNetworkedField]
     public string? Text;
 
+    /// <summary>
+    /// A localization string that populates <see cref="Text"/> if it is null at mapinit.
+    /// Used so that mappers can still override Text while mapping.
+    /// </summary>
+    [DataField]
+    public LocId? DefaultText;
+
     [ViewVariables(VVAccess.ReadWrite), DataField]
     [AutoNetworkedField]
     public Color Color = Color.Orange;
diff --git a/Content.Shared/Pinpointer/SharedNavMapSystem.cs b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
index 7a62e6aabed..17f86ac7e68 100644
--- a/Content.Shared/Pinpointer/SharedNavMapSystem.cs
+++ b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
@@ -8,13 +8,6 @@ public abstract class SharedNavMapSystem : EntitySystem
 {
     public const byte ChunkSize = 4;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<NavMapBeaconComponent, MapInitEvent>(OnNavMapBeaconMapInit);
-    }
-
     /// <summary>
     /// Converts the chunk's tile into a bitflag for the slot.
     /// </summary>
@@ -38,13 +31,6 @@ public static Vector2i GetTile(int flag)
         return new Vector2i(x, y);
     }
 
-    private void OnNavMapBeaconMapInit(EntityUid uid, NavMapBeaconComponent component, MapInitEvent args)
-    {
-        component.Text ??= string.Empty;
-        component.Text = Loc.GetString(component.Text);
-        Dirty(uid, component);
-    }
-
     [Serializable, NetSerializable]
     protected sealed class NavMapComponentState : ComponentState
     {
diff --git a/Content.Server/Plants/Components/PottedPlantHideComponent.cs b/Content.Shared/Plants/PottedPlantHideComponent.cs
similarity index 80%
rename from Content.Server/Plants/Components/PottedPlantHideComponent.cs
rename to Content.Shared/Plants/PottedPlantHideComponent.cs
index bc35bbe44f9..2e02272494f 100644
--- a/Content.Server/Plants/Components/PottedPlantHideComponent.cs
+++ b/Content.Shared/Plants/PottedPlantHideComponent.cs
@@ -1,8 +1,7 @@
-using Content.Server.Plants.Systems;
-using Content.Server.Storage.Components;
+using Content.Shared.Storage.Components;
 using Robust.Shared.Audio;
 
-namespace Content.Server.Plants.Components
+namespace Content.Shared.Plants
 {
     /// <summary>
     ///     Interaction wrapper for <see cref="SecretStashComponent"/>.
diff --git a/Content.Server/Plants/Systems/PottedPlantHideSystem.cs b/Content.Shared/Plants/PottedPlantHideSystem.cs
similarity index 75%
rename from Content.Server/Plants/Systems/PottedPlantHideSystem.cs
rename to Content.Shared/Plants/PottedPlantHideSystem.cs
index 09571c60a13..cbe052f8d5c 100644
--- a/Content.Server/Plants/Systems/PottedPlantHideSystem.cs
+++ b/Content.Shared/Plants/PottedPlantHideSystem.cs
@@ -1,18 +1,15 @@
-using Content.Server.Plants.Components;
-using Content.Server.Popups;
-using Content.Server.Storage.Components;
-using Content.Server.Storage.EntitySystems;
-using Content.Shared.Audio;
+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;
-using Robust.Shared.Player;
 
-namespace Content.Server.Plants.Systems
+namespace Content.Shared.Plants
 {
     public sealed class PottedPlantHideSystem : EntitySystem
     {
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
+        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly SecretStashSystem _stashSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
 
@@ -34,7 +31,7 @@ private void OnInteractUsing(EntityUid uid, PottedPlantHideComponent component,
             if (args.Handled)
                 return;
 
-            Rustle(uid, component);
+            Rustle(uid, component, args.User);
             args.Handled = _stashSystem.TryHideItem(uid, args.User, args.Used);
         }
 
@@ -43,24 +40,24 @@ private void OnInteractHand(EntityUid uid, PottedPlantHideComponent component, I
             if (args.Handled)
                 return;
 
-            Rustle(uid, component);
+            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.PopupEntity(msg, uid, args.User);
+                _popupSystem.PopupClient(msg, uid, args.User);
             }
 
             args.Handled = gotItem;
         }
 
-        private void Rustle(EntityUid uid, PottedPlantHideComponent? component = null)
+        private void Rustle(EntityUid uid, PottedPlantHideComponent? component = null, EntityUid? user = null)
         {
             if (!Resolve(uid, ref component))
                 return;
 
-            _audio.PlayPvs(component.RustleSound, uid, AudioParams.Default.WithVariation(0.25f));
+            _audio.PlayPredicted(component.RustleSound, uid, user, AudioParams.Default.WithVariation(0.25f));
         }
     }
 }
diff --git a/Content.Shared/Players/ContentPlayerData.cs b/Content.Shared/Players/ContentPlayerData.cs
index e2074479871..cc7a7e9780f 100644
--- a/Content.Shared/Players/ContentPlayerData.cs
+++ b/Content.Shared/Players/ContentPlayerData.cs
@@ -1,4 +1,5 @@
-using Content.Shared.GameTicking;
+using Content.Shared.Administration;
+using Content.Shared.GameTicking;
 using Content.Shared.Mind;
 using Robust.Shared.Network;
 
@@ -38,7 +39,12 @@ public sealed class ContentPlayerData
     public bool ExplicitlyDeadminned { get; set; }
 
     /// <summary>
-    ///     Nyanotrasen - Are they whitelisted? Lets us avoid async.
+    /// If true, the admin will not show up in adminwho except to admins with the <see cref="AdminFlags.Stealth"/> flag.
+    /// </summary>
+    public bool Stealthed { get; set; }
+
+    /// <summary>
+    /// Nyanotrasen - Are they whitelisted? Lets us avoid async.
     /// </summary>
     [ViewVariables]
     public bool Whitelisted { get; set; }
diff --git a/Content.Shared/Players/PlayTimeTracking/ISharedPlaytimeManager.cs b/Content.Shared/Players/PlayTimeTracking/ISharedPlaytimeManager.cs
new file mode 100644
index 00000000000..03fd040d0ca
--- /dev/null
+++ b/Content.Shared/Players/PlayTimeTracking/ISharedPlaytimeManager.cs
@@ -0,0 +1,3 @@
+namespace Content.Shared.Players.PlayTimeTracking;
+
+public interface ISharedPlaytimeManager;
diff --git a/Content.Shared/Plunger/Components/PlungerComponent.cs b/Content.Shared/Plunger/Components/PlungerComponent.cs
new file mode 100644
index 00000000000..101121fe4c4
--- /dev/null
+++ b/Content.Shared/Plunger/Components/PlungerComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Plunger.Components
+{
+    /// <summary>
+    /// Allows entity to unblock target entity with PlungerUseComponent.
+    /// </summary>
+    [RegisterComponent, NetworkedComponent,AutoGenerateComponentState]
+    public sealed partial class PlungerComponent : Component
+    {
+        /// <summary>
+        /// Duration of plunger doafter event.
+        /// </summary>
+        [DataField]
+        [AutoNetworkedField]
+        public float PlungeDuration = 2f;
+    }
+}
diff --git a/Content.Shared/Plunger/Components/PlungerUseComponent.cs b/Content.Shared/Plunger/Components/PlungerUseComponent.cs
new file mode 100644
index 00000000000..e886a4ef7ad
--- /dev/null
+++ b/Content.Shared/Plunger/Components/PlungerUseComponent.cs
@@ -0,0 +1,42 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Content.Shared.Random;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Plunger.Components
+{
+    /// <summary>
+    /// Entity can interact with plungers.
+    /// </summary>
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    public sealed partial class PlungerUseComponent : Component
+    {
+        /// <summary>
+        /// If true entity has been plungered.
+        /// </summary>
+        [DataField]
+        [AutoNetworkedField]
+        public bool Plunged;
+
+        /// <summary>
+        /// If true entity can interact with plunger.
+        /// </summary>
+        [DataField]
+        [AutoNetworkedField]
+        public bool NeedsPlunger = false;
+
+        /// <summary>
+        /// A weighted random entity prototype containing the different loot that rummaging can provide.
+        /// </summary>
+        [DataField]
+        [AutoNetworkedField]
+        public ProtoId<WeightedRandomEntityPrototype> PlungerLoot = "PlungerLoot";
+
+
+        /// <summary>
+        /// Sound played on rummage completion.
+        /// </summary>
+        [DataField]
+        public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Fluids/glug.ogg");
+    }
+}
diff --git a/Content.Shared/Plunger/PlungerDoAfterEvent.cs b/Content.Shared/Plunger/PlungerDoAfterEvent.cs
new file mode 100644
index 00000000000..b803f5136f6
--- /dev/null
+++ b/Content.Shared/Plunger/PlungerDoAfterEvent.cs
@@ -0,0 +1,10 @@
+
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Plunger;
+
+[Serializable, NetSerializable]
+public sealed partial class PlungerDoAfterEvent : SimpleDoAfterEvent
+{
+}
diff --git a/Content.Shared/Plunger/Systems/PlungerSystem.cs b/Content.Shared/Plunger/Systems/PlungerSystem.cs
new file mode 100644
index 00000000000..192a0185646
--- /dev/null
+++ b/Content.Shared/Plunger/Systems/PlungerSystem.cs
@@ -0,0 +1,78 @@
+using Content.Shared.DoAfter;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Plunger.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Timing;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Content.Shared.Random;
+
+namespace Content.Shared.Plunger.Systems;
+
+/// <summary>
+/// Plungers can be used to unblock entities with PlungerUseComponent.
+/// </summary>
+public sealed class PlungerSystem : EntitySystem
+{
+    [Dependency] protected readonly IPrototypeManager _proto = default!;
+    [Dependency] protected readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<PlungerComponent, AfterInteractEvent>(OnInteract);
+        SubscribeLocalEvent<PlungerComponent, PlungerDoAfterEvent>(OnDoAfter);
+    }
+
+    private void OnInteract(EntityUid uid, PlungerComponent component, AfterInteractEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (!args.CanReach || args.Target is not { Valid: true } target)
+            return;
+
+        if (!TryComp<PlungerUseComponent>(args.Target, out var plunger))
+            return;
+
+        if (plunger.NeedsPlunger)
+            return;
+
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.PlungeDuration, new PlungerDoAfterEvent(), uid, target, uid)
+        {
+            BreakOnUserMove = true,
+            BreakOnDamage = true,
+            MovementThreshold = 1.0f,
+        });
+        args.Handled = true;
+    }
+
+    private void OnDoAfter(EntityUid uid, PlungerComponent component, DoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || args.Args.Target == null)
+            return;
+
+        if (args.Target is not { Valid: true } target)
+            return;
+
+        if (!TryComp(target, out PlungerUseComponent? plunge))
+            return;
+
+        _popup.PopupClient(Loc.GetString("plunger-unblock", ("target", target)), args.User, args.User, PopupType.Medium);
+        plunge.Plunged = true;
+
+        var spawn = _proto.Index<WeightedRandomEntityPrototype>(plunge.PlungerLoot).Pick(_random);
+
+        _audio.PlayPredicted(plunge.Sound, uid, uid);
+        Spawn(spawn, Transform(target).Coordinates);
+        RemComp<PlungerUseComponent>(target);
+        Dirty(target, plunge);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Polymorph/PolymorphActions.cs b/Content.Shared/Polymorph/PolymorphActions.cs
index 0f230868f03..13e00f55e2b 100644
--- a/Content.Shared/Polymorph/PolymorphActions.cs
+++ b/Content.Shared/Polymorph/PolymorphActions.cs
@@ -1,18 +1,20 @@
 using Content.Shared.Actions;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Polymorph;
 
 public sealed partial class PolymorphActionEvent : InstantActionEvent
 {
     /// <summary>
-    /// The polymorph prototype containing all the information about
-    /// the specific polymorph.
+    ///     The polymorph proto id, containing all the information about
+    ///     the specific polymorph.
     /// </summary>
-    public PolymorphPrototype Prototype = default!;
+    [DataField]
+    public ProtoId<PolymorphPrototype>? ProtoId;
 
-    public PolymorphActionEvent(PolymorphPrototype prototype) : this()
+    public PolymorphActionEvent(ProtoId<PolymorphPrototype> protoId) : this()
     {
-        Prototype = prototype;
+        ProtoId = protoId;
     }
 }
 
diff --git a/Content.Shared/Popups/SharedPopupSystem.cs b/Content.Shared/Popups/SharedPopupSystem.cs
index aeb85de2f59..10e8ca9be11 100644
--- a/Content.Shared/Popups/SharedPopupSystem.cs
+++ b/Content.Shared/Popups/SharedPopupSystem.cs
@@ -86,7 +86,7 @@ public abstract class SharedPopupSystem : EntitySystem
         /// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> that only runs on the client, outside of prediction.
         /// Useful for shared code that is always ran by both sides to avoid duplicate popups.
         /// </summary>
-        public abstract void PopupClient(string? message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small);
+        public abstract void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small);
 
         /// <summary>
         /// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> for use with prediction. The local client will show
@@ -94,6 +94,12 @@ public abstract class SharedPopupSystem : EntitySystem
         /// will do nothing and the server will show the message to every player in PVS range.
         /// </summary>
         public abstract void PopupPredicted(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small);
+
+        /// <summary>
+        /// Variant of <see cref="PopupPredicted(string?, EntityUid, EntityUid?, PopupType)"/> that displays <paramref name="recipientMessage"/>
+        /// to the recipient and <paramref name="othersMessage"/> to everyone else in PVS range.
+        /// </summary>
+        public abstract void PopupPredicted(string? recipientMessage, string? othersMessage, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small);
     }
 
     /// <summary>
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 601a62da894..79f8fd10fde 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Traits;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
@@ -442,8 +443,11 @@ public bool MemberwiseEquals(ICharacterProfile maybeOther)
             return Appearance.MemberwiseEquals(other.Appearance);
         }
 
-        public void EnsureValid(IConfigurationManager configManager, IPrototypeManager prototypeManager)
+        public void EnsureValid(ICommonSession session, IDependencyCollection collection)
         {
+            var configManager = collection.Resolve<IConfigurationManager>();
+            var prototypeManager = collection.Resolve<IPrototypeManager>();
+
             if (!prototypeManager.TryIndex<SpeciesPrototype>(Species, out var speciesPrototype) || speciesPrototype.RoundStart == false)
             {
                 Species = SharedHumanoidAppearanceSystem.DefaultSpecies;
@@ -651,10 +655,10 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
             _loadoutPreferences.AddRange(loadouts);
         }
 
-        public ICharacterProfile Validated(IConfigurationManager configManager, IPrototypeManager prototypeManager)
+        public ICharacterProfile Validated(ICommonSession session, IDependencyCollection collection)
         {
             var profile = new HumanoidCharacterProfile(this);
-            profile.EnsureValid(configManager, prototypeManager);
+            profile.EnsureValid(session, collection);
             return profile;
         }
 
diff --git a/Content.Shared/Preferences/ICharacterProfile.cs b/Content.Shared/Preferences/ICharacterProfile.cs
index a9d30639bb3..96664ba0c54 100644
--- a/Content.Shared/Preferences/ICharacterProfile.cs
+++ b/Content.Shared/Preferences/ICharacterProfile.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Humanoid;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
+using Robust.Shared.Player;
 
 namespace Content.Shared.Preferences
 {
@@ -15,11 +14,11 @@ public interface ICharacterProfile
         /// <summary>
         ///     Makes this profile valid so there's no bad data like negative ages.
         /// </summary>
-        void EnsureValid(IConfigurationManager configManager, IPrototypeManager prototypeManager);
+        void EnsureValid(ICommonSession session, IDependencyCollection collection);
 
         /// <summary>
         /// Gets a copy of this profile that has <see cref="EnsureValid"/> applied, i.e. no invalid data.
         /// </summary>
-        ICharacterProfile Validated(IConfigurationManager configManager, IPrototypeManager prototypeManager);
+        ICharacterProfile Validated(ICommonSession session, IDependencyCollection collection);
     }
 }
diff --git a/Content.Shared/Pulling/Components/PullableComponent.cs b/Content.Shared/Pulling/Components/PullableComponent.cs
deleted file mode 100644
index c5c30688699..00000000000
--- a/Content.Shared/Pulling/Components/PullableComponent.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Map;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Pulling.Components
-{
-    // Before you try to add another type than SharedPullingStateManagementSystem, consider the can of worms you may be opening!
-    [NetworkedComponent, AutoGenerateComponentState]
-    [Access(typeof(SharedPullingStateManagementSystem))]
-    [RegisterComponent]
-    public sealed partial class SharedPullableComponent : Component
-    {
-        /// <summary>
-        /// The current entity pulling this component.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public EntityUid? Puller { get; set; }
-
-        /// <summary>
-        /// The pull joint.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public string? PullJointId { get; set; }
-
-        public bool BeingPulled => Puller != null;
-
-        [Access(typeof(SharedPullingStateManagementSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
-        public EntityCoordinates? MovingTo { get; set; }
-
-        /// <summary>
-        /// If the physics component has FixedRotation should we keep it upon being pulled
-        /// </summary>
-        [Access(typeof(SharedPullingSystem), Other = AccessPermissions.ReadExecute)]
-        [ViewVariables(VVAccess.ReadWrite), DataField("fixedRotation")]
-        public bool FixedRotationOnPull { get; set; }
-
-        /// <summary>
-        /// What the pullable's fixedrotation was set to before being pulled.
-        /// </summary>
-        [Access(typeof(SharedPullingSystem), Other = AccessPermissions.ReadExecute)]
-        [ViewVariables]
-        public bool PrevFixedRotation;
-    }
-
-    /// <summary>
-    /// Raised when a request is made to stop pulling an entity.
-    /// </summary>
-    public sealed class StopPullingEvent : CancellableEntityEventArgs
-    {
-        public EntityUid? User { get; }
-
-        public StopPullingEvent(EntityUid? uid = null)
-        {
-            User = uid;
-        }
-    }
-}
diff --git a/Content.Shared/Pulling/Components/SharedPullerComponent.cs b/Content.Shared/Pulling/Components/SharedPullerComponent.cs
deleted file mode 100644
index 57a86e7f7a8..00000000000
--- a/Content.Shared/Pulling/Components/SharedPullerComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Pulling.Components
-{
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-    [Access(typeof(SharedPullingStateManagementSystem))]
-    public sealed partial class SharedPullerComponent : Component
-    {
-        // Before changing how this is updated, please see SharedPullerSystem.RefreshMovementSpeed
-        public float WalkSpeedModifier => Pulling == default ? 1.0f : 0.95f;
-
-        public float SprintSpeedModifier => Pulling == default ? 1.0f : 0.95f;
-
-        [DataField, AutoNetworkedField]
-        public EntityUid? Pulling { get; set; }
-
-        /// <summary>
-        ///     Does this entity need hands to be able to pull something?
-        /// </summary>
-        [DataField("needsHands")]
-        public bool NeedsHands = true;
-    }
-}
diff --git a/Content.Shared/Pulling/Events/PullAttemptEvent.cs b/Content.Shared/Pulling/Events/PullAttemptEvent.cs
deleted file mode 100644
index 6296dc2f14f..00000000000
--- a/Content.Shared/Pulling/Events/PullAttemptEvent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Robust.Shared.Physics.Components;
-
-namespace Content.Shared.Physics.Pull
-{
-    public sealed class PullAttemptEvent : PullMessage
-    {
-        public PullAttemptEvent(PhysicsComponent puller, PhysicsComponent pulled) : base(puller, pulled) { }
-
-        public bool Cancelled { get; set; }
-    }
-}
diff --git a/Content.Shared/Pulling/Events/PullMessage.cs b/Content.Shared/Pulling/Events/PullMessage.cs
deleted file mode 100644
index b11de7c1702..00000000000
--- a/Content.Shared/Pulling/Events/PullMessage.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Robust.Shared.Physics.Components;
-
-namespace Content.Shared.Physics.Pull
-{
-    public abstract class PullMessage : EntityEventArgs
-    {
-        public readonly PhysicsComponent Puller;
-        public readonly PhysicsComponent Pulled;
-
-        protected PullMessage(PhysicsComponent puller, PhysicsComponent pulled)
-        {
-            Puller = puller;
-            Pulled = pulled;
-        }
-    }
-}
diff --git a/Content.Shared/Pulling/Events/PullStartedMessage.cs b/Content.Shared/Pulling/Events/PullStartedMessage.cs
deleted file mode 100644
index 0ede284bb0c..00000000000
--- a/Content.Shared/Pulling/Events/PullStartedMessage.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.Physics.Components;
-
-namespace Content.Shared.Physics.Pull
-{
-    public sealed class PullStartedMessage : PullMessage
-    {
-        public PullStartedMessage(PhysicsComponent puller, PhysicsComponent pulled) :
-            base(puller, pulled)
-        {
-        }
-    }
-}
diff --git a/Content.Shared/Pulling/Events/PullStoppedMessage.cs b/Content.Shared/Pulling/Events/PullStoppedMessage.cs
deleted file mode 100644
index afcbcb70740..00000000000
--- a/Content.Shared/Pulling/Events/PullStoppedMessage.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Robust.Shared.Physics.Components;
-
-namespace Content.Shared.Physics.Pull
-{
-    public sealed class PullStoppedMessage : PullMessage
-    {
-        public PullStoppedMessage(PhysicsComponent puller, PhysicsComponent pulled) : base(puller, pulled)
-        {
-        }
-    }
-}
diff --git a/Content.Shared/Pulling/PullableMoveMessage.cs b/Content.Shared/Pulling/PullableMoveMessage.cs
deleted file mode 100644
index 46c6b1291d6..00000000000
--- a/Content.Shared/Pulling/PullableMoveMessage.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.Pulling
-{
-    public sealed class PullableMoveMessage : EntityEventArgs
-    {
-    }
-}
diff --git a/Content.Shared/Pulling/PullableStopMovingMessage.cs b/Content.Shared/Pulling/PullableStopMovingMessage.cs
deleted file mode 100644
index 0233e32f2b4..00000000000
--- a/Content.Shared/Pulling/PullableStopMovingMessage.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.Pulling
-{
-    public sealed class PullableStopMovingMessage : EntityEventArgs
-    {
-    }
-}
diff --git a/Content.Shared/Pulling/Systems/SharedPullableSystem.cs b/Content.Shared/Pulling/Systems/SharedPullableSystem.cs
deleted file mode 100644
index 3dab476337b..00000000000
--- a/Content.Shared/Pulling/Systems/SharedPullableSystem.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.ActionBlocker;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Pulling.Components;
-using Content.Shared.Movement.Events;
-
-namespace Content.Shared.Pulling.Systems
-{
-    public sealed class SharedPullableSystem : EntitySystem
-    {
-        [Dependency] private readonly ActionBlockerSystem _blocker = default!;
-        [Dependency] private readonly MobStateSystem _mobState = default!;
-        [Dependency] private readonly SharedPullingSystem _pullSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<SharedPullableComponent, MoveInputEvent>(OnRelayMoveInput);
-        }
-
-        private void OnRelayMoveInput(EntityUid uid, SharedPullableComponent component, ref MoveInputEvent args)
-        {
-            var entity = args.Entity;
-            if (_mobState.IsIncapacitated(entity) || !_blocker.CanMove(entity)) return;
-
-            _pullSystem.TryStopPull(component);
-        }
-    }
-}
diff --git a/Content.Shared/Pulling/Systems/SharedPullerSystem.cs b/Content.Shared/Pulling/Systems/SharedPullerSystem.cs
deleted file mode 100644
index e388d7a57c6..00000000000
--- a/Content.Shared/Pulling/Systems/SharedPullerSystem.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using Content.Shared.Administration.Logs;
-using Content.Shared.Alert;
-using Content.Shared.Database;
-using Content.Shared.Hands;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Physics.Pull;
-using Content.Shared.Pulling.Components;
-using JetBrains.Annotations;
-
-namespace Content.Shared.Pulling.Systems
-{
-    [UsedImplicitly]
-    public sealed class SharedPullerSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedPullingStateManagementSystem _why = default!;
-        [Dependency] private readonly SharedPullingSystem _pullSystem = default!;
-        [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
-        [Dependency] private readonly AlertsSystem _alertsSystem = default!;
-        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<SharedPullerComponent, PullStartedMessage>(PullerHandlePullStarted);
-            SubscribeLocalEvent<SharedPullerComponent, PullStoppedMessage>(PullerHandlePullStopped);
-            SubscribeLocalEvent<SharedPullerComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
-            SubscribeLocalEvent<SharedPullerComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
-            SubscribeLocalEvent<SharedPullerComponent, ComponentShutdown>(OnPullerShutdown);
-        }
-
-        private void OnPullerShutdown(EntityUid uid, SharedPullerComponent component, ComponentShutdown args)
-        {
-            _why.ForceDisconnectPuller(component);
-        }
-
-        private void OnVirtualItemDeleted(EntityUid uid, SharedPullerComponent component, VirtualItemDeletedEvent args)
-        {
-            if (component.Pulling == null)
-                return;
-
-            if (component.Pulling == args.BlockingEntity)
-            {
-                if (EntityManager.TryGetComponent<SharedPullableComponent>(args.BlockingEntity, out var comp))
-                {
-                    _pullSystem.TryStopPull(comp, uid);
-                }
-            }
-        }
-
-        private void PullerHandlePullStarted(
-            EntityUid uid,
-            SharedPullerComponent component,
-            PullStartedMessage args)
-        {
-            if (args.Puller.Owner != uid)
-                return;
-
-            _alertsSystem.ShowAlert(component.Owner, AlertType.Pulling);
-
-            RefreshMovementSpeed(component);
-        }
-
-        private void PullerHandlePullStopped(
-            EntityUid uid,
-            SharedPullerComponent component,
-            PullStoppedMessage args)
-        {
-            if (args.Puller.Owner != uid)
-                return;
-
-            var euid = component.Owner;
-            if (_alertsSystem.IsShowingAlert(euid, AlertType.Pulling))
-                _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(euid):user} stopped pulling {ToPrettyString(args.Pulled.Owner):target}");
-            _alertsSystem.ClearAlert(euid, AlertType.Pulling);
-
-            RefreshMovementSpeed(component);
-        }
-
-        private void OnRefreshMovespeed(EntityUid uid, SharedPullerComponent component, RefreshMovementSpeedModifiersEvent args)
-        {
-            args.ModifySpeed(component.WalkSpeedModifier, component.SprintSpeedModifier);
-        }
-
-        private void RefreshMovementSpeed(SharedPullerComponent component)
-        {
-            _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(component.Owner);
-        }
-    }
-}
diff --git a/Content.Shared/Pulling/Systems/SharedPullingStateManagementSystem.cs b/Content.Shared/Pulling/Systems/SharedPullingStateManagementSystem.cs
deleted file mode 100644
index 38ed8998898..00000000000
--- a/Content.Shared/Pulling/Systems/SharedPullingStateManagementSystem.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using Content.Shared.Physics.Pull;
-using Content.Shared.Pulling.Components;
-using JetBrains.Annotations;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Pulling
-{
-    /// <summary>
-    /// This is the core of pulling state management.
-    /// Because pulling state is such a mess to get right, all writes to pulling state must go through this class.
-    /// </summary>
-    [UsedImplicitly]
-    public sealed class SharedPullingStateManagementSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedJointSystem _jointSystem = default!;
-        [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<SharedPullableComponent, ComponentShutdown>(OnShutdown);
-        }
-
-        private void OnShutdown(EntityUid uid, SharedPullableComponent component, ComponentShutdown args)
-        {
-            if (component.Puller != null)
-                ForceRelationship(null, component);
-        }
-
-        // A WARNING:
-        // The following 2 functions are the most internal part of the pulling system's relationship management.
-        // They do not expect to be cancellable.
-        private void ForceDisconnect(SharedPullerComponent puller, SharedPullableComponent pullable)
-        {
-            var pullerPhysics = EntityManager.GetComponent<PhysicsComponent>(puller.Owner);
-            var pullablePhysics = EntityManager.GetComponent<PhysicsComponent>(pullable.Owner);
-
-            // MovingTo shutdown
-            ForceSetMovingTo(pullable, null);
-
-            // Joint shutdown
-            if (!_timing.ApplyingState && // During state-handling, joint component will handle its own state.
-                pullable.PullJointId != null &&
-                TryComp(puller.Owner, out JointComponent? jointComp))
-            {
-                if (jointComp.GetJoints.TryGetValue(pullable.PullJointId, out var j))
-                    _jointSystem.RemoveJoint(j);
-            }
-            pullable.PullJointId = null;
-
-            // State shutdown
-            puller.Pulling = null;
-            pullable.Puller = null;
-
-            // Messaging
-            var message = new PullStoppedMessage(pullerPhysics, pullablePhysics);
-
-            RaiseLocalEvent(puller.Owner, message, broadcast: false);
-
-            if (Initialized(pullable.Owner))
-                RaiseLocalEvent(pullable.Owner, message, true);
-
-            // Networking
-            Dirty(puller);
-            Dirty(pullable);
-        }
-
-        public void ForceRelationship(SharedPullerComponent? puller, SharedPullableComponent? pullable)
-        {
-            if (_timing.ApplyingState)
-                return;
-            ;
-            if (pullable != null && puller != null && (puller.Pulling == pullable.Owner))
-            {
-                // Already done
-                return;
-            }
-
-            // Start by disconnecting the pullable from whatever it is currently connected to.
-            var pullableOldPullerE = pullable?.Puller;
-            if (pullableOldPullerE != null)
-            {
-                ForceDisconnect(EntityManager.GetComponent<SharedPullerComponent>(pullableOldPullerE.Value), pullable!);
-            }
-
-            // Continue with the puller.
-            var pullerOldPullableE = puller?.Pulling;
-            if (pullerOldPullableE != null)
-            {
-                ForceDisconnect(puller!, EntityManager.GetComponent<SharedPullableComponent>(pullerOldPullableE.Value));
-            }
-
-            // And now for the actual connection (if any).
-
-            if (puller != null && pullable != null)
-            {
-                var pullerPhysics = EntityManager.GetComponent<PhysicsComponent>(puller.Owner);
-                var pullablePhysics = EntityManager.GetComponent<PhysicsComponent>(pullable.Owner);
-                pullable.PullJointId = $"pull-joint-{pullable.Owner}";
-
-                // State startup
-                puller.Pulling = pullable.Owner;
-                pullable.Puller = puller.Owner;
-
-                // joint state handling will manage its own state
-                if (!_timing.ApplyingState)
-                {
-                    // Joint startup
-                    var union = _physics.GetHardAABB(puller.Owner).Union(_physics.GetHardAABB(pullable.Owner, body: pullablePhysics));
-                    var length = Math.Max(union.Size.X, union.Size.Y) * 0.75f;
-
-                    var joint = _jointSystem.CreateDistanceJoint(pullablePhysics.Owner, pullerPhysics.Owner, id: pullable.PullJointId);
-                    joint.CollideConnected = false;
-                    // This maximum has to be there because if the object is constrained too closely, the clamping goes backwards and asserts.
-                    joint.MaxLength = Math.Max(1.0f, length);
-                    joint.Length = length * 0.75f;
-                    joint.MinLength = 0f;
-                    joint.Stiffness = 1f;
-                }
-
-                // Messaging
-                var message = new PullStartedMessage(pullerPhysics, pullablePhysics);
-
-                RaiseLocalEvent(puller.Owner, message, broadcast: false);
-                RaiseLocalEvent(pullable.Owner, message, true);
-
-                // Networking
-                Dirty(puller);
-                Dirty(pullable);
-            }
-        }
-
-        // For OnRemove use only.
-        public void ForceDisconnectPuller(SharedPullerComponent puller)
-        {
-            // DO NOT ADD ADDITIONAL LOGIC IN THIS FUNCTION. Do it in ForceRelationship.
-            ForceRelationship(puller, null);
-        }
-
-        // For OnRemove use only.
-        public void ForceDisconnectPullable(SharedPullableComponent pullable)
-        {
-            // DO NOT ADD ADDITIONAL LOGIC IN THIS FUNCTION. Do it in ForceRelationship.
-            ForceRelationship(null, pullable);
-        }
-
-        public void ForceSetMovingTo(SharedPullableComponent pullable, EntityCoordinates? movingTo)
-        {
-            if (_timing.ApplyingState)
-                return;
-
-            if (pullable.MovingTo == movingTo)
-            {
-                return;
-            }
-
-            // Don't allow setting a MovingTo if there's no puller.
-            // The other half of this guarantee (shutting down a MovingTo if the puller goes away) is enforced in ForceRelationship.
-            if (pullable.Puller == null && movingTo != null)
-            {
-                return;
-            }
-
-            pullable.MovingTo = movingTo;
-            Dirty(pullable);
-
-            if (movingTo == null)
-            {
-                RaiseLocalEvent(pullable.Owner, new PullableStopMovingMessage(), true);
-            }
-            else
-            {
-                RaiseLocalEvent(pullable.Owner, new PullableMoveMessage(), true);
-            }
-        }
-
-        /// <summary>
-        /// Changes if the entity needs a hand in order to be able to pull objects.
-        /// </summary>
-        public void ChangeHandRequirement(EntityUid uid, bool needsHands, SharedPullerComponent? comp)
-        {
-            if (!Resolve(uid, ref comp, false))
-                return;
-
-            comp.NeedsHands = needsHands;
-
-            Dirty(uid, comp);
-        }
-    }
-}
diff --git a/Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs b/Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
deleted file mode 100644
index 1e2bb90c61e..00000000000
--- a/Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-using Content.Shared.ActionBlocker;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Database;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Interaction;
-using Content.Shared.Physics.Pull;
-using Content.Shared.Pulling.Components;
-using Content.Shared.Pulling.Events;
-using Robust.Shared.Containers;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Pulling
-{
-    public abstract partial class SharedPullingSystem
-    {
-        [Dependency] private readonly ActionBlockerSystem _blocker = default!;
-        [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
-        [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-        [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
-
-        public bool CanPull(EntityUid puller, EntityUid pulled)
-        {
-            if (!EntityManager.TryGetComponent<SharedPullerComponent>(puller, out var comp))
-            {
-                return false;
-            }
-
-            if (comp.NeedsHands && !_handsSystem.TryGetEmptyHand(puller, out _))
-            {
-                return false;
-            }
-
-            if (!_blocker.CanInteract(puller, pulled))
-            {
-                return false;
-            }
-
-            if (!EntityManager.TryGetComponent<PhysicsComponent>(pulled, out var physics))
-            {
-                return false;
-            }
-
-            if (physics.BodyType == BodyType.Static)
-            {
-                return false;
-            }
-
-            if (puller == pulled)
-            {
-                return false;
-            }
-
-            if(_containerSystem.IsEntityInContainer(puller) || _containerSystem.IsEntityInContainer(pulled))
-            {
-                return false;
-            }
-
-            if (EntityManager.TryGetComponent(puller, out BuckleComponent? buckle))
-            {
-                // Prevent people pulling the chair they're on, etc.
-                if (buckle is { PullStrap: false, Buckled: true } && (buckle.LastEntityBuckledTo == pulled))
-                {
-                    return false;
-                }
-            }
-
-            var getPulled = new BeingPulledAttemptEvent(puller, pulled);
-            RaiseLocalEvent(pulled, getPulled, true);
-            var startPull = new StartPullAttemptEvent(puller, pulled);
-            RaiseLocalEvent(puller, startPull, true);
-            return (!startPull.Cancelled && !getPulled.Cancelled);
-        }
-
-        public bool TogglePull(EntityUid puller, SharedPullableComponent pullable)
-        {
-            if (pullable.Puller == puller)
-            {
-                return TryStopPull(pullable);
-            }
-            return TryStartPull(puller, pullable.Owner);
-        }
-
-        // -- Core attempted actions --
-
-        public bool TryStopPull(SharedPullableComponent pullable, EntityUid? user = null)
-        {
-            if (_timing.ApplyingState)
-                return false;
-
-            if (!pullable.BeingPulled)
-            {
-                return false;
-            }
-
-            var msg = new StopPullingEvent(user);
-            RaiseLocalEvent(pullable.Owner, msg, true);
-
-            if (msg.Cancelled) return false;
-
-            // Stop pulling confirmed!
-
-            if (TryComp<PhysicsComponent>(pullable.Owner, out var pullablePhysics))
-            {
-                _physics.SetFixedRotation(pullable.Owner, pullable.PrevFixedRotation, body: pullablePhysics);
-            }
-
-            _pullSm.ForceRelationship(null, pullable);
-            return true;
-        }
-
-        public bool TryStartPull(EntityUid puller, EntityUid pullable)
-        {
-            if (!EntityManager.TryGetComponent(puller, out SharedPullerComponent? pullerComp))
-            {
-                return false;
-            }
-            if (!EntityManager.TryGetComponent(pullable, out SharedPullableComponent? pullableComp))
-            {
-                return false;
-            }
-            return TryStartPull(pullerComp, pullableComp);
-        }
-
-        // The main "start pulling" function.
-        public bool TryStartPull(SharedPullerComponent puller, SharedPullableComponent pullable)
-        {
-            if (_timing.ApplyingState)
-                return false;
-
-            if (puller.Pulling == pullable.Owner)
-                return true;
-
-            // Pulling a new object : Perform sanity checks.
-
-            if (!CanPull(puller.Owner, pullable.Owner))
-            {
-                return false;
-            }
-
-            if (!EntityManager.TryGetComponent<PhysicsComponent>(puller.Owner, out var pullerPhysics))
-            {
-                return false;
-            }
-
-            if (!EntityManager.TryGetComponent<PhysicsComponent>(pullable.Owner, out var pullablePhysics))
-            {
-                return false;
-            }
-
-            // Ensure that the puller is not currently pulling anything.
-            // If this isn't done, then it happens too late, and the start/stop messages go out of order,
-            //  and next thing you know it thinks it's not pulling anything even though it is!
-
-            var oldPullable = puller.Pulling;
-            if (oldPullable != null)
-            {
-                if (EntityManager.TryGetComponent(oldPullable.Value, out SharedPullableComponent? oldPullableComp))
-                {
-                    if (!TryStopPull(oldPullableComp))
-                    {
-                        return false;
-                    }
-                }
-                else
-                {
-                    Log.Warning("Well now you've done it, haven't you? Someone transferred pulling (onto {0}) while presently pulling something that has no Pullable component (on {1})!", pullable.Owner, oldPullable);
-                    return false;
-                }
-            }
-
-            // Ensure that the pullable is not currently being pulled.
-            // Same sort of reasons as before.
-
-            var oldPuller = pullable.Puller;
-            if (oldPuller != null)
-            {
-                if (!TryStopPull(pullable))
-                {
-                    return false;
-                }
-            }
-
-            // Continue with pulling process.
-
-            var pullAttempt = new PullAttemptEvent(pullerPhysics, pullablePhysics);
-
-            RaiseLocalEvent(puller.Owner, pullAttempt, broadcast: false);
-
-            if (pullAttempt.Cancelled)
-            {
-                return false;
-            }
-
-            RaiseLocalEvent(pullable.Owner, pullAttempt, true);
-
-            if (pullAttempt.Cancelled)
-                return false;
-
-            _interaction.DoContactInteraction(pullable.Owner, puller.Owner);
-
-            _pullSm.ForceRelationship(puller, pullable);
-            pullable.PrevFixedRotation = pullablePhysics.FixedRotation;
-            _physics.SetFixedRotation(pullable.Owner, pullable.FixedRotationOnPull, body: pullablePhysics);
-            _adminLogger.Add(LogType.Action, LogImpact.Low,
-                $"{ToPrettyString(puller.Owner):user} started pulling {ToPrettyString(pullable.Owner):target}");
-            return true;
-        }
-
-        public bool TryMoveTo(SharedPullableComponent pullable, EntityCoordinates to)
-        {
-            if (pullable.Puller == null)
-            {
-                return false;
-            }
-
-            if (!EntityManager.HasComponent<PhysicsComponent>(pullable.Owner))
-            {
-                return false;
-            }
-
-            _pullSm.ForceSetMovingTo(pullable, to);
-            return true;
-        }
-
-        public void StopMoveTo(SharedPullableComponent pullable)
-        {
-            _pullSm.ForceSetMovingTo(pullable, null);
-        }
-    }
-}
diff --git a/Content.Shared/Pulling/Systems/SharedPullingSystem.cs b/Content.Shared/Pulling/Systems/SharedPullingSystem.cs
deleted file mode 100644
index 0c139ee9e35..00000000000
--- a/Content.Shared/Pulling/Systems/SharedPullingSystem.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Alert;
-using Content.Shared.GameTicking;
-using Content.Shared.Input;
-using Content.Shared.Physics.Pull;
-using Content.Shared.Pulling.Components;
-using Content.Shared.Verbs;
-using JetBrains.Annotations;
-using Robust.Shared.Containers;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Events;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Player;
-
-namespace Content.Shared.Pulling
-{
-    [UsedImplicitly]
-    public abstract partial class SharedPullingSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedPullingStateManagementSystem _pullSm = default!;
-        [Dependency] private readonly AlertsSystem _alertsSystem = default!;
-        [Dependency] private readonly SharedJointSystem _joints = default!;
-
-        /// <summary>
-        ///     A mapping of pullers to the entity that they are pulling.
-        /// </summary>
-        private readonly Dictionary<EntityUid, EntityUid> _pullers =
-            new();
-
-        private readonly HashSet<SharedPullableComponent> _moving = new();
-        private readonly HashSet<SharedPullableComponent> _stoppedMoving = new();
-
-        public IReadOnlySet<SharedPullableComponent> Moving => _moving;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            UpdatesOutsidePrediction = true;
-
-            SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
-            SubscribeLocalEvent<PullStartedMessage>(OnPullStarted);
-            SubscribeLocalEvent<PullStoppedMessage>(OnPullStopped);
-            SubscribeLocalEvent<EntInsertedIntoContainerMessage>(HandleContainerInsert);
-            SubscribeLocalEvent<SharedPullableComponent, JointRemovedEvent>(OnJointRemoved);
-            SubscribeLocalEvent<SharedPullableComponent, CollisionChangeEvent>(OnPullableCollisionChange);
-
-            SubscribeLocalEvent<SharedPullableComponent, PullStartedMessage>(PullableHandlePullStarted);
-            SubscribeLocalEvent<SharedPullableComponent, PullStoppedMessage>(PullableHandlePullStopped);
-
-            SubscribeLocalEvent<SharedPullableComponent, GetVerbsEvent<Verb>>(AddPullVerbs);
-
-            CommandBinds.Builder
-                .Bind(ContentKeyFunctions.MovePulledObject, new PointerInputCmdHandler(HandleMovePulledObject))
-                .Register<SharedPullingSystem>();
-        }
-
-        private void OnPullableCollisionChange(EntityUid uid, SharedPullableComponent component, ref CollisionChangeEvent args)
-        {
-            if (component.PullJointId != null && !args.CanCollide)
-            {
-                _joints.RemoveJoint(uid, component.PullJointId);
-            }
-        }
-
-        private void OnJointRemoved(EntityUid uid, SharedPullableComponent component, JointRemovedEvent args)
-        {
-            if (component.Puller != args.OtherEntity)
-                return;
-
-            // Do we have some other join with our Puller?
-            // or alternatively:
-            // TODO track the relevant joint.
-
-            if (TryComp(uid, out JointComponent? joints))
-            {
-                foreach (var jt in joints.GetJoints.Values)
-                {
-                    if (jt.BodyAUid == component.Puller || jt.BodyBUid == component.Puller)
-                        return;
-                }
-            }
-
-            // No more joints with puller -> force stop pull.
-            _pullSm.ForceDisconnectPullable(component);
-        }
-
-        private void AddPullVerbs(EntityUid uid, SharedPullableComponent component, GetVerbsEvent<Verb> args)
-        {
-            if (!args.CanAccess || !args.CanInteract)
-                return;
-
-            // Are they trying to pull themselves up by their bootstraps?
-            if (args.User == args.Target)
-                return;
-
-            //TODO VERB ICONS add pulling icon
-            if (component.Puller == args.User)
-            {
-                Verb verb = new()
-                {
-                    Text = Loc.GetString("pulling-verb-get-data-text-stop-pulling"),
-                    Act = () => TryStopPull(component, args.User),
-                    DoContactInteraction = false // pulling handle its own contact interaction.
-                };
-                args.Verbs.Add(verb);
-            }
-            else if (CanPull(args.User, args.Target))
-            {
-                Verb verb = new()
-                {
-                    Text = Loc.GetString("pulling-verb-get-data-text"),
-                    Act = () => TryStartPull(args.User, args.Target),
-                    DoContactInteraction = false // pulling handle its own contact interaction.
-                };
-                args.Verbs.Add(verb);
-            }
-        }
-
-        // Raise a "you are being pulled" alert if the pulled entity has alerts.
-        private void PullableHandlePullStarted(EntityUid uid, SharedPullableComponent component, PullStartedMessage args)
-        {
-            if (args.Pulled.Owner != uid)
-                return;
-
-            _alertsSystem.ShowAlert(uid, AlertType.Pulled);
-        }
-
-        private  void PullableHandlePullStopped(EntityUid uid, SharedPullableComponent component, PullStoppedMessage args)
-        {
-            if (args.Pulled.Owner != uid)
-                return;
-
-            _alertsSystem.ClearAlert(uid, AlertType.Pulled);
-        }
-
-        public bool IsPulled(EntityUid uid, SharedPullableComponent? component = null)
-        {
-            return Resolve(uid, ref component, false) && component.BeingPulled;
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            _moving.ExceptWith(_stoppedMoving);
-            _stoppedMoving.Clear();
-        }
-
-        public void Reset(RoundRestartCleanupEvent ev)
-        {
-            _pullers.Clear();
-            _moving.Clear();
-            _stoppedMoving.Clear();
-        }
-
-        private void OnPullStarted(PullStartedMessage message)
-        {
-            SetPuller(message.Puller.Owner, message.Pulled.Owner);
-        }
-
-        private void OnPullStopped(PullStoppedMessage message)
-        {
-            RemovePuller(message.Puller.Owner);
-        }
-
-        protected void OnPullableMove(EntityUid uid, SharedPullableComponent component, PullableMoveMessage args)
-        {
-            _moving.Add(component);
-        }
-
-        protected void OnPullableStopMove(EntityUid uid, SharedPullableComponent component, PullableStopMovingMessage args)
-        {
-            _stoppedMoving.Add(component);
-        }
-
-        // TODO: When Joint networking is less shitcodey fix this to use a dedicated joints message.
-        private void HandleContainerInsert(EntInsertedIntoContainerMessage message)
-        {
-            if (TryComp(message.Entity, out SharedPullableComponent? pullable))
-            {
-                TryStopPull(pullable);
-            }
-
-            if (TryComp(message.Entity, out SharedPullerComponent? puller))
-            {
-                if (puller.Pulling == null) return;
-
-                if (!TryComp(puller.Pulling.Value, out SharedPullableComponent? pulling))
-                    return;
-
-                TryStopPull(pulling);
-            }
-        }
-
-        private bool HandleMovePulledObject(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
-        {
-            if (session?.AttachedEntity is not { } player ||
-                !player.IsValid())
-                return false;
-
-            if (!TryGetPulled(player, out var pulled))
-                return false;
-
-            if (!TryComp(pulled.Value, out SharedPullableComponent? pullable))
-                return false;
-
-            if (_containerSystem.IsEntityInContainer(player))
-                return false;
-
-            TryMoveTo(pullable, coords);
-
-            return false;
-        }
-
-        private void SetPuller(EntityUid puller, EntityUid pulled)
-        {
-            _pullers[puller] = pulled;
-        }
-
-        private bool RemovePuller(EntityUid puller)
-        {
-            return _pullers.Remove(puller);
-        }
-
-        public EntityUid GetPulled(EntityUid by)
-        {
-            return _pullers.GetValueOrDefault(by);
-        }
-
-        public bool TryGetPulled(EntityUid by, [NotNullWhen(true)] out EntityUid? pulled)
-        {
-            return (pulled = GetPulled(by)) != null;
-        }
-
-        public bool IsPulling(EntityUid puller)
-        {
-            return _pullers.ContainsKey(puller);
-        }
-    }
-}
diff --git a/Content.Shared/RCD/Components/RCDAmmoComponent.cs b/Content.Shared/RCD/Components/RCDAmmoComponent.cs
index 7b1fc001d4d..4135b606e22 100644
--- a/Content.Shared/RCD/Components/RCDAmmoComponent.cs
+++ b/Content.Shared/RCD/Components/RCDAmmoComponent.cs
@@ -12,7 +12,5 @@ public sealed partial class RCDAmmoComponent : Component
     /// Can be partially transferred into an RCD, until it is empty then it gets deleted.
     /// </summary>
     [DataField("charges"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public int Charges = 5;
+    public int Charges = 30;
 }
-
-// TODO: state??? check if it desyncs
diff --git a/Content.Shared/RCD/Components/RCDComponent.cs b/Content.Shared/RCD/Components/RCDComponent.cs
index 8e1032884aa..39bb6fd3e9f 100644
--- a/Content.Shared/RCD/Components/RCDComponent.cs
+++ b/Content.Shared/RCD/Components/RCDComponent.cs
@@ -1,20 +1,11 @@
-using Content.Shared.Maps;
 using Content.Shared.RCD.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Physics;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.RCD.Components;
 
-public enum RcdMode : byte
-{
-    Floors,
-    Walls,
-    Airlock,
-    Deconstruct
-}
-
 /// <summary>
 /// Main component for the RCD
 /// Optionally uses LimitedChargesComponent.
@@ -25,27 +16,57 @@ public enum RcdMode : byte
 public sealed partial class RCDComponent : Component
 {
     /// <summary>
-    /// Time taken to do an action like placing a wall
+    /// List of RCD prototypes that the device comes loaded with
     /// </summary>
-    [DataField("delay"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public float Delay = 2f;
+    [DataField, AutoNetworkedField]
+    public HashSet<ProtoId<RCDPrototype>> AvailablePrototypes { get; set; } = new();
 
-    [DataField("swapModeSound")]
-    public SoundSpecifier SwapModeSound = new SoundPathSpecifier("/Audio/Items/genhit.ogg");
+    /// <summary>
+    /// Sound that plays when a RCD operation successfully completes
+    /// </summary>
+    [DataField]
+    public SoundSpecifier SuccessSound { get; set; } = new SoundPathSpecifier("/Audio/Items/deconstruct.ogg");
 
-    [DataField("successSound")]
-    public SoundSpecifier SuccessSound = new SoundPathSpecifier("/Audio/Items/deconstruct.ogg");
+    /// <summary>
+    /// The ProtoId of the currently selected RCD prototype
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<RCDPrototype> ProtoId { get; set; } = "Invalid";
 
     /// <summary>
-    /// What mode are we on? Can be floors, walls, airlock, deconstruct.
+    /// A cached copy of currently selected RCD prototype
     /// </summary>
-    [DataField("mode"), AutoNetworkedField]
-    public RcdMode Mode = RcdMode.Floors;
+    /// <remarks>
+    /// If the ProtoId is changed, make sure to update the CachedPrototype as well
+    /// </remarks>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public RCDPrototype CachedPrototype { get; set; } = default!;
+
+    /// <summary>
+    /// The direction constructed entities will face upon spawning
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Direction ConstructionDirection
+    {
+        get
+        {
+            return _constructionDirection;
+        }
+        set
+        {
+            _constructionDirection = value;
+            ConstructionTransform = new Transform(new(), _constructionDirection.ToAngle());
+        }
+    }
+
+    private Direction _constructionDirection = Direction.South;
 
     /// <summary>
-    /// ID of the floor to create when using the floor mode.
+    /// Returns a rotated transform based on the specified ConstructionDirection
     /// </summary>
-    [DataField("floor", customTypeSerializer: typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public string Floor = "FloorSteel";
+    /// <remarks>
+    /// Contains no position data
+    /// </remarks>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public Transform ConstructionTransform { get; private set; } = default!;
 }
diff --git a/Content.Shared/RCD/Components/RCDDeconstructibleComponent.cs b/Content.Shared/RCD/Components/RCDDeconstructibleComponent.cs
new file mode 100644
index 00000000000..0ddc6897f05
--- /dev/null
+++ b/Content.Shared/RCD/Components/RCDDeconstructibleComponent.cs
@@ -0,0 +1,34 @@
+using Content.Shared.RCD.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.RCD.Components;
+
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(RCDSystem))]
+public sealed partial class RCDDeconstructableComponent : Component
+{
+    /// <summary>
+    /// Number of charges consumed when the deconstruction is completed
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public int Cost = 1;
+
+    /// <summary>
+    /// The length of the deconstruction 
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float Delay = 1f;
+
+    /// <summary>
+    /// The visual effect that plays during deconstruction
+    /// </summary>
+    [DataField("fx"), ViewVariables(VVAccess.ReadWrite)]
+    public EntProtoId? Effect = null;
+
+    /// <summary>
+    /// Toggles whether this entity is deconstructable or not
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool Deconstructable = true;
+}
diff --git a/Content.Shared/RCD/RCDEvents.cs b/Content.Shared/RCD/RCDEvents.cs
new file mode 100644
index 00000000000..a15a010277b
--- /dev/null
+++ b/Content.Shared/RCD/RCDEvents.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.RCD;
+
+[Serializable, NetSerializable]
+public sealed class RCDSystemMessage : BoundUserInterfaceMessage
+{
+    public ProtoId<RCDPrototype> ProtoId;
+
+    public RCDSystemMessage(ProtoId<RCDPrototype> protoId)
+    {
+        ProtoId = protoId;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class RCDConstructionGhostRotationEvent : EntityEventArgs
+{
+    public readonly NetEntity NetEntity;
+    public readonly Direction Direction;
+
+    public RCDConstructionGhostRotationEvent(NetEntity netEntity, Direction direction)
+    {
+        NetEntity = netEntity;
+        Direction = direction;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum RcdUiKey : byte
+{
+    Key
+}
diff --git a/Content.Shared/RCD/RCDPrototype.cs b/Content.Shared/RCD/RCDPrototype.cs
new file mode 100644
index 00000000000..1e80abfb723
--- /dev/null
+++ b/Content.Shared/RCD/RCDPrototype.cs
@@ -0,0 +1,144 @@
+using Content.Shared.Physics;
+using Robust.Shared.Physics.Collision.Shapes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.RCD;
+
+/// <summary>
+/// Contains the parameters for a RCD construction / operation
+/// </summary>
+[Prototype("rcd")]
+public sealed class RCDPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// The RCD mode associated with the operation
+    /// </summary>
+    [DataField(required: true), ViewVariables(VVAccess.ReadOnly)]
+    public RcdMode Mode { get; private set; } = RcdMode.Invalid;
+
+    /// <summary>
+    /// The name associated with the prototype
+    /// </summary>
+    [DataField("name"), ViewVariables(VVAccess.ReadOnly)]
+    public string SetName { get; private set; } = "Unknown";
+
+    /// <summary>
+    /// The name of the radial container that this prototype will be listed under on the RCD menu
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public string Category { get; private set; } = "Undefined";
+
+    /// <summary>
+    /// Texture path for this prototypes menu icon
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public SpriteSpecifier? Sprite { get; private set; } = null;
+
+    /// <summary>
+    /// The entity prototype that will be constructed (mode dependent)
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public string? Prototype { get; private set; } = string.Empty;
+
+    /// <summary>
+    /// Number of charges consumed when the operation is completed
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public int Cost { get; private set; } = 1;
+
+    /// <summary>
+    /// The length of the operation 
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public float Delay { get; private set; } = 1f;
+
+    /// <summary>
+    /// The visual effect that plays during this operation
+    /// </summary>
+    [DataField("fx"), ViewVariables(VVAccess.ReadOnly)]
+    public EntProtoId? Effect { get; private set; } = null;
+
+    /// <summary>
+    /// A list of rules that govern where the entity prototype can be contructed
+    /// </summary>
+    [DataField("rules"), ViewVariables(VVAccess.ReadOnly)]
+    public HashSet<RcdConstructionRule> ConstructionRules { get; private set; } = new();
+
+    /// <summary>
+    /// The collision mask used for determining whether the entity prototype will fit into a target tile
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public CollisionGroup CollisionMask { get; private set; } = CollisionGroup.None;
+
+    /// <summary>
+    /// Specifies a set of custom collision bounds for determining whether the entity prototype will fit into a target tile 
+    /// </summary>
+    /// <remarks>
+    /// Should be set assuming that the entity faces south.
+    /// Make sure that Rotation is set to RcdRotation.User if the entity is to be rotated by the user
+    /// </remarks>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public Box2? CollisionBounds
+    {
+        get
+        {
+            return _collisionBounds;
+        }
+
+        private set
+        {
+            _collisionBounds = value;
+
+            if (_collisionBounds != null)
+            {
+                var poly = new PolygonShape();
+                poly.SetAsBox(_collisionBounds.Value);
+
+                CollisionPolygon = poly;
+            }
+        }
+    }
+
+    private Box2? _collisionBounds = null;
+
+    /// <summary>
+    /// The polygon shape associated with the prototype CollisionBounds (if set) 
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public PolygonShape? CollisionPolygon { get; private set; } = null;
+
+    /// <summary>
+    /// Governs how the local rotation of the constructed entity will be set
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public RcdRotation Rotation { get; private set; } = RcdRotation.User;
+}
+
+public enum RcdMode : byte
+{
+    Invalid,
+    Deconstruct,
+    ConstructTile,
+    ConstructObject,
+}
+
+// These are to be replaced with more flexible 'RulesRule' at a later time
+public enum RcdConstructionRule : byte
+{
+    MustBuildOnEmptyTile,       // Can only be built on empty space (e.g. lattice)
+    CanBuildOnEmptyTile,        // Can be built on empty space or replace an existing tile (e.g. hull plating)
+    MustBuildOnSubfloor,        // Can only be built on exposed subfloor (e.g. catwalks on lattice or hull plating)
+    IsWindow,                   // The entity is a window and can be built on grilles
+    IsCatwalk,                  // The entity is a catwalk
+}
+
+public enum RcdRotation : byte
+{
+    Fixed,      // The entity has a local rotation of zero
+    Camera,     // The rotation of the entity matches the local player camera
+    User,       // The entity can be rotated by the local player prior to placement
+}
diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
index 187c8d8a9d8..bbdfc5d0218 100644
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -1,31 +1,37 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Charges.Components;
 using Content.Shared.Charges.Systems;
+using Content.Shared.Construction;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
+using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
 using Content.Shared.RCD.Components;
 using Content.Shared.Tag;
 using Content.Shared.Tiles;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Network;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Collision.Shapes;
+using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace Content.Shared.RCD.Systems;
 
-public sealed class RCDSystem : EntitySystem
+[Virtual]
+public class RCDSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IMapManager _mapMan = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!;
@@ -35,313 +41,609 @@ public sealed class RCDSystem : EntitySystem
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+    [Dependency] private readonly TagSystem _tags = default!;
 
-    private readonly int RcdModeCount = Enum.GetValues(typeof(RcdMode)).Length;
+    private readonly int _instantConstructionDelay = 0;
+    private readonly EntProtoId _instantConstructionFx = "EffectRCDConstruct0";
+    private readonly ProtoId<RCDPrototype> _deconstructTileProto = "DeconstructTile";
+    private readonly ProtoId<RCDPrototype> _deconstructLatticeProto = "DeconstructLattice";
+
+    private HashSet<EntityUid> _intersectingEntities = new();
 
     public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<RCDComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<RCDComponent, ExaminedEvent>(OnExamine);
-        SubscribeLocalEvent<RCDComponent, UseInHandEvent>(OnUseInHand);
         SubscribeLocalEvent<RCDComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<RCDComponent, RCDDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<RCDComponent, DoAfterAttemptEvent<RCDDoAfterEvent>>(OnDoAfterAttempt);
+        SubscribeLocalEvent<RCDComponent, RCDSystemMessage>(OnRCDSystemMessage);
+        SubscribeNetworkEvent<RCDConstructionGhostRotationEvent>(OnRCDconstructionGhostRotationEvent);
     }
 
-    private void OnExamine(EntityUid uid, RCDComponent comp, ExaminedEvent args)
+    #region Event handling
+
+    private void OnMapInit(EntityUid uid, RCDComponent component, MapInitEvent args)
     {
-        if (!args.IsInDetailsRange)
+        // On init, set the RCD to its first available recipe
+        if (component.AvailablePrototypes.Any())
+        {
+            component.ProtoId = component.AvailablePrototypes.First();
+            UpdateCachedPrototype(uid, component);
+            Dirty(uid, component);
+
             return;
+        }
 
-        var msg = Loc.GetString("rcd-component-examine-detail", ("mode", comp.Mode));
-        args.PushMarkup(msg);
+        // The RCD has no valid recipes somehow? Get rid of it
+        QueueDel(uid);
     }
 
-    private void OnUseInHand(EntityUid uid, RCDComponent comp, UseInHandEvent args)
+    private void OnRCDSystemMessage(EntityUid uid, RCDComponent component, RCDSystemMessage args)
     {
-        if (args.Handled)
+        // Exit if the RCD doesn't actually know the supplied prototype
+        if (!component.AvailablePrototypes.Contains(args.ProtoId))
             return;
 
-        NextMode(uid, comp, args.User);
-        args.Handled = true;
+        if (!_protoManager.HasIndex(args.ProtoId))
+            return;
+
+        // Set the current RCD prototype to the one supplied
+        component.ProtoId = args.ProtoId;
+        UpdateCachedPrototype(uid, component);
+        Dirty(uid, component);
+    }
+
+    private void OnExamine(EntityUid uid, RCDComponent component, ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        // Update cached prototype if required
+        UpdateCachedPrototype(uid, component);
+
+        var msg = Loc.GetString("rcd-component-examine-mode-details", ("mode", Loc.GetString(component.CachedPrototype.SetName)));
+
+        if (component.CachedPrototype.Mode == RcdMode.ConstructTile || component.CachedPrototype.Mode == RcdMode.ConstructObject)
+        {
+            var name = Loc.GetString(component.CachedPrototype.SetName);
+
+            if (component.CachedPrototype.Prototype != null &&
+                _protoManager.TryIndex(component.CachedPrototype.Prototype, out var proto))
+                name = proto.Name;
+
+            msg = Loc.GetString("rcd-component-examine-build-details", ("name", name));
+        }
+
+        args.PushMarkup(msg);
     }
 
-    private void OnAfterInteract(EntityUid uid, RCDComponent comp, AfterInteractEvent args)
+    private void OnAfterInteract(EntityUid uid, RCDComponent component, AfterInteractEvent args)
     {
         if (args.Handled || !args.CanReach)
             return;
 
         var user = args.User;
+        var location = args.ClickLocation;
 
-        TryComp<LimitedChargesComponent>(uid, out var charges);
-        if (_charges.IsEmpty(uid, charges))
+        // Initial validity checks
+        if (!location.IsValid(EntityManager))
+            return;
+
+        if (!TryGetMapGridData(location, out var mapGridData))
         {
-            _popup.PopupClient(Loc.GetString("rcd-component-no-ammo-message"), uid, user);
+            _popup.PopupClient(Loc.GetString("rcd-component-no-valid-grid"), uid, user);
             return;
         }
 
-        var location = args.ClickLocation;
-        // Initial validity check
-        if (!location.IsValid(EntityManager))
+        if (!IsRCDOperationStillValid(uid, component, mapGridData.Value, args.Target, args.User))
             return;
 
-        var gridId = location.GetGridUid(EntityManager);
-        if (!HasComp<MapGridComponent>(gridId))
+        if (!_net.IsServer)
+            return;
+
+        // Get the starting cost, delay, and effect from the prototype
+        var cost = component.CachedPrototype.Cost;
+        var delay = component.CachedPrototype.Delay;
+        var effectPrototype = component.CachedPrototype.Effect;
+
+        #region: Operation modifiers
+
+        // Deconstruction modifiers
+        switch (component.CachedPrototype.Mode)
         {
-            location = location.AlignWithClosestGridTile();
-            gridId = location.GetGridUid(EntityManager);
-            // Check if fixing it failed / get final grid ID
-            if (!HasComp<MapGridComponent>(gridId))
-                return;
+            case RcdMode.Deconstruct:
+
+                // Deconstructing an object
+                if (args.Target != null)
+                {
+                    if (TryComp<RCDDeconstructableComponent>(args.Target, out var destructible))
+                    {
+                        cost = destructible.Cost;
+                        delay = destructible.Delay;
+                        effectPrototype = destructible.Effect;
+                    }
+                }
+
+                // Deconstructing a tile
+                else
+                {
+                    var deconstructedTile = _mapSystem.GetTileRef(mapGridData.Value.GridUid, mapGridData.Value.Component, mapGridData.Value.Location);
+                    var protoName = !deconstructedTile.IsSpace() ? _deconstructTileProto : _deconstructLatticeProto;
+
+                    if (_protoManager.TryIndex(protoName, out var deconProto))
+                    {
+                        cost = deconProto.Cost;
+                        delay = deconProto.Delay;
+                        effectPrototype = deconProto.Effect;
+                    }
+                }
+
+                break;
+
+            case RcdMode.ConstructTile:
+
+                // If replacing a tile, make the construction instant
+                var contructedTile = _mapSystem.GetTileRef(mapGridData.Value.GridUid, mapGridData.Value.Component, mapGridData.Value.Location);
+
+                if (!contructedTile.Tile.IsEmpty)
+                {
+                    delay = _instantConstructionDelay;
+                    effectPrototype = _instantConstructionFx;
+                }
+
+                break;
         }
 
-        var doAfterArgs = new DoAfterArgs(EntityManager, user, comp.Delay, new RCDDoAfterEvent(GetNetCoordinates(location), comp.Mode), uid, target: args.Target, used: uid)
+        #endregion
+
+        // Try to start the do after
+        var effect = Spawn(effectPrototype, mapGridData.Value.Location);
+        var ev = new RCDDoAfterEvent(GetNetCoordinates(mapGridData.Value.Location), component.ConstructionDirection, component.ProtoId, cost, EntityManager.GetNetEntity(effect));
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, user, delay, ev, uid, target: args.Target, used: uid)
         {
             BreakOnDamage = true,
-            NeedHand = true,
             BreakOnHandChange = true,
             BreakOnUserMove = true,
             BreakOnTargetMove = args.Target != null,
-            AttemptFrequency = AttemptFrequency.EveryTick
+            AttemptFrequency = AttemptFrequency.EveryTick,
+            CancelDuplicate = false,
+            BlockDuplicate = false,
         };
 
         args.Handled = true;
 
-        if (_doAfter.TryStartDoAfter(doAfterArgs) && _gameTiming.IsFirstTimePredicted)
-            Spawn("EffectRCDConstruction", location);
+        if (!_doAfter.TryStartDoAfter(doAfterArgs))
+            QueueDel(effect);
     }
 
-    private void OnDoAfterAttempt(EntityUid uid, RCDComponent comp, DoAfterAttemptEvent<RCDDoAfterEvent> args)
+    private void OnDoAfterAttempt(EntityUid uid, RCDComponent component, DoAfterAttemptEvent<RCDDoAfterEvent> args)
     {
-        // sus client crash why
         if (args.Event?.DoAfter?.Args == null)
             return;
 
+        // Exit if the RCD prototype has changed
+        if (component.ProtoId != args.Event.StartingProtoId)
+        {
+            args.Cancel();
+            return;
+        }
+
+        // Ensure the RCD operation is still valid
         var location = GetCoordinates(args.Event.Location);
 
-        var gridId = location.GetGridUid(EntityManager);
-        if (!HasComp<MapGridComponent>(gridId))
+        if (!TryGetMapGridData(location, out var mapGridData))
         {
-            location = location.AlignWithClosestGridTile();
-            gridId = location.GetGridUid(EntityManager);
-            // Check if fixing it failed / get final grid ID
-            if (!HasComp<MapGridComponent>(gridId))
-                return;
+            args.Cancel();
+            return;
         }
 
-        var mapGrid = _mapMan.GetGrid(gridId.Value);
-        var tile = mapGrid.GetTileRef(location);
-
-        if (!IsRCDStillValid(uid, comp, args.Event.User, args.Event.Target, mapGrid, tile, args.Event.StartingMode))
+        if (!IsRCDOperationStillValid(uid, component, mapGridData.Value, args.Event.Target, args.Event.User))
             args.Cancel();
     }
 
-    private void OnDoAfter(EntityUid uid, RCDComponent comp, RCDDoAfterEvent args)
+    private void OnDoAfter(EntityUid uid, RCDComponent component, RCDDoAfterEvent args)
     {
+        if (args.Cancelled && _net.IsServer)
+            QueueDel(EntityManager.GetEntity(args.Effect));
+
         if (args.Handled || args.Cancelled || !_timing.IsFirstTimePredicted)
             return;
 
-        var user = args.User;
+        args.Handled = true;
+
         var location = GetCoordinates(args.Location);
 
-        var gridId = location.GetGridUid(EntityManager);
-        if (!HasComp<MapGridComponent>(gridId))
+        if (!TryGetMapGridData(location, out var mapGridData))
+            return;
+
+        // Ensure the RCD operation is still valid
+        if (!IsRCDOperationStillValid(uid, component, mapGridData.Value, args.Target, args.User))
+            return;
+
+        // Finalize the operation
+        FinalizeRCDOperation(uid, component, mapGridData.Value, args.Direction, args.Target, args.User);
+
+        // Play audio and consume charges
+        _audio.PlayPredicted(component.SuccessSound, uid, args.User);
+        _charges.UseCharges(uid, args.Cost);
+    }
+
+    private void OnRCDconstructionGhostRotationEvent(RCDConstructionGhostRotationEvent ev, EntitySessionEventArgs session)
+    {
+        var uid = GetEntity(ev.NetEntity);
+
+        // Determine if player that send the message is carrying the specified RCD in their active hand
+        if (session.SenderSession.AttachedEntity == null)
+            return;
+
+        if (!TryComp<HandsComponent>(session.SenderSession.AttachedEntity, out var hands) ||
+            uid != hands.ActiveHand?.HeldEntity)
+            return;
+
+        if (!TryComp<RCDComponent>(uid, out var rcd))
+            return;
+
+        // Update the construction direction
+        rcd.ConstructionDirection = ev.Direction;
+        Dirty(uid, rcd);
+    }
+
+    #endregion
+
+    #region Entity construction/deconstruction rule checks
+
+    public bool IsRCDOperationStillValid(EntityUid uid, RCDComponent component, MapGridData mapGridData, EntityUid? target, EntityUid user, bool popMsgs = true)
+    {
+        // Update cached prototype if required
+        UpdateCachedPrototype(uid, component);
+
+        // Check that the RCD has enough ammo to get the job done
+        TryComp<LimitedChargesComponent>(uid, out var charges);
+
+        // Both of these were messages were suppose to be predicted, but HasInsufficientCharges wasn't being checked on the client for some reason?
+        if (_charges.IsEmpty(uid, charges))
         {
-            location = location.AlignWithClosestGridTile();
-            gridId = location.GetGridUid(EntityManager);
-            // Check if fixing it failed / get final grid ID
-            if (!HasComp<MapGridComponent>(gridId))
-                return;
+            if (popMsgs)
+                _popup.PopupClient(Loc.GetString("rcd-component-no-ammo-message"), uid, user);
+
+            return false;
         }
 
-        var mapGrid = _mapMan.GetGrid(gridId.Value);
-        var tile = mapGrid.GetTileRef(location);
-        var snapPos = mapGrid.TileIndicesFor(location);
+        if (_charges.HasInsufficientCharges(uid, component.CachedPrototype.Cost, charges))
+        {
+            if (popMsgs)
+                _popup.PopupClient(Loc.GetString("rcd-component-insufficient-ammo-message"), uid, user);
 
-        // I love that this uses entirely separate code to construction and tile placement!!!
+            return false;
+        }
 
-        switch (comp.Mode)
-        {
-            //Floor mode just needs the tile to be a space tile (subFloor)
-            case RcdMode.Floors:
-                if (!_floors.CanPlaceTile(gridId.Value, mapGrid, out var reason))
-                {
-                    _popup.PopupClient(reason, user, user);
-                    return;
-                }
+        // Exit if the target / target location is obstructed
+        var unobstructed = (target == null)
+            ? _interaction.InRangeUnobstructed(user, _mapSystem.GridTileToWorld(mapGridData.GridUid, mapGridData.Component, mapGridData.Position), popup: popMsgs)
+            : _interaction.InRangeUnobstructed(user, target.Value, popup: popMsgs);
 
-                mapGrid.SetTile(snapPos, new Tile(_tileDefMan[comp.Floor].TileId));
-                _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(args.User):user} used RCD to set grid: {tile.GridUid} {snapPos} to {comp.Floor}");
-                break;
-            //We don't want to place a space tile on something that's already a space tile. Let's do the inverse of the last check.
-            case RcdMode.Deconstruct:
-                if (!IsTileBlocked(tile)) // Delete the turf
-                {
-                    mapGrid.SetTile(snapPos, Tile.Empty);
-                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(args.User):user} used RCD to set grid: {tile.GridUid} tile: {snapPos} to space");
-                }
-                else // Delete the targeted thing
-                {
-                    var target = args.Target!.Value;
-                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(args.User):user} used RCD to delete {ToPrettyString(target):target}");
-                    QueueDel(target);
-                }
-                break;
-            //Walls are a special behaviour, and require us to build a new object with a transform rather than setting a grid tile,
-            // thus we early return to avoid the tile set code.
-            case RcdMode.Walls:
-                // only spawn on the server
-                if (_net.IsServer)
-                {
-                    var ent = Spawn("WallSolid", mapGrid.GridTileToLocal(snapPos));
-                    Transform(ent).LocalRotation = Angle.Zero; // Walls always need to point south.
-                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(args.User):user} used RCD to spawn {ToPrettyString(ent)} at {snapPos} on grid {tile.GridUid}");
-                }
-                break;
-            case RcdMode.Airlock:
-                // only spawn on the server
-                if (_net.IsServer)
-                {
-                    var airlock = Spawn("Airlock", mapGrid.GridTileToLocal(snapPos));
-                    Transform(airlock).LocalRotation = Transform(uid).LocalRotation; //Now apply icon smoothing.
-                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(args.User):user} used RCD to spawn {ToPrettyString(airlock)} at {snapPos} on grid {tile.GridUid}");
-                }
-                break;
-            default:
-                args.Handled = true;
-                return; //I don't know why this would happen, but sure I guess. Get out of here invalid state!
+        if (!unobstructed)
+            return false;
+
+        // Return whether the operation location is valid
+        switch (component.CachedPrototype.Mode)
+        {
+            case RcdMode.ConstructTile: return IsConstructionLocationValid(uid, component, mapGridData, user, popMsgs);
+            case RcdMode.ConstructObject: return IsConstructionLocationValid(uid, component, mapGridData, user, popMsgs);
+            case RcdMode.Deconstruct: return IsDeconstructionStillValid(uid, component, mapGridData, target, user, popMsgs);
         }
 
-        _audio.PlayPredicted(comp.SuccessSound, uid, user);
-        _charges.UseCharge(uid);
-        args.Handled = true;
+        return false;
     }
 
-    private bool IsRCDStillValid(EntityUid uid, RCDComponent comp, EntityUid user, EntityUid? target, MapGridComponent mapGrid, TileRef tile, RcdMode startingMode)
+    private bool IsConstructionLocationValid(EntityUid uid, RCDComponent component, MapGridData mapGridData, EntityUid user, bool popMsgs = true)
     {
-        //Less expensive checks first. Failing those ones, we need to check that the tile isn't obstructed.
-        if (comp.Mode != startingMode)
+        // Check rule: Must build on empty tile
+        if (component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.MustBuildOnEmptyTile) && !mapGridData.Tile.Tile.IsEmpty)
+        {
+            if (popMsgs)
+                _popup.PopupClient(Loc.GetString("rcd-component-must-build-on-empty-tile-message"), uid, user);
+
+            return false;
+        }
+
+        // Check rule: Must build on non-empty tile
+        if (!component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.CanBuildOnEmptyTile) && mapGridData.Tile.Tile.IsEmpty)
+        {
+            if (popMsgs)
+                _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-on-empty-tile-message"), uid, user);
+
             return false;
+        }
 
-        var unobstructed = target == null
-            ? _interaction.InRangeUnobstructed(user, mapGrid.GridTileToWorld(tile.GridIndices), popup: true)
-            : _interaction.InRangeUnobstructed(user, target.Value, popup: true);
+        // Check rule: Must place on subfloor
+        if (component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.MustBuildOnSubfloor) && !mapGridData.Tile.Tile.GetContentTileDefinition().IsSubFloor)
+        {
+            if (popMsgs)
+                _popup.PopupClient(Loc.GetString("rcd-component-must-build-on-subfloor-message"), uid, user);
 
-        if (!unobstructed)
             return false;
+        }
 
-        switch (comp.Mode)
+        // Tile specific rules
+        if (component.CachedPrototype.Mode == RcdMode.ConstructTile)
         {
-            //Floor mode just needs the tile to be a space tile (subFloor)
-            case RcdMode.Floors:
-                if (!tile.Tile.IsEmpty)
+            // Check rule: Tile placement is valid
+            if (!_floors.CanPlaceTile(mapGridData.GridUid, mapGridData.Component, out var reason))
+            {
+                if (popMsgs)
+                    _popup.PopupClient(reason, uid, user);
+
+                return false;
+            }
+
+            // Check rule: Tiles can't be identical
+            if (mapGridData.Tile.Tile.GetContentTileDefinition().ID == component.CachedPrototype.Prototype)
+            {
+                if (popMsgs)
+                    _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-identical-tile"), uid, user);
+
+                return false;
+            }
+
+            // Ensure that all construction rules shared between tiles and object are checked before exiting here
+            return true;
+        }
+
+        // Entity specific rules
+
+        // Check rule: The tile is unoccupied
+        var isWindow = component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.IsWindow);
+        var isCatwalk = component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.IsCatwalk);
+
+        _intersectingEntities.Clear();
+        _lookup.GetLocalEntitiesIntersecting(mapGridData.GridUid, mapGridData.Position, _intersectingEntities, -0.05f, LookupFlags.Uncontained);
+
+        foreach (var ent in _intersectingEntities)
+        {
+            if (isWindow && HasComp<SharedCanBuildWindowOnTopComponent>(ent))
+                continue;
+
+            if (isCatwalk && _tags.HasTag(ent, "Catwalk"))
+            {
+                if (popMsgs)
+                    _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-on-occupied-tile-message"), uid, user);
+
+                return false;
+            }
+
+            if (component.CachedPrototype.CollisionMask != CollisionGroup.None && TryComp<FixturesComponent>(ent, out var fixtures))
+            {
+                foreach (var fixture in fixtures.Fixtures.Values)
                 {
-                    _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-floor-tile-not-empty-message"), uid, user);
+                    // Continue if no collision is possible
+                    if (!fixture.Hard || fixture.CollisionLayer <= 0 || (fixture.CollisionLayer & (int) component.CachedPrototype.CollisionMask) == 0)
+                        continue;
+
+                    // Continue if our custom collision bounds are not intersected
+                    if (component.CachedPrototype.CollisionPolygon != null &&
+                        !DoesCustomBoundsIntersectWithFixture(component.CachedPrototype.CollisionPolygon, component.ConstructionTransform, ent, fixture))
+                        continue;
+
+                    // Collision was detected
+                    if (popMsgs)
+                        _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-on-occupied-tile-message"), uid, user);
+
                     return false;
                 }
+            }
+        }
 
-                return true;
-            //We don't want to place a space tile on something that's already a space tile. Let's do the inverse of the last check.
-            case RcdMode.Deconstruct:
-                if (tile.Tile.IsEmpty)
-                    return false;
+        return true;
+    }
 
-                //They tried to decon a turf but...
-                if (target == null)
-                {
-                    // the turf is blocked
-                    if (IsTileBlocked(tile))
-                    {
-                        _popup.PopupClient(Loc.GetString("rcd-component-tile-obstructed-message"), uid, user);
-                        return false;
-                    }
-                    // the turf can't be destroyed (planet probably)
-                    var tileDef = (ContentTileDefinition) _tileDefMan[tile.Tile.TypeId];
-                    if (tileDef.Indestructible)
-                    {
-                        _popup.PopupClient(Loc.GetString("rcd-component-tile-indestructible-message"), uid, user);
-                        return false;
-                    }
-                }
-                //They tried to decon a non-turf but it's not in the whitelist
-                else if (!_tag.HasTag(target.Value, "RCDDeconstructWhitelist"))
-                {
+    private bool IsDeconstructionStillValid(EntityUid uid, RCDComponent component, MapGridData mapGridData, EntityUid? target, EntityUid user, bool popMsgs = true)
+    {
+        // Attempt to deconstruct a floor tile
+        if (target == null)
+        {
+            // The tile is empty
+            if (mapGridData.Tile.Tile.IsEmpty)
+            {
+                if (popMsgs)
+                    _popup.PopupClient(Loc.GetString("rcd-component-nothing-to-deconstruct-message"), uid, user);
+
+                return false;
+            }
+
+            // The tile has a structure sitting on it
+            if (_turf.IsTileBlocked(mapGridData.Tile, CollisionGroup.MobMask))
+            {
+                if (popMsgs)
+                    _popup.PopupClient(Loc.GetString("rcd-component-tile-obstructed-message"), uid, user);
+
+                return false;
+            }
+
+            // The tile cannot be destroyed
+            var tileDef = (ContentTileDefinition) _tileDefMan[mapGridData.Tile.Tile.TypeId];
+
+            if (tileDef.Indestructible)
+            {
+                if (popMsgs)
+                    _popup.PopupClient(Loc.GetString("rcd-component-tile-indestructible-message"), uid, user);
+
+                return false;
+            }
+        }
+
+        // Attempt to deconstruct an object
+        else
+        {
+            // The object is not in the whitelist
+            if (!TryComp<RCDDeconstructableComponent>(target, out var deconstructible) || !deconstructible.Deconstructable)
+            {
+                if (popMsgs)
                     _popup.PopupClient(Loc.GetString("rcd-component-deconstruct-target-not-on-whitelist-message"), uid, user);
-                    return false;
-                }
 
-                return true;
-            //Walls are a special behaviour, and require us to build a new object with a transform rather than setting a grid tile, thus we early return to avoid the tile set code.
-            case RcdMode.Walls:
-                if (tile.Tile.IsEmpty)
-                {
-                    _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-wall-tile-not-empty-message"), uid, user);
-                    return false;
-                }
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    #endregion
+
+    #region Entity construction/deconstruction
+
+    private void FinalizeRCDOperation(EntityUid uid, RCDComponent component, MapGridData mapGridData, Direction direction, EntityUid? target, EntityUid user)
+    {
+        if (!_net.IsServer)
+            return;
+
+        if (component.CachedPrototype.Prototype == null)
+            return;
 
-                if (IsTileBlocked(tile))
+        switch (component.CachedPrototype.Mode)
+        {
+            case RcdMode.ConstructTile:
+                _mapSystem.SetTile(mapGridData.GridUid, mapGridData.Component, mapGridData.Position, new Tile(_tileDefMan[component.CachedPrototype.Prototype].TileId));
+                _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to set grid: {mapGridData.GridUid} {mapGridData.Position} to {component.CachedPrototype.Prototype}");
+                break;
+
+            case RcdMode.ConstructObject:
+                var ent = Spawn(component.CachedPrototype.Prototype, _mapSystem.GridTileToLocal(mapGridData.GridUid, mapGridData.Component, mapGridData.Position));
+
+                switch (component.CachedPrototype.Rotation)
                 {
-                    _popup.PopupClient(Loc.GetString("rcd-component-tile-obstructed-message"), uid, user);
-                    return false;
+                    case RcdRotation.Fixed:
+                        Transform(ent).LocalRotation = Angle.Zero;
+                        break;
+                    case RcdRotation.Camera:
+                        Transform(ent).LocalRotation = Transform(uid).LocalRotation;
+                        break;
+                    case RcdRotation.User:
+                        Transform(ent).LocalRotation = direction.ToAngle();
+                        break;
                 }
-                return true;
-            case RcdMode.Airlock:
-                if (tile.Tile.IsEmpty)
+
+                _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to spawn {ToPrettyString(ent)} at {mapGridData.Position} on grid {mapGridData.GridUid}");
+                break;
+
+            case RcdMode.Deconstruct:
+
+                if (target == null)
                 {
-                    _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-airlock-tile-not-empty-message"), uid, user);
-                    return false;
+                    // Deconstruct tile (either converts the tile to lattice, or removes lattice)
+                    var tile = (mapGridData.Tile.Tile.GetContentTileDefinition().ID != "Lattice") ? new Tile(_tileDefMan["Lattice"].TileId) : Tile.Empty;
+                    _mapSystem.SetTile(mapGridData.GridUid, mapGridData.Component, mapGridData.Position, tile);
+                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to set grid: {mapGridData.GridUid} tile: {mapGridData.Position} open to space");
                 }
-                if (IsTileBlocked(tile))
+                else
                 {
-                    _popup.PopupClient(Loc.GetString("rcd-component-tile-obstructed-message"), uid, user);
-                    return false;
+                    // Deconstruct object
+                    _adminLogger.Add(LogType.RCD, LogImpact.High, $"{ToPrettyString(user):user} used RCD to delete {ToPrettyString(target):target}");
+                    QueueDel(target);
                 }
-                return true;
-            default:
-                return false; //I don't know why this would happen, but sure I guess. Get out of here invalid state!
+
+                break;
+        }
+    }
+
+    #endregion
+
+    #region Utility functions
+
+    public bool TryGetMapGridData(EntityCoordinates location, [NotNullWhen(true)] out MapGridData? mapGridData)
+    {
+        mapGridData = null;
+        var gridUid = location.GetGridUid(EntityManager);
+
+        if (!TryComp<MapGridComponent>(gridUid, out var mapGrid))
+        {
+            location = location.AlignWithClosestGridTile(1.75f, EntityManager);
+            gridUid = location.GetGridUid(EntityManager);
+
+            // Check if we got a grid ID the second time round
+            if (!TryComp(gridUid, out mapGrid))
+                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);
+
+        return true;
     }
 
-    private void NextMode(EntityUid uid, RCDComponent comp, EntityUid user)
+    private bool DoesCustomBoundsIntersectWithFixture(PolygonShape boundingPolygon, Transform boundingTransform, EntityUid fixtureOwner, Fixture fixture)
     {
-        _audio.PlayPredicted(comp.SwapModeSound, uid, user);
+        var entXformComp = Transform(fixtureOwner);
+        var entXform = new Transform(new(), entXformComp.LocalRotation);
 
-        var mode = (int) comp.Mode;
-        mode = ++mode % RcdModeCount;
-        comp.Mode = (RcdMode) mode;
-        Dirty(comp);
+        return boundingPolygon.ComputeAABB(boundingTransform, 0).Intersects(fixture.Shape.ComputeAABB(entXform, 0));
+    }
 
-        var msg = Loc.GetString("rcd-component-change-mode", ("mode", comp.Mode.ToString()));
-        _popup.PopupClient(msg, uid, user);
+    public void UpdateCachedPrototype(EntityUid uid, RCDComponent component)
+    {
+        if (component.ProtoId.Id != component.CachedPrototype?.Prototype)
+            component.CachedPrototype = _protoManager.Index(component.ProtoId);
     }
 
-    private bool IsTileBlocked(TileRef tile)
+    #endregion
+}
+
+public struct MapGridData
+{
+    public EntityUid GridUid;
+    public MapGridComponent Component;
+    public EntityCoordinates Location;
+    public TileRef Tile;
+    public Vector2i Position;
+
+    public MapGridData(EntityUid gridUid, MapGridComponent component, EntityCoordinates location, TileRef tile, Vector2i position)
     {
-        return _turf.IsTileBlocked(tile, CollisionGroup.MobMask);
+        GridUid = gridUid;
+        Component = component;
+        Location = location;
+        Tile = tile;
+        Position = position;
     }
 }
 
 [Serializable, NetSerializable]
 public sealed partial class RCDDoAfterEvent : DoAfterEvent
 {
-    [DataField("location", required: true)]
-    public NetCoordinates Location = default!;
+    [DataField(required: true)]
+    public NetCoordinates Location { get; private set; } = default!;
 
-    [DataField("startingMode", required: true)]
-    public RcdMode StartingMode = default!;
+    [DataField]
+    public Direction Direction { get; private set; } = default!;
 
-    private RCDDoAfterEvent()
-    {
-    }
+    [DataField]
+    public ProtoId<RCDPrototype> StartingProtoId { get; private set; } = default!;
+
+    [DataField]
+    public int Cost { get; private set; } = 1;
+
+    [DataField("fx")]
+    public NetEntity? Effect { get; private set; } = null;
+
+    private RCDDoAfterEvent() { }
 
-    public RCDDoAfterEvent(NetCoordinates location, RcdMode startingMode)
+    public RCDDoAfterEvent(NetCoordinates location, Direction direction, ProtoId<RCDPrototype> startingProtoId, int cost, NetEntity? effect = null)
     {
         Location = location;
-        StartingMode = startingMode;
+        Direction = direction;
+        StartingProtoId = startingProtoId;
+        Cost = cost;
+        Effect = effect;
     }
 
     public override DoAfterEvent Clone() => this;
diff --git a/Content.Shared/Random/RulesPrototype.cs b/Content.Shared/Random/RulesPrototype.cs
index 6bbc3a68f8f..20961af8e72 100644
--- a/Content.Shared/Random/RulesPrototype.cs
+++ b/Content.Shared/Random/RulesPrototype.cs
@@ -116,8 +116,8 @@ public sealed partial class NearbyAccessRule : RulesRule
     [DataField("count")]
     public int Count = 1;
 
-    [DataField("access", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<AccessLevelPrototype>))]
-    public List<string> Access = new();
+    [DataField("access", required: true)]
+    public List<ProtoId<AccessLevelPrototype>> Access = new();
 
     [DataField("range")]
     public float Range = 10f;
diff --git a/Content.Shared/Remotes/Components/DoorRemoteComponent.cs b/Content.Shared/Remotes/Components/DoorRemoteComponent.cs
new file mode 100644
index 00000000000..b157596e3b9
--- /dev/null
+++ b/Content.Shared/Remotes/Components/DoorRemoteComponent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Remotes.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DoorRemoteComponent : Component
+{
+    [AutoNetworkedField]
+    [DataField]
+    public OperatingMode Mode = OperatingMode.OpenClose;
+}
+
+public enum OperatingMode : byte
+{
+    OpenClose,
+    ToggleBolts,
+    ToggleEmergencyAccess,
+    placeholderForUiUpdates
+}
diff --git a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
new file mode 100644
index 00000000000..e9bbd27ada4
--- /dev/null
+++ b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Popups;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Remotes.Components;
+
+namespace Content.Shared.Remotes.EntitySystems;
+
+public abstract class SharedDoorRemoteSystem : EntitySystem
+{
+    [Dependency] protected readonly SharedPopupSystem Popup = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<DoorRemoteComponent, UseInHandEvent>(OnInHandActivation);
+    }
+
+    private void OnInHandActivation(Entity<DoorRemoteComponent> entity, ref UseInHandEvent args)
+    {
+        string switchMessageId;
+        switch (entity.Comp.Mode)
+        {
+            case OperatingMode.OpenClose:
+                entity.Comp.Mode = OperatingMode.ToggleBolts;
+                switchMessageId = "door-remote-switch-state-toggle-bolts";
+                break;
+
+            // Skip toggle bolts mode and move on from there (to emergency access)
+            case OperatingMode.ToggleBolts:
+                entity.Comp.Mode = OperatingMode.ToggleEmergencyAccess;
+                switchMessageId = "door-remote-switch-state-toggle-emergency-access";
+                break;
+
+            // Skip ToggleEmergencyAccess mode and move on from there (to door toggle)
+            case OperatingMode.ToggleEmergencyAccess:
+                entity.Comp.Mode = OperatingMode.OpenClose;
+                switchMessageId = "door-remote-switch-state-open-close";
+                break;
+            default:
+                throw new InvalidOperationException(
+                    $"{nameof(DoorRemoteComponent)} had invalid mode {entity.Comp.Mode}");
+        }
+        Dirty(entity);
+        Popup.PopupClient(Loc.GetString(switchMessageId), entity, args.User);
+    }
+}
diff --git a/Content.Shared/Research/Components/ResearchStealerComponent.cs b/Content.Shared/Research/Components/ResearchStealerComponent.cs
index e0331fad1bb..df8878e6516 100644
--- a/Content.Shared/Research/Components/ResearchStealerComponent.cs
+++ b/Content.Shared/Research/Components/ResearchStealerComponent.cs
@@ -14,4 +14,16 @@ public sealed partial class ResearchStealerComponent : Component
     /// </summary>
     [DataField("delay"), ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan Delay = TimeSpan.FromSeconds(20);
+
+    /// <summary>
+    /// The minimum number of technologies that will be stolen
+    /// </summary>
+    [DataField]
+    public int MinToSteal = 4;
+
+    /// <summary>
+    /// The maximum number of technologies that will be stolen
+    /// </summary>
+    [DataField]
+    public int MaxToSteal = 8;
 }
diff --git a/Content.Shared/Research/Systems/SharedResearchSystem.cs b/Content.Shared/Research/Systems/SharedResearchSystem.cs
index 12f27d0b9c9..9819e949b8b 100644
--- a/Content.Shared/Research/Systems/SharedResearchSystem.cs
+++ b/Content.Shared/Research/Systems/SharedResearchSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
+using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
@@ -219,16 +220,58 @@ public void TrySetMainDiscipline(TechnologyPrototype prototype, EntityUid uid, T
         if (!Resolve(uid, ref component))
             return;
 
-        var discipline = PrototypeManager.Index<TechDisciplinePrototype>(prototype.Discipline);
+        var discipline = PrototypeManager.Index(prototype.Discipline);
         if (prototype.Tier < discipline.LockoutTier)
             return;
         component.MainDiscipline = prototype.Discipline;
         Dirty(uid, component);
     }
 
+    /// <summary>
+    /// Removes a technology and its recipes from a technology database.
+    /// </summary>
+    public bool TryRemoveTechnology(Entity<TechnologyDatabaseComponent> entity, ProtoId<TechnologyPrototype> tech)
+    {
+        return TryRemoveTechnology(entity, PrototypeManager.Index(tech));
+    }
+
+    /// <summary>
+    /// Removes a technology and its recipes from a technology database.
+    /// </summary>
+    [PublicAPI]
+    public bool TryRemoveTechnology(Entity<TechnologyDatabaseComponent> entity, TechnologyPrototype tech)
+    {
+        if (!entity.Comp.UnlockedTechnologies.Remove(tech.ID))
+            return false;
+
+        // check to make sure we didn't somehow get the recipe from another tech.
+        // unlikely, but whatever
+        var recipes = tech.RecipeUnlocks;
+        foreach (var recipe in recipes)
+        {
+            var hasTechElsewhere = false;
+            foreach (var unlockedTech in entity.Comp.UnlockedTechnologies)
+            {
+                var unlockedTechProto = PrototypeManager.Index<TechnologyPrototype>(unlockedTech);
+
+                if (!unlockedTechProto.RecipeUnlocks.Contains(recipe))
+                    continue;
+                hasTechElsewhere = true;
+                break;
+            }
+
+            if (!hasTechElsewhere)
+                entity.Comp.UnlockedRecipes.Remove(recipe);
+        }
+        Dirty(entity, entity.Comp);
+        UpdateTechnologyCards(entity, entity);
+        return true;
+    }
+
     /// <summary>
     /// Clear all unlocked technologies from the database.
     /// </summary>
+    [PublicAPI]
     public void ClearTechs(EntityUid uid, TechnologyDatabaseComponent? comp = null)
     {
         if (!Resolve(uid, ref comp) || comp.UnlockedTechnologies.Count == 0)
diff --git a/Content.Shared/Revenant/Components/RevenantComponent.cs b/Content.Shared/Revenant/Components/RevenantComponent.cs
index b3d47e22f97..947c1a4b3fc 100644
--- a/Content.Shared/Revenant/Components/RevenantComponent.cs
+++ b/Content.Shared/Revenant/Components/RevenantComponent.cs
@@ -9,13 +9,15 @@
 namespace Content.Shared.Revenant.Components;
 
 [RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
 public sealed partial class RevenantComponent : Component
 {
     /// <summary>
     /// The total amount of Essence the revenant has. Functions
     /// as health and is regenerated.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [AutoNetworkedField]
     public FixedPoint2 Essence = 75;
 
     [DataField("stolenEssenceCurrencyPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<CurrencyPrototype>))]
diff --git a/Content.Shared/Revenant/SharedRevenant.cs b/Content.Shared/Revenant/SharedRevenant.cs
index c44e4408aaf..485ad26dd2c 100644
--- a/Content.Shared/Revenant/SharedRevenant.cs
+++ b/Content.Shared/Revenant/SharedRevenant.cs
@@ -70,3 +70,11 @@ public enum RevenantVisuals : byte
     Stunned,
     Harvesting,
 }
+
+[NetSerializable, Serializable]
+public enum RevenantVisualLayers : byte
+{
+    Digit1,
+    Digit2,
+    Digit3
+}
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 57af584be88..0ea79e85c0a 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -117,17 +117,17 @@ public sealed partial class JobPrototype : IPrototype
         [DataField("special", serverOnly: true)]
         public JobSpecial[] Special { get; private set; } = Array.Empty<JobSpecial>();
 
-        [DataField("access", customTypeSerializer: typeof(PrototypeIdListSerializer<AccessLevelPrototype>))]
-        public IReadOnlyCollection<string> Access { get; private set; } = Array.Empty<string>();
+        [DataField("access")]
+        public IReadOnlyCollection<ProtoId<AccessLevelPrototype>> Access { get; private set; } = Array.Empty<ProtoId<AccessLevelPrototype>>();
 
-        [DataField("accessGroups", customTypeSerializer: typeof(PrototypeIdListSerializer<AccessGroupPrototype>))]
-        public IReadOnlyCollection<string> AccessGroups { get; private set; } = Array.Empty<string>();
+        [DataField("accessGroups")]
+        public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> AccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
 
-        [DataField("extendedAccess", customTypeSerializer: typeof(PrototypeIdListSerializer<AccessLevelPrototype>))]
-        public IReadOnlyCollection<string> ExtendedAccess { get; private set; } = Array.Empty<string>();
+        [DataField("extendedAccess")]
+        public IReadOnlyCollection<ProtoId<AccessLevelPrototype>> ExtendedAccess { get; private set; } = Array.Empty<ProtoId<AccessLevelPrototype>>();
 
-        [DataField("extendedAccessGroups", customTypeSerializer: typeof(PrototypeIdListSerializer<AccessGroupPrototype>))]
-        public IReadOnlyCollection<string> ExtendedAccessGroups { get; private set; } = Array.Empty<string>();
+        [DataField("extendedAccessGroups")]
+        public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> ExtendedAccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
     }
 
     /// <summary>
diff --git a/Content.Shared/Roles/JobRequirements.cs b/Content.Shared/Roles/JobRequirements.cs
index 66947c79c35..44607fc44d9 100644
--- a/Content.Shared/Roles/JobRequirements.cs
+++ b/Content.Shared/Roles/JobRequirements.cs
@@ -73,7 +73,7 @@ public static class JobRequirements
     {
         public static bool TryRequirementsMet(
             JobPrototype job,
-            Dictionary<string, TimeSpan> playTimes,
+            IReadOnlyDictionary<string, TimeSpan> playTimes,
             [NotNullWhen(false)] out FormattedMessage? reason,
             IEntityManager entManager,
             IPrototypeManager prototypes,
@@ -97,7 +97,7 @@ public static bool TryRequirementsMet(
         /// </summary>
         public static bool TryRequirementMet(
             JobRequirement requirement,
-            Dictionary<string, TimeSpan> playTimes,
+            IReadOnlyDictionary<string, TimeSpan> playTimes,
             [NotNullWhen(false)] out FormattedMessage? reason,
             IEntityManager entManager,
             IPrototypeManager prototypes,
@@ -140,21 +140,19 @@ public static bool TryRequirementMet(
                             ("departmentColor", department.Color.ToHex())));
                         return false;
                     }
-                    else
-                    {
-                        if (deptDiff <= 0)
-                        {
-                            reason = FormattedMessage.FromMarkup(Loc.GetString(
-                                $"{localePrefix}department-too-high",
-                                ("time", -deptDiff),
-                                ("department", Loc.GetString(deptRequirement.Department)),
-                                ("departmentColor", department.Color.ToHex())));
-                            return false;
-                        }
 
-                        return true;
+                    if (deptDiff <= 0)
+                    {
+                        reason = FormattedMessage.FromMarkup(Loc.GetString(
+                            $"{localePrefix}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;
@@ -169,17 +167,15 @@ public static bool TryRequirementMet(
                               ("time", Math.Ceiling(overallDiff))));
                         return false;
                     }
-                    else
-                    {
-                        if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
-                        {
-                            reason = FormattedMessage.FromMarkup(Loc.GetString($"{localePrefix}overall-too-high", ("time", -overallDiff)));
-                            return false;
-                        }
 
-                        return true;
+                    if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
+                    {
+                        reason = FormattedMessage.FromMarkup(Loc.GetString($"{localePrefix}overall-too-high", ("time", -overallDiff)));
+                        return false;
                     }
 
+                    return true;
+
                 case RoleTimeRequirement roleRequirement:
                     proto = roleRequirement.Role;
 
@@ -207,20 +203,18 @@ public static bool TryRequirementMet(
                             ("departmentColor", departmentColor.ToHex())));
                         return false;
                     }
-                    else
-                    {
-                        if (roleDiff <= 0)
-                        {
-                            reason = FormattedMessage.FromMarkup(Loc.GetString(
-                                $"{localePrefix}role-too-high",
-                                ("time", -roleDiff),
-                                ("job", Loc.GetString(proto)),
-                                ("departmentColor", departmentColor.ToHex())));
-                            return false;
-                        }
 
-                        return true;
+                    if (roleDiff <= 0)
+                    {
+                        reason = FormattedMessage.FromMarkup(Loc.GetString(
+                            $"{localePrefix}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.");
diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs
index 1e7881113fe..0ff65617bc9 100644
--- a/Content.Shared/Roles/StartingGearPrototype.cs
+++ b/Content.Shared/Roles/StartingGearPrototype.cs
@@ -2,47 +2,55 @@
 using Content.Shared.Preferences;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Roles
+namespace Content.Shared.Roles;
+
+[Prototype("startingGear")]
+public sealed partial class StartingGearPrototype : IPrototype
 {
-    [Prototype("startingGear")]
-    public sealed partial class StartingGearPrototype : IPrototype
-    {
-        [DataField]
-        public Dictionary<string, EntProtoId> Equipment = new();
+    [DataField]
+    public Dictionary<string, EntProtoId> Equipment = new();
+
+    /// <summary>
+    ///     If empty, there is no skirt override - instead the uniform provided in equipment is added.
+    /// </summary>
+    [DataField]
+    public EntProtoId? InnerClothingSkirt;
 
-        /// <summary>
-        /// if empty, there is no skirt override - instead the uniform provided in equipment is added.
-        /// </summary>
-        [DataField]
-        public EntProtoId? InnerClothingSkirt;
+    [DataField]
+    public EntProtoId? Satchel;
 
-        [DataField]
-        public EntProtoId? Satchel;
+    [DataField]
+    public EntProtoId? Duffelbag;
 
-        [DataField]
-        public EntProtoId? Duffelbag;
+    [DataField]
+    public List<EntProtoId> Inhand = new(0);
 
-        [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;
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = string.Empty;
 
-        public string GetGear(string slot, HumanoidCharacterProfile? profile)
+    public string GetGear(string slot, HumanoidCharacterProfile? profile)
+    {
+        if (profile != null)
         {
-            if (profile != null)
+            switch (slot)
             {
-                if (slot == "jumpsuit" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(InnerClothingSkirt)
-                    || slot == "jumpsuit" && profile.Species == "Harpy" && !string.IsNullOrEmpty(InnerClothingSkirt)) //DeltaV adds this line to prevent Harpies from starting with jumpsuits
+                case "jumpsuit" when profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(InnerClothingSkirt):
+                case "jumpsuit" when profile.Species == "Harpy" && !string.IsNullOrEmpty(InnerClothingSkirt):
                     return InnerClothingSkirt;
-                if (slot == "back" && profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(Satchel))
+                case "back" when profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(Satchel):
                     return Satchel;
-                if (slot == "back" && profile.Backpack == BackpackPreference.Duffelbag && !string.IsNullOrEmpty(Duffelbag))
+                case "back" when profile.Backpack == BackpackPreference.Duffelbag && !string.IsNullOrEmpty(Duffelbag):
                     return Duffelbag;
             }
-
-            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/Salvage/Expeditions/SalvageExpeditions.cs b/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
index fe4d59b81a8..4844a1f3fd3 100644
--- a/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
+++ b/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Salvage.Expeditions.Modifiers;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
@@ -30,7 +31,11 @@ public SalvageExpeditionConsoleState(TimeSpan nextOffer, bool claimed, bool cool
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SalvageExpeditionConsoleComponent : Component
 {
-
+    /// <summary>
+    /// The sound made when spawning a coordinates disk
+    /// </summary>
+    [DataField]
+    public SoundSpecifier PrintSound = new SoundPathSpecifier("/Audio/Machines/terminal_insert_disc.ogg");
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
index 7b9ce841a99..622edc4b62e 100644
--- a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
+++ b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Lock;
-using Content.Shared.Pulling;
-using Content.Shared.Pulling.Components;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Security.Components;
 using Robust.Shared.Physics.Systems;
 
@@ -11,7 +11,7 @@ public sealed class DeployableBarrierSystem : EntitySystem
     [Dependency] private readonly FixtureSystem _fixtures = default!;
     [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] private readonly SharedPullingSystem _pulling = default!;
+    [Dependency] private readonly PullingSystem _pulling = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public override void Initialize()
@@ -54,8 +54,8 @@ private void ToggleBarrierDeploy(EntityUid uid, bool isDeployed, DeployableBarri
                 _physics.SetHard(uid, fixture, false);
         }
 
-        if (TryComp(uid, out SharedPullableComponent? pullable))
-            _pulling.TryStopPull(pullable);
+        if (TryComp(uid, out PullableComponent? pullable))
+            _pulling.TryStopPull(uid, pullable);
 
         SharedPointLightComponent? pointLight = null;
         if (_pointLight.ResolveLight(uid, ref pointLight))
diff --git a/Content.Shared/Shuttles/BUIStates/ShuttleMapInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/ShuttleMapInterfaceState.cs
index cee0daab4be..3cb7cb6412a 100644
--- a/Content.Shared/Shuttles/BUIStates/ShuttleMapInterfaceState.cs
+++ b/Content.Shared/Shuttles/BUIStates/ShuttleMapInterfaceState.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Shuttles.Systems;
 using Content.Shared.Shuttles.UI.MapObjects;
+using Content.Shared.Timing;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Shuttles.BUIStates;
@@ -16,9 +17,9 @@ public sealed class ShuttleMapInterfaceState
     public readonly FTLState FTLState;
 
     /// <summary>
-    /// How long the FTL state takes.
+    /// When the current FTL state starts and ends.
     /// </summary>
-    public float FTLDuration;
+    public StartEndTime FTLTime;
 
     public List<ShuttleBeaconObject> Destinations;
 
@@ -26,12 +27,12 @@ public sealed class ShuttleMapInterfaceState
 
     public ShuttleMapInterfaceState(
         FTLState ftlState,
-        float ftlDuration,
+        StartEndTime ftlTime,
         List<ShuttleBeaconObject> destinations,
         List<ShuttleExclusionObject> exclusions)
     {
         FTLState = ftlState;
-        FTLDuration = ftlDuration;
+        FTLTime = ftlTime;
         Destinations = destinations;
         Exclusions = exclusions;
     }
diff --git a/Content.Shared/Shuttles/Components/FTLDestinationComponent.cs b/Content.Shared/Shuttles/Components/FTLDestinationComponent.cs
index 58cff96c2bc..d4bc536a29b 100644
--- a/Content.Shared/Shuttles/Components/FTLDestinationComponent.cs
+++ b/Content.Shared/Shuttles/Components/FTLDestinationComponent.cs
@@ -23,4 +23,10 @@ public sealed partial class FTLDestinationComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool BeaconsOnly;
+
+    /// <summary>
+    /// Shuttles must use a corresponding CD to travel to this location.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public bool RequireCoordinateDisk = false;
 }
diff --git a/Content.Shared/Shuttles/Components/IFFComponent.cs b/Content.Shared/Shuttles/Components/IFFComponent.cs
index a7e6ac1152b..6bacbd2b5b1 100644
--- a/Content.Shared/Shuttles/Components/IFFComponent.cs
+++ b/Content.Shared/Shuttles/Components/IFFComponent.cs
@@ -10,11 +10,6 @@ namespace Content.Shared.Shuttles.Components;
 [Access(typeof(SharedShuttleSystem))]
 public sealed partial class IFFComponent : Component
 {
-    /// <summary>
-    /// Should we show IFF by default?
-    /// </summary>
-    public const bool ShowIFFDefault = true;
-
     public static readonly Color SelfColor = Color.MediumSpringGreen;
 
     /// <summary>
diff --git a/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs b/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs
index 436c830d20b..2ee03210ba9 100644
--- a/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs
+++ b/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Shared.Shuttles.Components
     [NetworkedComponent]
     public abstract partial class SharedShuttleConsoleComponent : Component
     {
-
+        public static string DiskSlotName = "disk_slot";
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Shuttles/Components/ShuttleDestinationCoordinatesComponent.cs b/Content.Shared/Shuttles/Components/ShuttleDestinationCoordinatesComponent.cs
new file mode 100644
index 00000000000..009dee49d10
--- /dev/null
+++ b/Content.Shared/Shuttles/Components/ShuttleDestinationCoordinatesComponent.cs
@@ -0,0 +1,15 @@
+namespace Content.Shared.Shuttles.Components;
+using Robust.Shared.GameStates;
+
+/// <summary>
+/// Enables a shuttle to travel to a destination with an item inserted into its console
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ShuttleDestinationCoordinatesComponent : Component
+{
+    /// <summary>
+    /// Uid for entity containing the FTLDestination component
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public EntityUid? Destination;
+}
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
index ed687d48f4b..8231e48e2db 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
@@ -28,11 +28,6 @@ public Color GetIFFColor(EntityUid gridUid, bool self = false, IFFComponent? com
 
     public string? GetIFFLabel(EntityUid gridUid, bool self = false, IFFComponent? component = null)
     {
-        if (!IFFComponent.ShowIFFDefault)
-        {
-            return null;
-        }
-
         var entName = MetaData(gridUid).EntityName;
 
         if (self)
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
index 324fd65c860..d859d9f4859 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.UI.MapObjects;
@@ -10,7 +11,8 @@ namespace Content.Shared.Shuttles.Systems;
 
 public abstract partial class SharedShuttleSystem : EntitySystem
 {
-    [Dependency] private   readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] protected readonly SharedMapSystem Maps = default!;
     [Dependency] protected readonly SharedTransformSystem XformSystem = default!;
 
@@ -34,7 +36,7 @@ public override void Initialize()
     /// <summary>
     /// Returns whether an entity can FTL to the specified map.
     /// </summary>
-    public bool CanFTLTo(EntityUid shuttleUid, MapId targetMap)
+    public bool CanFTLTo(EntityUid shuttleUid, MapId targetMap, EntityUid consoleUid)
     {
         var mapUid = _mapManager.GetMapEntityId(targetMap);
         var shuttleMap = _xformQuery.GetComponent(shuttleUid).MapID;
@@ -42,10 +44,40 @@ public bool CanFTLTo(EntityUid shuttleUid, MapId targetMap)
         if (shuttleMap == targetMap)
             return true;
 
-        if (!TryComp<FTLDestinationComponent>(mapUid, out var destination) ||
-            !destination.Enabled)
-        {
+        if (!TryComp<FTLDestinationComponent>(mapUid, out var destination) || !destination.Enabled)
             return false;
+
+        if (destination.RequireCoordinateDisk)
+        {
+            if (!TryComp<ItemSlotsComponent>(consoleUid, out var slot))
+            {
+                return false;
+            }
+
+            if (!_itemSlots.TryGetSlot(consoleUid, SharedShuttleConsoleComponent.DiskSlotName, out var itemSlot, component: slot) || !itemSlot.HasItem)
+            {
+                return false;
+            }
+
+            if (itemSlot.Item is { Valid: true } disk)
+            {
+                ShuttleDestinationCoordinatesComponent? diskCoordinates = null;
+                if (!Resolve(disk, ref diskCoordinates))
+                {
+                    return false;
+                }
+
+                var diskCoords = diskCoordinates.Destination;
+
+                if (diskCoords == null || !TryComp<FTLDestinationComponent>(diskCoords.Value, out var diskDestination) || diskDestination != destination)
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                return false;
+            }
         }
 
         if (HasComp<FTLMapComponent>(mapUid))
@@ -146,7 +178,6 @@ public bool FTLFree(EntityUid shuttleUid, EntityCoordinates coordinates, Angle a
 
         // Just checks if any grids inside of a buffer range at the target position.
         _grids.Clear();
-        var ftlRange = FTLRange;
         var mapCoordinates = coordinates.ToMap(EntityManager, XformSystem);
 
         var ourPos = Maps.GetGridPosition((shuttleUid, shuttlePhysics, shuttleXform));
diff --git a/Content.Shared/Silicons/Laws/Components/IonStormTargetComponent.cs b/Content.Shared/Silicons/Laws/Components/IonStormTargetComponent.cs
index 49ac611ddcb..341767e9cee 100644
--- a/Content.Shared/Silicons/Laws/Components/IonStormTargetComponent.cs
+++ b/Content.Shared/Silicons/Laws/Components/IonStormTargetComponent.cs
@@ -20,7 +20,7 @@ public sealed partial class IonStormTargetComponent : Component
     /// Chance for this borg to be affected at all.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float Chance = 0.5f;
+    public float Chance = 0.8f;
 
     /// <summary>
     /// Chance to replace the lawset with a random one
@@ -32,19 +32,19 @@ public sealed partial class IonStormTargetComponent : Component
     /// Chance to remove a random law.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float RemoveChance = 0.1f;
+    public float RemoveChance = 0.2f;
 
     /// <summary>
     /// Chance to replace a random law with the new one, rather than have it be a glitched-order law.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float ReplaceChance = 0.1f;
+    public float ReplaceChance = 0.2f;
 
     /// <summary>
     /// Chance to shuffle laws after everything is done.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float ShuffleChance = 0.1f;
+    public float ShuffleChance = 0.2f;
 }
 
 /// <summary>
diff --git a/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs
new file mode 100644
index 00000000000..49118d97999
--- /dev/null
+++ b/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Sound.Components;
+
+/// <summary>
+/// Whenever this item is used upon by an entity, with a tag or component within a whitelist, in the hand of a user, play a sound
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class EmitSoundOnInteractUsingComponent : BaseEmitSoundComponent
+{
+    [DataField(required: true)]
+    public EntityWhitelist Whitelist = new();
+}
diff --git a/Content.Shared/Sound/Components/SpamEmitSoundComponent.cs b/Content.Shared/Sound/Components/SpamEmitSoundComponent.cs
new file mode 100644
index 00000000000..149728a5baa
--- /dev/null
+++ b/Content.Shared/Sound/Components/SpamEmitSoundComponent.cs
@@ -0,0 +1,44 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Sound.Components;
+
+/// <summary>
+/// Repeatedly plays a sound with a randomized delay.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class SpamEmitSoundComponent : BaseEmitSoundComponent
+{
+    /// <summary>
+    /// The time at which the next sound will play.
+    /// </summary>
+    [DataField, AutoPausedField, AutoNetworkedField]
+    public TimeSpan NextSound;
+
+    /// <summary>
+    /// The minimum time in seconds between playing the sound.
+    /// </summary>
+    [DataField]
+    public TimeSpan MinInterval = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// The maximum time in seconds between playing the sound.
+    /// </summary>
+    [DataField]
+    public TimeSpan MaxInterval = TimeSpan.FromSeconds(2);
+
+    // Always Pvs.
+    /// <summary>
+    /// Content of a popup message to display whenever the sound plays.
+    /// </summary>
+    [DataField]
+    public LocId? PopUp;
+
+    /// <summary>
+    /// Whether the timer is currently running and sounds are being played.
+    /// Do not set this directly, use <see cref="EmitSoundSystem.SetEnabled"/>
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [Access(typeof(SharedEmitSoundSystem))]
+    public bool Enabled = true;
+}
diff --git a/Content.Shared/Sound/Components/SpamEmitSoundRequirePowerComponent.cs b/Content.Shared/Sound/Components/SpamEmitSoundRequirePowerComponent.cs
new file mode 100644
index 00000000000..b0547ea398e
--- /dev/null
+++ b/Content.Shared/Sound/Components/SpamEmitSoundRequirePowerComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Sound.Components;
+
+/// <summary>
+/// Enables or disables an SpamEmitSound component depending
+/// on the powered state of the entity.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SpamEmitSoundRequirePowerComponent : Component
+{
+}
diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs
index 22ba8e0e3ee..a9a50698d7d 100644
--- a/Content.Shared/Sound/SharedEmitSoundSystem.cs
+++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs
@@ -1,7 +1,10 @@
+using Content.Shared.Audio;
 using Content.Shared.Hands;
+using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Maps;
+using Content.Shared.Mobs;
 using Content.Shared.Popups;
 using Content.Shared.Sound.Components;
 using Content.Shared.Throwing;
@@ -9,6 +12,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Network;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -23,12 +27,12 @@ namespace Content.Shared.Sound;
 [UsedImplicitly]
 public abstract class SharedEmitSoundSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly INetManager _netMan = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!;
     [Dependency] protected readonly IRobustRandom Random = default!;
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private   readonly SharedAmbientSoundSystem _ambient = default!;
+    [Dependency] private   readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
 
     public override void Initialize()
@@ -41,8 +45,23 @@ public override void Initialize()
         SubscribeLocalEvent<EmitSoundOnActivateComponent, ActivateInWorldEvent>(OnEmitSoundOnActivateInWorld);
         SubscribeLocalEvent<EmitSoundOnPickupComponent, GotEquippedHandEvent>(OnEmitSoundOnPickup);
         SubscribeLocalEvent<EmitSoundOnDropComponent, DroppedEvent>(OnEmitSoundOnDrop);
+        SubscribeLocalEvent<EmitSoundOnInteractUsingComponent, InteractUsingEvent>(OnEmitSoundOnInteractUsing);
 
         SubscribeLocalEvent<EmitSoundOnCollideComponent, StartCollideEvent>(OnEmitSoundOnCollide);
+
+        SubscribeLocalEvent<SoundWhileAliveComponent, MobStateChangedEvent>(OnMobState);
+    }
+
+    private void OnMobState(Entity<SoundWhileAliveComponent> entity, ref MobStateChangedEvent args)
+    {
+        // Disable this component rather than removing it because it can be brought back to life.
+        if (TryComp<SpamEmitSoundComponent>(entity, out var comp))
+        {
+            comp.Enabled = args.NewMobState == MobState.Alive;
+            Dirty(entity.Owner, comp);
+        }
+
+        _ambient.SetAmbience(entity.Owner, args.NewMobState != MobState.Dead);
     }
 
     private void OnEmitSpawnOnInit(EntityUid uid, EmitSoundOnSpawnComponent component, MapInitEvent args)
@@ -54,7 +73,7 @@ private void OnEmitSoundOnLand(EntityUid uid, BaseEmitSoundComponent component,
     {
         if (!args.PlaySound ||
             !TryComp<TransformComponent>(uid, out var xform) ||
-            !_mapManager.TryGetGrid(xform.GridUid, out var grid))
+            !TryComp<MapGridComponent>(xform.GridUid, out var grid))
         {
             return;
         }
@@ -102,6 +121,13 @@ private void OnEmitSoundOnDrop(EntityUid uid, EmitSoundOnDropComponent component
         TryEmitSound(uid, component, args.User);
     }
 
+    private void OnEmitSoundOnInteractUsing(Entity<EmitSoundOnInteractUsingComponent> ent, ref InteractUsingEvent args)
+    {
+        if (ent.Comp.Whitelist.IsValid(args.Used, EntityManager))
+        {
+            TryEmitSound(ent, ent.Comp, args.User);
+        }
+    }
     protected void TryEmitSound(EntityUid uid, BaseEmitSoundComponent component, EntityUid? user=null, bool predict=true)
     {
         if (component.Sound == null)
@@ -124,7 +150,7 @@ private void OnEmitSoundOnCollide(EntityUid uid, EmitSoundOnCollideComponent com
             !args.OtherFixture.Hard ||
             !TryComp<PhysicsComponent>(uid, out var physics) ||
             physics.LinearVelocity.Length() < component.MinimumVelocity ||
-            _timing.CurTime < component.NextSound ||
+            Timing.CurTime < component.NextSound ||
             MetaData(uid).EntityPaused)
         {
             return;
@@ -136,7 +162,7 @@ private void OnEmitSoundOnCollide(EntityUid uid, EmitSoundOnCollideComponent com
 
         var fraction = MathF.Min(1f, (physics.LinearVelocity.Length() - component.MinimumVelocity) / MaxVolumeVelocity);
         var volume = MinVolume + (MaxVolume - MinVolume) * fraction;
-        component.NextSound = _timing.CurTime + EmitSoundOnCollideComponent.CollideCooldown;
+        component.NextSound = Timing.CurTime + EmitSoundOnCollideComponent.CollideCooldown;
         var sound = component.Sound;
 
         if (_netMan.IsServer && sound != null)
@@ -144,4 +170,8 @@ private void OnEmitSoundOnCollide(EntityUid uid, EmitSoundOnCollideComponent com
             _audioSystem.PlayPvs(_audioSystem.GetSound(sound), uid, AudioParams.Default.WithVolume(volume));
         }
     }
+
+    public virtual void SetEnabled(Entity<SpamEmitSoundComponent?> entity, bool enabled)
+    {
+    }
 }
diff --git a/Content.Shared/Sound/SharedSpamEmitSoundRequirePowerSystem.cs b/Content.Shared/Sound/SharedSpamEmitSoundRequirePowerSystem.cs
new file mode 100644
index 00000000000..ad44cba8a59
--- /dev/null
+++ b/Content.Shared/Sound/SharedSpamEmitSoundRequirePowerSystem.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.Sound;
+
+public abstract partial class SharedSpamEmitSoundRequirePowerSystem : EntitySystem
+{
+    [Dependency] protected readonly SharedEmitSoundSystem EmitSound = default!;
+}
diff --git a/Content.Shared/Speech/SpeechVerbPrototype.cs b/Content.Shared/Speech/SpeechVerbPrototype.cs
index 7ed1705f115..951cac64f76 100644
--- a/Content.Shared/Speech/SpeechVerbPrototype.cs
+++ b/Content.Shared/Speech/SpeechVerbPrototype.cs
@@ -43,4 +43,10 @@ public sealed partial class SpeechVerbPrototype : IPrototype
     /// </summary>
     [DataField("priority")]
     public int Priority = 0;
+
+    /// <summary>
+    /// Name shown in the voicemask UI for this verb.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Name = string.Empty;
 }
diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
index fa04a50f8b0..529e321f8da 100644
--- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
+++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
@@ -4,7 +4,6 @@
 using Content.Shared.Doors.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared.Paint;
 using Content.Shared.SprayPainter.Components;
 using Content.Shared.SprayPainter.Prototypes;
 using Robust.Shared.Audio.Systems;
@@ -130,8 +129,6 @@ private void OnAirlockInteract(Entity<PaintableAirlockComponent> ent, ref Intera
             return;
         }
 
-        RemComp<PaintedComponent>(ent);
-
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, painter.AirlockSprayTime, new SprayPainterDoorDoAfterEvent(sprite, style.Department), args.Used, target: ent, used: args.Used)
         {
             BreakOnTargetMove = true,
diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs
index 8cdcff883b1..55b746f2ce4 100644
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ b/Content.Shared/Station/SharedStationSpawningSystem.cs
@@ -3,6 +3,9 @@
 using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
+using Content.Shared.Storage;
+using Content.Shared.Storage.EntitySystems;
+using Robust.Shared.Collections;
 
 namespace Content.Shared.Station;
 
@@ -10,6 +13,8 @@ public abstract class SharedStationSpawningSystem : EntitySystem
 {
     [Dependency] protected readonly InventorySystem InventorySystem = default!;
     [Dependency] private   readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private   readonly SharedStorageSystem _storage = default!;
+    [Dependency] private   readonly SharedTransformSystem _xformSystem = default!;
 
     /// <summary>
     /// Equips starting gear onto the given entity.
@@ -24,26 +29,51 @@ public void EquipStartingGear(EntityUid entity, StartingGearPrototype startingGe
             foreach (var slot in slotDefinitions)
             {
                 var equipmentStr = startingGear.GetGear(slot.Name, profile);
-                if (!string.IsNullOrEmpty(equipmentStr))
-                {
-                    var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, EntityManager.GetComponent<TransformComponent>(entity).Coordinates);
-                    InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, true, force:true);
-                }
+                if (string.IsNullOrEmpty(equipmentStr))
+                    continue;
+
+                var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, EntityManager.GetComponent<TransformComponent>(entity).Coordinates);
+                InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, true, force:true);
             }
         }
 
-        if (!TryComp(entity, out HandsComponent? handsComponent))
+        if (TryComp(entity, out HandsComponent? handsComponent))
             return;
+        {
+            var inhand = startingGear.Inhand;
+            var coords = EntityManager.GetComponent<TransformComponent>(entity).Coordinates;
+            foreach (var prototype in inhand)
+            {
+                var inhandEntity = EntityManager.SpawnEntity(prototype, coords);
 
-        var inhand = startingGear.Inhand;
-        var coords = EntityManager.GetComponent<TransformComponent>(entity).Coordinates;
-        foreach (var prototype in inhand)
+                if (_handsSystem.TryGetEmptyHand(entity, out var emptyHand, handsComponent))
+                    _handsSystem.TryPickup(entity, inhandEntity, emptyHand, checkActionBlocker: false,
+                        handsComp: handsComponent);
+            }
+        }
+
+        if (startingGear.Storage.Count > 0)
         {
-            var inhandEntity = EntityManager.SpawnEntity(prototype, coords);
+            var coords = _xformSystem.GetMapCoordinates(entity);
+            var ents = new ValueList<EntityUid>();
+            TryComp(entity, out InventoryComponent? inventoryComp);
 
-            if (_handsSystem.TryGetEmptyHand(entity, out var emptyHand, handsComponent))
+            foreach (var (slot, entProtos) in startingGear.Storage)
             {
-                _handsSystem.TryPickup(entity, inhandEntity, emptyHand, checkActionBlocker: false, handsComp: handsComponent);
+                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)
+                    || !TryComp(slotEnt, out StorageComponent? storage))
+                    continue;
+
+                foreach (var ent in ents)
+                    _storage.Insert(slotEnt.Value, ent, out _, storageComp: storage, playSound: false);
             }
         }
     }
diff --git a/Content.Shared/StatusIcon/StatusIconPrototype.cs b/Content.Shared/StatusIcon/StatusIconPrototype.cs
index a313f55c057..b520b185de2 100644
--- a/Content.Shared/StatusIcon/StatusIconPrototype.cs
+++ b/Content.Shared/StatusIcon/StatusIconPrototype.cs
@@ -40,6 +40,12 @@ public int CompareTo(StatusIconData? other)
     /// </summary>
     [DataField]
     public StatusIconLayer Layer = StatusIconLayer.Base;
+
+    /// <summary>
+    /// Sets if the icon should be rendered with or without the effect of lighting.
+    /// </summary>
+    [DataField]
+    public bool IsShaded;
 }
 
 /// <summary>
diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
index b4ac2cde756..d81ad754d1e 100644
--- a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
@@ -59,7 +59,7 @@ private bool Update(EntityUid uid, StepTriggerComponent component, TransformComp
 
         if (component.Blacklist != null && TryComp<MapGridComponent>(transform.GridUid, out var grid))
         {
-            var positon = _map.LocalToTile(uid, grid, transform.Coordinates);
+            var positon = _map.LocalToTile(transform.GridUid.Value, grid, transform.Coordinates);
             var anch = _map.GetAnchoredEntitiesEnumerator(uid, grid, positon);
 
             while (anch.MoveNext(out var ent))
diff --git a/Content.Shared/Storage/Components/SecretStashComponent.cs b/Content.Shared/Storage/Components/SecretStashComponent.cs
new file mode 100644
index 00000000000..8595f79ca57
--- /dev/null
+++ b/Content.Shared/Storage/Components/SecretStashComponent.cs
@@ -0,0 +1,90 @@
+using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Item;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+using Content.Shared.Tools;
+using Robust.Shared.GameStates;
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+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.
+    /// </summary>
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    [Access(typeof(SecretStashSystem))]
+    public sealed partial class SecretStashComponent : Component
+    {
+        /// <summary>
+        ///     Max item size that can be fitted 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.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool ToggleOpen;
+
+        /// <summary>
+        /// Prying the door.
+        /// </summary>
+        [DataField]
+        public float PryDoorTime = 1f;
+
+        [DataField]
+        public ProtoId<ToolQualityPrototype> PryingQuality = "Prying";
+
+        /// <summary>
+        /// Is stash openable?.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool OpenableStash = false;
+
+        /// <summary>
+        ///     IC secret stash name. For example "the toilet cistern".
+        ///     If empty string, will replace it with entity name in init.
+        /// </summary>
+        [DataField]
+        public string SecretPartName { get; set; } = "";
+
+        [DataField, AutoNetworkedField]
+        public string ExamineStash = "comp-secret-stash-on-examine-found-hidden-item";
+
+        /// <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/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
index 04f7231416f..da7c3aa89a0 100644
--- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
@@ -19,17 +19,16 @@ public sealed class DumpableSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedDisposalUnitSystem _disposalUnitSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
-    private EntityQuery<TransformComponent> _xformQuery;
+    private EntityQuery<ItemComponent> _itemQuery;
 
     public override void Initialize()
     {
         base.Initialize();
-        _xformQuery = GetEntityQuery<TransformComponent>();
+        _itemQuery = GetEntityQuery<ItemComponent>();
         SubscribeLocalEvent<DumpableComponent, AfterInteractEvent>(OnAfterInteract, after: new[]{ typeof(SharedEntityStorageSystem) });
         SubscribeLocalEvent<DumpableComponent, GetVerbsEvent<AlternativeVerb>>(AddDumpVerb);
         SubscribeLocalEvent<DumpableComponent, GetVerbsEvent<UtilityVerb>>(AddUtilityVerbs);
@@ -111,7 +110,7 @@ private void AddUtilityVerbs(EntityUid uid, DumpableComponent dumpable, GetVerbs
         }
     }
 
-    private void StartDoAfter(EntityUid storageUid, EntityUid? targetUid, EntityUid userUid, DumpableComponent dumpable)
+    private void StartDoAfter(EntityUid storageUid, EntityUid targetUid, EntityUid userUid, DumpableComponent dumpable)
     {
         if (!TryComp<StorageComponent>(storageUid, out var storage))
             return;
@@ -120,7 +119,7 @@ private void StartDoAfter(EntityUid storageUid, EntityUid? targetUid, EntityUid
 
         foreach (var entity in storage.Container.ContainedEntities)
         {
-            if (!TryComp<ItemComponent>(entity, out var itemComp) ||
+            if (!_itemQuery.TryGetComponent(entity, out var itemComp) ||
                 !_prototypeManager.TryIndex(itemComp.Size, out var itemSize))
             {
                 continue;
@@ -139,33 +138,16 @@ private void StartDoAfter(EntityUid storageUid, EntityUid? targetUid, EntityUid
         });
     }
 
-    private void OnDoAfter(EntityUid uid, DumpableComponent component, DoAfterEvent args)
+    private void OnDoAfter(EntityUid uid, DumpableComponent component, DumpableDoAfterEvent args)
     {
-        if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage))
+        if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage) || storage.Container.ContainedEntities.Count == 0)
             return;
 
-        Queue<EntityUid> dumpQueue = new();
-        foreach (var entity in storage.Container.ContainedEntities)
-        {
-            dumpQueue.Enqueue(entity);
-        }
-
-        if (dumpQueue.Count == 0)
-            return;
-
-        foreach (var entity in dumpQueue)
-        {
-            var transform = Transform(entity);
-            _container.AttachParentToContainerOrGrid((entity, transform));
-            _transformSystem.SetLocalPositionRotation(entity, transform.LocalPosition + _random.NextVector2Box() / 2, _random.NextAngle(), transform);
-        }
-
-        if (args.Args.Target == null)
-            return;
+        var dumpQueue = new Queue<EntityUid>(storage.Container.ContainedEntities);
 
         var dumped = false;
 
-        if (_disposalUnitSystem.HasDisposals(args.Args.Target.Value))
+        if (_disposalUnitSystem.HasDisposals(args.Args.Target))
         {
             dumped = true;
 
@@ -174,22 +156,31 @@ private void OnDoAfter(EntityUid uid, DumpableComponent component, DoAfterEvent
                 _disposalUnitSystem.DoInsertDisposalUnit(args.Args.Target.Value, entity, args.Args.User);
             }
         }
-        else if (HasComp<PlaceableSurfaceComponent>(args.Args.Target.Value))
+        else if (HasComp<PlaceableSurfaceComponent>(args.Args.Target))
         {
             dumped = true;
 
-            var targetPos = _xformQuery.GetComponent(args.Args.Target.Value).LocalPosition;
+            var (targetPos, targetRot) = _transformSystem.GetWorldPositionRotation(args.Args.Target.Value);
+
+            foreach (var entity in dumpQueue)
+            {
+                _transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, targetRot);
+            }
+        }
+        else
+        {
+            var targetPos = _transformSystem.GetWorldPosition(uid);
 
             foreach (var entity in dumpQueue)
             {
-                _transformSystem.SetLocalPosition(entity, targetPos + _random.NextVector2Box() / 4);
+                var transform = Transform(entity);
+                _transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, _random.NextAngle(), transform);
             }
         }
 
         if (dumped)
         {
-            // TODO: Predicted when above predicted
-            _audio.PlayPvs(component.DumpSound, uid);
+            _audio.PlayPredicted(component.DumpSound, uid, args.User);
         }
     }
 }
diff --git a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
new file mode 100644
index 00000000000..9aee1b982e0
--- /dev/null
+++ b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
@@ -0,0 +1,222 @@
+using Content.Shared.Popups;
+using Content.Shared.Storage.Components;
+using Content.Shared.Destructible;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Item;
+using Robust.Shared.Containers;
+using Content.Shared.Interaction;
+using Content.Shared.Tools.Systems;
+using Content.Shared.Examine;
+
+namespace Content.Shared.Storage.EntitySystems
+{
+    /// <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);
+        }
+
+        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);
+        }
+
+        /// <summary>
+        ///     Is there something inside secret stash item container?
+        /// </summary>
+        public bool HasItemInside(EntityUid uid, SecretStashComponent? component = null)
+        {
+            if (!Resolve(uid, ref component))
+                return false;
+            return component.ItemContainer.ContainedEntity != null;
+        }
+
+        private void OnInteractUsing(EntityUid uid, SecretStashComponent component, InteractUsingEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            if (!component.OpenableStash)
+                return;
+
+            // 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(EntityUid uid, SecretStashComponent component, InteractHandEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            if (!component.OpenableStash)
+                return;
+
+            // trying to get something from stash?
+            if (component.ToggleOpen)
+            {
+                var gotItem = TryGetItem(uid, args.User);
+                if (gotItem)
+                {
+                    args.Handled = true;
+                    return;
+                }
+            }
+            args.Handled = true;
+        }
+
+        private void OnSecretStashPried(EntityUid uid, SecretStashComponent component, StashPryDoAfterEvent args)
+        {
+            if (args.Cancelled)
+                return;
+
+            ToggleOpen(uid, component);
+        }
+
+        public void ToggleOpen(EntityUid uid, SecretStashComponent? component = null, MetaDataComponent? meta = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+
+            component.ToggleOpen = !component.ToggleOpen;
+
+            UpdateAppearance(uid, component);
+            Dirty(uid, component, meta);
+        }
+
+        private void UpdateAppearance(EntityUid uid, SecretStashComponent? component = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+
+            _appearance.SetData(uid, StashVisuals.DoorVisualState, component.ToggleOpen ? DoorVisualState.DoorOpen : DoorVisualState.DoorClosed);
+        }
+
+        /// <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;
+            }
+
+            // 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;
+            }
+
+            // try to move item from hands to stash container
+            if (!_handsSystem.TryDropIntoContainer(userUid, itemToHideUid, container))
+            {
+                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;
+        }
+
+        /// <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;
+            }
+
+            _handsSystem.PickupOrDrop(userUid, container.ContainedEntity.Value, handsComp: hands);
+
+            // show success message
+            var successMsg = Loc.GetString("comp-secret-stash-action-get-item-found-something",
+                ("stash", GetSecretPartName(uid, component)));
+            _popupSystem.PopupClient(successMsg, uid, userUid);
+
+            return true;
+        }
+
+        private void OnExamine(EntityUid uid, SecretStashComponent component, ExaminedEvent args)
+        {
+            if (args.IsInDetailsRange && component.ToggleOpen)
+            {
+                if (HasItemInside(uid))
+                {
+                    var msg = Loc.GetString(component.ExamineStash);
+                    args.PushMarkup(msg);
+                }
+            }
+        }
+
+        private string GetSecretPartName(EntityUid uid, SecretStashComponent stash)
+        {
+            if (stash.SecretPartName != "")
+                return Loc.GetString(stash.SecretPartName);
+
+            var entityName = Loc.GetString("comp-secret-stash-secret-part-name", ("this", uid));
+
+            return entityName;
+        }
+    }
+}
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 11075b4a4c7..966ec02b805 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Coordinates;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
 using Content.Shared.Hands.Components;
@@ -12,6 +13,7 @@
 using Content.Shared.Item;
 using Content.Shared.Lock;
 using Content.Shared.Nyanotrasen.Item.PseudoItem;
+using Content.Shared.Materials;
 using Content.Shared.Placeable;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
@@ -96,6 +98,10 @@ public override void Initialize()
         SubscribeAllEvent<StorageSetItemLocationEvent>(OnSetItemLocation);
         SubscribeAllEvent<StorageInsertItemIntoLocationEvent>(OnInsertItemIntoLocation);
         SubscribeAllEvent<StorageRemoveItemEvent>(OnRemoveItem);
+        SubscribeAllEvent<StorageSaveItemLocationEvent>(OnSaveItemLocation);
+
+        SubscribeLocalEvent<StorageComponent, GotReclaimedEvent>(OnReclaimed);
+
         UpdatePrototypeCache();
     }
 
@@ -113,7 +119,8 @@ private void OnStorageGetState(EntityUid uid, StorageComponent component, ref Co
             Grid = new List<Box2i>(component.Grid),
             IsUiOpen = component.IsUiOpen,
             MaxItemSize = component.MaxItemSize,
-            StoredItems = storedItems
+            StoredItems = storedItems,
+            SavedLocations = component.SavedLocations
         };
     }
 
@@ -134,6 +141,8 @@ private void OnStorageHandleState(EntityUid uid, StorageComponent component, ref
             var ent = EnsureEntity<StorageComponent>(nent, uid);
             component.StoredItems[ent] = location;
         }
+
+        component.SavedLocations = state.SavedLocations;
     }
 
     public override void Shutdown()
@@ -389,6 +398,11 @@ private void OnDoAfter(EntityUid uid, StorageComponent component, AreaPickupDoAf
         args.Handled = true;
     }
 
+    private void OnReclaimed(EntityUid uid, StorageComponent storageComp, GotReclaimedEvent args)
+    {
+        _containerSystem.EmptyContainer(storageComp.Container, destination: args.ReclaimerCoordinates);
+    }
+
     private void OnDestroy(EntityUid uid, StorageComponent storageComp, DestructionEventArgs args)
     {
         var coordinates = TransformSystem.GetMoverCoordinates(uid);
@@ -527,6 +541,35 @@ private void OnInsertItemIntoLocation(StorageInsertItemIntoLocationEvent msg, En
         InsertAt((storageEnt, storageComp), (itemEnt, null), 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)
+            return;
+
+        var storage = GetEntity(msg.Storage);
+        var item = GetEntity(msg.Item);
+
+        if (!TryComp<StorageComponent>(storage, out var storageComp))
+            return;
+
+        if (!_ui.TryGetUi(storage, StorageComponent.StorageUiKey.Key, out var bui) ||
+            !bui.SubscribedSessions.Contains(args.SenderSession))
+            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);
+    }
+
     private void OnBoundUIOpen(EntityUid uid, StorageComponent storageComp, BoundUIOpenedEvent args)
     {
         if (!storageComp.IsUiOpen)
@@ -939,6 +982,10 @@ public bool TryGetAvailableGridSpace(
         if (!Resolve(storageEnt, ref storageEnt.Comp) || !Resolve(itemEnt, ref itemEnt.Comp))
             return false;
 
+        // if the item has an available saved location, use that
+        if (FindSavedLocation(storageEnt, itemEnt, out storageLocation))
+            return true;
+
         var storageBounding = storageEnt.Comp.Grid.GetBoundingBox();
 
         Angle startAngle;
@@ -981,6 +1028,76 @@ public bool TryGetAvailableGridSpace(
         return false;
     }
 
+    /// <summary>
+    /// Tries to find a saved location for an item from its name.
+    /// If none are saved or they are all blocked nothing is returned.
+    /// </summary>
+    public bool FindSavedLocation(
+        Entity<StorageComponent?> ent,
+        Entity<ItemComponent?> item,
+        [NotNullWhen(true)] out ItemStorageLocation? storageLocation)
+    {
+        storageLocation = null;
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        var name = Name(item);
+        if (!ent.Comp.SavedLocations.TryGetValue(name, out var list))
+            return false;
+
+        foreach (var location in list)
+        {
+            if (ItemFitsInGridLocation(item, ent, location))
+            {
+                storageLocation = location;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Saves an item's location in the grid for later insertion to use.
+    /// </summary>
+    public void SaveItemLocation(Entity<StorageComponent?> ent, Entity<MetaDataComponent?> item)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        // needs to actually be stored in it somewhere to save it
+        if (!ent.Comp.StoredItems.TryGetValue(item, out var location))
+            return;
+
+        var name = Name(item, item.Comp);
+        if (ent.Comp.SavedLocations.TryGetValue(name, out var list))
+        {
+            // iterate to make sure its not already been saved
+            for (int i = 0; i < list.Count; i++)
+            {
+                var saved = list[i];
+                
+                if (saved == location)
+                {
+                    list.Remove(location);
+                    return;
+                }
+            }
+
+            list.Add(location);
+        }
+        else
+        {
+            list = new List<ItemStorageLocation>()
+            {
+                location
+            };
+            ent.Comp.SavedLocations[name] = list;
+        }
+
+        Dirty(ent, ent.Comp);
+    }
+
     /// <summary>
     /// Checks if an item fits into a specific spot on a storage grid.
     /// </summary>
@@ -1159,6 +1276,8 @@ protected sealed class StorageComponentState : ComponentState
 
         public Dictionary<NetEntity, ItemStorageLocation> StoredItems = new();
 
+        public Dictionary<string, List<ItemStorageLocation>> SavedLocations = new();
+
         public List<Box2i> Grid = new();
 
         public ProtoId<ItemSizePrototype>? MaxItemSize;
diff --git a/Content.Shared/Storage/ItemStorageLocation.cs b/Content.Shared/Storage/ItemStorageLocation.cs
index a43be5a44fa..25d55e1e1ae 100644
--- a/Content.Shared/Storage/ItemStorageLocation.cs
+++ b/Content.Shared/Storage/ItemStorageLocation.cs
@@ -8,16 +8,16 @@ public partial record struct ItemStorageLocation
     /// <summary>
     /// The rotation, stored a cardinal direction in order to reduce rounding errors.
     /// </summary>
-    [DataField]
-    private Direction _rotation;
+    [DataField("_rotation")]
+    public Direction Direction;
 
     /// <summary>
     /// The rotation of the piece in storage.
     /// </summary>
     public Angle Rotation
     {
-        get => _rotation.ToAngle();
-        set => _rotation = value.GetCardinalDir();
+        get => Direction.ToAngle();
+        set => Direction = value.GetCardinalDir();
     }
 
     /// <summary>
diff --git a/Content.Shared/Storage/StorageComponent.cs b/Content.Shared/Storage/StorageComponent.cs
index 98e80de0253..2cae12f07a8 100644
--- a/Content.Shared/Storage/StorageComponent.cs
+++ b/Content.Shared/Storage/StorageComponent.cs
@@ -32,6 +32,14 @@ public sealed partial class StorageComponent : Component
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public Dictionary<EntityUid, ItemStorageLocation> StoredItems = new();
 
+        /// <summary>
+        /// A dictionary storing each saved item to its location in the grid.
+        /// When trying to quick insert an item, if there is an empty location with the same name it will be placed there.
+        /// Multiple items with the same name can be saved, they will be checked individually.
+        /// </summary>
+        [DataField]
+        public Dictionary<string, List<ItemStorageLocation>> SavedLocations = new();
+
         /// <summary>
         /// A list of boxes that comprise a combined grid that determines the location that items can be stored.
         /// </summary>
@@ -171,6 +179,20 @@ public StorageInsertItemIntoLocationEvent(NetEntity itemEnt, NetEntity storageEn
         }
     }
 
+    [Serializable, NetSerializable]
+    public sealed class StorageSaveItemLocationEvent : EntityEventArgs
+    {
+        public readonly NetEntity Item;
+
+        public readonly NetEntity Storage;
+
+        public StorageSaveItemLocationEvent(NetEntity item, NetEntity storage)
+        {
+            Item = item;
+            Storage = storage;
+        }
+    }
+
 
     /// <summary>
     /// Network event for displaying an animation of entities flying into a storage entity
diff --git a/Content.Shared/Store/ListingLocalisationHelpers.cs b/Content.Shared/Store/ListingLocalisationHelpers.cs
new file mode 100644
index 00000000000..882300109ce
--- /dev/null
+++ b/Content.Shared/Store/ListingLocalisationHelpers.cs
@@ -0,0 +1,40 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Store;
+
+public static class ListingLocalisationHelpers
+{
+    /// <summary>
+    /// ListingData's Name field can be either a localisation string or the actual entity's name.
+    /// This function gets a localised name from the localisation string if it exists, and if not, it gets the entity's name.
+    /// If neither a localised string exists, or an associated entity name, it will return the value of the "Name" field.
+    /// </summary>
+    public static string GetLocalisedNameOrEntityName(ListingData listingData, IPrototypeManager prototypeManager)
+    {
+        var name = string.Empty;
+
+        if (listingData.Name != null)
+            name = Loc.GetString(listingData.Name);
+        else if (listingData.ProductEntity != null)
+            name = prototypeManager.Index(listingData.ProductEntity.Value).Name;
+
+        return name;
+    }
+
+    /// <summary>
+    /// ListingData's Description field can be either a localisation string or the actual entity's description.
+    /// This function gets a localised description from the localisation string if it exists, and if not, it gets the entity's description.
+    /// If neither a localised string exists, or an associated entity description, it will return the value of the "Description" field.
+    /// </summary>
+    public static string GetLocalisedDescriptionOrEntityDescription(ListingData listingData, IPrototypeManager prototypeManager)
+    {
+        var desc = string.Empty;
+
+        if (listingData.Description != null)
+            desc = Loc.GetString(listingData.Description);
+        else if (listingData.ProductEntity != null)
+            desc = prototypeManager.Index(listingData.ProductEntity.Value).Description;
+
+        return desc;
+    }
+}
diff --git a/Content.Shared/Store/ListingPrototype.cs b/Content.Shared/Store/ListingPrototype.cs
index 25245327ce9..d3d2e13cdfd 100644
--- a/Content.Shared/Store/ListingPrototype.cs
+++ b/Content.Shared/Store/ListingPrototype.cs
@@ -2,10 +2,6 @@
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Store;
@@ -26,57 +22,57 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
     /// <summary>
     /// The name of the listing. If empty, uses the entity's name (if present)
     /// </summary>
-    [DataField("name")]
-    public string Name = string.Empty;
+    [DataField]
+    public string? Name;
 
     /// <summary>
     /// The description of the listing. If empty, uses the entity's description (if present)
     /// </summary>
-    [DataField("description")]
-    public string Description = string.Empty;
+    [DataField]
+    public string? Description;
 
     /// <summary>
     /// The categories that this listing applies to. Used for filtering a listing for a store.
     /// </summary>
-    [DataField("categories", required: true, customTypeSerializer: typeof(PrototypeIdListSerializer<StoreCategoryPrototype>))]
-    public List<string> Categories = new();
+    [DataField]
+    public List<ProtoId<StoreCategoryPrototype>> Categories = new();
 
     /// <summary>
     /// The cost of the listing. String represents the currency type while the FixedPoint2 represents the amount of that currency.
     /// </summary>
-    [DataField("cost", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<FixedPoint2, CurrencyPrototype>))]
-    public Dictionary<string, FixedPoint2> Cost = new();
+    [DataField]
+    public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> Cost = new();
 
     /// <summary>
-    /// Specific customizeable conditions that determine whether or not the listing can be purchased.
+    /// Specific customizable conditions that determine whether or not the listing can be purchased.
     /// </summary>
     [NonSerialized]
-    [DataField("conditions", serverOnly: true)]
+    [DataField(serverOnly: true)]
     public List<ListingCondition>? Conditions;
 
     /// <summary>
     /// The icon for the listing. If null, uses the icon for the entity or action.
     /// </summary>
-    [DataField("icon")]
+    [DataField]
     public SpriteSpecifier? Icon;
 
     /// <summary>
     /// The priority for what order the listings will show up in on the menu.
     /// </summary>
-    [DataField("priority")]
-    public int Priority = 0;
+    [DataField]
+    public int Priority;
 
     /// <summary>
     /// The entity that is given when the listing is purchased.
     /// </summary>
-    [DataField("productEntity", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string? ProductEntity;
+    [DataField]
+    public EntProtoId? ProductEntity;
 
     /// <summary>
     /// The action that is given when the listing is purchased.
     /// </summary>
-    [DataField("productAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string? ProductAction;
+    [DataField]
+    public EntProtoId? ProductAction;
 
     /// <summary>
     ///     The listing ID of the related upgrade listing. Can be used to link a <see cref="ProductAction"/> to an
@@ -95,7 +91,7 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
     /// <summary>
     /// The event that is broadcast when the listing is purchased.
     /// </summary>
-    [DataField("productEvent")]
+    [DataField]
     public object? ProductEvent;
 
     [DataField]
@@ -104,13 +100,14 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
     /// <summary>
     /// used internally for tracking how many times an item was purchased.
     /// </summary>
-    public int PurchaseAmount = 0;
+    [DataField]
+    public int PurchaseAmount;
 
     /// <summary>
     /// Used to delay purchase of some items.
     /// </summary>
-    [DataField("restockTime")]
-    public int RestockTime;
+    [DataField]
+    public TimeSpan RestockTime = TimeSpan.Zero;
 
     public bool Equals(ListingData? listing)
     {
@@ -173,14 +170,10 @@ public object Clone()
     }
 }
 
-//<inheritdoc>
 /// <summary>
 ///     Defines a set item listing that is available in a store
 /// </summary>
 [Prototype("listing")]
 [Serializable, NetSerializable]
 [DataDefinition]
-public sealed partial class ListingPrototype : ListingData, IPrototype
-{
-
-}
+public sealed partial class ListingPrototype : ListingData, IPrototype;
diff --git a/Content.Shared/Store/StoreUi.cs b/Content.Shared/Store/StoreUi.cs
index 27a8ada1855..ee4da6991f6 100644
--- a/Content.Shared/Store/StoreUi.cs
+++ b/Content.Shared/Store/StoreUi.cs
@@ -1,4 +1,5 @@
 using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Store;
@@ -14,13 +15,13 @@ public sealed class StoreUpdateState : BoundUserInterfaceState
 {
     public readonly HashSet<ListingData> Listings;
 
-    public readonly Dictionary<string, FixedPoint2> Balance;
+    public readonly Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> Balance;
 
     public readonly bool ShowFooter;
 
     public readonly bool AllowRefund;
 
-    public StoreUpdateState(HashSet<ListingData> listings, Dictionary<string, FixedPoint2> balance, bool showFooter, bool allowRefund)
+    public StoreUpdateState(HashSet<ListingData> listings, Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> balance, bool showFooter, bool allowRefund)
     {
         Listings = listings;
         Balance = balance;
@@ -46,9 +47,7 @@ public StoreInitializeState(string name)
 [Serializable, NetSerializable]
 public sealed class StoreRequestUpdateInterfaceMessage : BoundUserInterfaceMessage
 {
-    public StoreRequestUpdateInterfaceMessage()
-    {
-    }
+
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Strip/Components/StrippableComponent.cs b/Content.Shared/Strip/Components/StrippableComponent.cs
index 4faca4d8f21..00725808297 100644
--- a/Content.Shared/Strip/Components/StrippableComponent.cs
+++ b/Content.Shared/Strip/Components/StrippableComponent.cs
@@ -32,12 +32,12 @@ public sealed class StrippingSlotButtonPressed(string slot, bool isHand) : Bound
     public sealed class StrippingEnsnareButtonPressed : BoundUserInterfaceMessage;
 
     [ByRefEvent]
-    public abstract class BaseBeforeStripEvent(TimeSpan initialTime, bool stealth = false) : EntityEventArgs, IInventoryRelayEvent
+    public abstract class BaseBeforeStripEvent(TimeSpan initialTime, ThievingStealth stealth = ThievingStealth.Obvious) : EntityEventArgs, IInventoryRelayEvent
     {
         public readonly TimeSpan InitialTime = initialTime;
         public float Multiplier = 1f;
         public TimeSpan Additive = TimeSpan.Zero;
-        public bool Stealth = stealth;
+        public ThievingStealth Stealth = stealth;
 
         public TimeSpan Time => TimeSpan.FromSeconds(MathF.Max(InitialTime.Seconds * Multiplier + Additive.Seconds, 0f));
 
@@ -51,7 +51,7 @@ public abstract class BaseBeforeStripEvent(TimeSpan initialTime, bool stealth =
     ///     This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
     /// </remarks>
     [ByRefEvent]
-    public sealed class BeforeStripEvent(TimeSpan initialTime, bool stealth = false) : BaseBeforeStripEvent(initialTime, stealth);
+    public sealed class BeforeStripEvent(TimeSpan initialTime, ThievingStealth stealth = ThievingStealth.Obvious) : BaseBeforeStripEvent(initialTime, stealth);
 
     /// <summary>
     ///     Used to modify strip times. Raised directed at the target.
@@ -60,7 +60,7 @@ public sealed class BeforeStripEvent(TimeSpan initialTime, bool stealth = false)
     ///     This is also used by some stripping related interactions, i.e., interactions with items that are currently equipped by another player.
     /// </remarks>
     [ByRefEvent]
-    public sealed class BeforeGettingStrippedEvent(TimeSpan initialTime, bool stealth = false) : BaseBeforeStripEvent(initialTime, stealth);
+    public sealed class BeforeGettingStrippedEvent(TimeSpan initialTime, ThievingStealth stealth = ThievingStealth.Obvious) : BaseBeforeStripEvent(initialTime, stealth);
 
     /// <summary>
     ///     Organizes the behavior of DoAfters for <see cref="StrippableSystem">.
diff --git a/Content.Shared/Strip/Components/ThievingComponent.cs b/Content.Shared/Strip/Components/ThievingComponent.cs
index a851dd5ef63..bc66c7d8328 100644
--- a/Content.Shared/Strip/Components/ThievingComponent.cs
+++ b/Content.Shared/Strip/Components/ThievingComponent.cs
@@ -1,22 +1,34 @@
+using Robust.Shared.GameStates;
+
 namespace Content.Shared.Strip.Components;
 
 /// <summary>
 /// Give this to an entity when you want to decrease stripping times
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ThievingComponent : Component
 {
     /// <summary>
     /// How much the strip time should be shortened by
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("stripTimeReduction")]
+    [DataField]
     public TimeSpan StripTimeReduction = TimeSpan.FromSeconds(0.5f);
 
+    /// <summary>
+    ///  A multiplier coefficient for strip time
+    /// </summary>
+    [DataField]
+    public float StripTimeMultiplier = 1f;
+
     /// <summary>
     /// Should it notify the user if they're stripping a pocket?
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("stealthy")]
-    public bool Stealthy;
+    [DataField]
+    public ThievingStealth Stealth = ThievingStealth.Hidden;
+
+    /// <summary>
+    ///  Should the user be able to see hidden items? (i.e pockets)
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IgnoreStripHidden;
 }
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index 7afd4f245a1..a801e5ee467 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -1,11 +1,14 @@
 using Content.Shared.DragDrop;
 using Content.Shared.Hands.Components;
+using Content.Shared.Popups;
 using Content.Shared.Strip.Components;
 
 namespace Content.Shared.Strip;
 
 public abstract class SharedStrippableSystem : EntitySystem
 {
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ThievingSystem _thieving = default!;
     public override void Initialize()
     {
         base.Initialize();
@@ -14,7 +17,7 @@ public override void Initialize()
         SubscribeLocalEvent<StrippableComponent, DragDropDraggedEvent>(OnDragDrop);
     }
 
-    public (TimeSpan Time, bool Stealth) GetStripTimeModifiers(EntityUid user, EntityUid target, TimeSpan initialTime)
+    public (TimeSpan Time, ThievingStealth Stealth) GetStripTimeModifiers(EntityUid user, EntityUid target, TimeSpan initialTime)
     {
         var userEv = new BeforeStripEvent(initialTime);
         RaiseLocalEvent(user, ref userEv);
@@ -43,7 +46,8 @@ private void OnCanDropOn(EntityUid uid, StrippingComponent component, ref CanDro
         args.Handled = true;
         args.CanDrop |= uid == args.User &&
                         HasComp<StrippableComponent>(args.Dragged) &&
-                        HasComp<HandsComponent>(args.User);
+                        HasComp<HandsComponent>(args.User) &&
+                        HasComp<StrippingComponent>(args.User);
     }
 
     private void OnCanDrop(EntityUid uid, StrippableComponent component, ref CanDropDraggedEvent args)
@@ -55,4 +59,17 @@ private void OnCanDrop(EntityUid uid, StrippableComponent component, ref CanDrop
         if (args.CanDrop)
             args.Handled = true;
     }
+
+    public void StripPopup(string messageId, ThievingStealth stealth, EntityUid target, EntityUid? user = null, EntityUid? item = null, string slot = "")
+    {
+        bool subtle = stealth == ThievingStealth.Subtle;
+        PopupType? popupSize = _thieving.GetPopupTypeFromStealth(stealth);
+
+        if (popupSize.HasValue) // We should always have a value if we're not hidden
+            _popup.PopupEntity(Loc.GetString(messageId,
+            ("user", subtle ? Loc.GetString("thieving-component-user") : user ?? EntityUid.Invalid),
+            ("item", subtle ? Loc.GetString("thieving-component-item") : item ?? EntityUid.Invalid),
+            ("slot", slot)),
+            target, target, popupSize.Value);
+    }
 }
diff --git a/Content.Shared/Strip/ThievingSystem.cs b/Content.Shared/Strip/ThievingSystem.cs
index 2b3d3b38a00..8f523accfea 100644
--- a/Content.Shared/Strip/ThievingSystem.cs
+++ b/Content.Shared/Strip/ThievingSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Inventory;
-using Content.Shared.Strip;
+using Content.Shared.Popups;
 using Content.Shared.Strip.Components;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Strip;
 
@@ -17,7 +18,41 @@ public override void Initialize()
 
     private void OnBeforeStrip(EntityUid uid, ThievingComponent component, BeforeStripEvent args)
     {
-        args.Stealth |= component.Stealthy;
+        args.Stealth = (ThievingStealth) Math.Max((sbyte) args.Stealth, (sbyte) component.Stealth);
         args.Additive -= component.StripTimeReduction;
+        args.Multiplier *= component.StripTimeMultiplier;
     }
+
+    public PopupType? GetPopupTypeFromStealth(ThievingStealth stealth)
+    {
+        switch (stealth)
+        {
+            case ThievingStealth.Hidden:
+                return null;
+
+            case ThievingStealth.Subtle:
+                return PopupType.Small;
+
+            default:
+                return PopupType.Large;
+        }
+    }
+}
+[Serializable, NetSerializable]
+public enum ThievingStealth : sbyte
+{
+    /// <summary>
+    /// 	Target sees a large popup indicating that an item is being stolen by who
+    /// </summary>
+    Obvious = 0,
+
+    /// <summary>
+    /// 	Target sees a small popup indicating that an item is being stolen
+    /// </summary>
+    Subtle = 1,
+
+    /// <summary>
+    /// 	Target does not see any popup regarding the stealing of an item
+    /// </summary>
+    Hidden = 2
 }
diff --git a/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
index 02b4e617901..ba78ff651f5 100644
--- a/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
+++ b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
@@ -15,7 +15,6 @@ namespace Content.Shared.SubFloor
     [UsedImplicitly]
     public abstract class SharedSubFloorHideSystem : EntitySystem
     {
-        [Dependency] protected readonly IMapManager MapManager = default!;
         [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
         [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!;
         [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
@@ -93,7 +92,7 @@ private void OnTileChanged(ref TileChangedEvent args)
             if (args.NewTile.Tile.IsEmpty)
                 return; // Anything that was here will be unanchored anyways.
 
-            UpdateTile(MapManager.GetGrid(args.NewTile.GridUid), args.NewTile.GridIndices);
+            UpdateTile(Comp<MapGridComponent>(args.NewTile.GridUid), args.NewTile.GridIndices);
         }
 
         /// <summary>
@@ -104,7 +103,7 @@ private void UpdateFloorCover(EntityUid uid, SubFloorHideComponent? component =
             if (!Resolve(uid, ref component, ref xform))
                 return;
 
-            if (xform.Anchored && MapManager.TryGetGrid(xform.GridUid, out var grid))
+            if (xform.Anchored && TryComp<MapGridComponent>(xform.GridUid, out var grid))
                 component.IsUnderCover = HasFloorCover(grid, grid.TileIndicesFor(xform.Coordinates));
             else
                 component.IsUnderCover = false;
diff --git a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
index 1ba88c571c7..3dc1575ddb9 100644
--- a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
+++ b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
@@ -48,7 +48,7 @@ private void SetScannerEnabled(EntityUid uid, bool enabled, TrayScannerComponent
 
     private void OnTrayScannerGetState(EntityUid uid, TrayScannerComponent scanner, ref ComponentGetState args)
     {
-        args.State = new TrayScannerState(scanner.Enabled);
+        args.State = new TrayScannerState(scanner.Enabled, scanner.Range);
     }
 
     private void OnTrayScannerHandleState(EntityUid uid, TrayScannerComponent scanner, ref ComponentHandleState args)
@@ -56,6 +56,7 @@ private void OnTrayScannerHandleState(EntityUid uid, TrayScannerComponent scanne
         if (args.Current is not TrayScannerState state)
             return;
 
+        scanner.Range = state.Range;
         SetScannerEnabled(uid, state.Enabled, scanner);
     }
 }
diff --git a/Content.Shared/SubFloor/TrayScannerComponent.cs b/Content.Shared/SubFloor/TrayScannerComponent.cs
index 98e43246a84..acde11ff505 100644
--- a/Content.Shared/SubFloor/TrayScannerComponent.cs
+++ b/Content.Shared/SubFloor/TrayScannerComponent.cs
@@ -22,9 +22,11 @@ public sealed partial class TrayScannerComponent : Component
 public sealed class TrayScannerState : ComponentState
 {
     public bool Enabled;
+    public float Range;
 
-    public TrayScannerState(bool enabled)
+    public TrayScannerState(bool enabled, float range)
     {
         Enabled = enabled;
+        Range = range;
     }
 }
diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
index ebd83624114..8d67aec518a 100644
--- a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
+++ b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using Content.Shared.Ghost;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Projectiles;
-using Content.Shared.Pulling;
-using Content.Shared.Pulling.Components;
 using Content.Shared.Teleportation.Components;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio;
@@ -28,7 +28,7 @@ public abstract class SharedPortalSystem : EntitySystem
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly SharedPullingSystem _pulling = default!;
+    [Dependency] private readonly PullingSystem _pulling = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     private const string PortalFixture = "portalFixture";
@@ -93,15 +93,15 @@ private void OnCollide(EntityUid uid, PortalComponent component, ref StartCollid
             return;
 
         // break pulls before portal enter so we dont break shit
-        if (TryComp<SharedPullableComponent>(subject, out var pullable) && pullable.BeingPulled)
+        if (TryComp<PullableComponent>(subject, out var pullable) && pullable.BeingPulled)
         {
-            _pulling.TryStopPull(pullable);
+            _pulling.TryStopPull(subject, pullable);
         }
 
-        if (TryComp<SharedPullerComponent>(subject, out var pulling)
-            && pulling.Pulling != null && TryComp<SharedPullableComponent>(pulling.Pulling.Value, out var subjectPulling))
+        if (TryComp<PullerComponent>(subject, out var pullerComp)
+            && TryComp<PullableComponent>(pullerComp.Pulling, out var subjectPulling))
         {
-            _pulling.TryStopPull(subjectPulling);
+            _pulling.TryStopPull(subject, subjectPulling);
         }
 
         // if they came from another portal, just return and wait for them to exit the portal
diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs
index 01682863389..7d94ada924d 100644
--- a/Content.Shared/Throwing/ThrowingSystem.cs
+++ b/Content.Shared/Throwing/ThrowingSystem.cs
@@ -20,6 +20,11 @@ public sealed class ThrowingSystem : EntitySystem
 {
     public const float ThrowAngularImpulse = 5f;
 
+    /// <summary>
+    /// Speed cap on rotation in case of click-spam.
+    /// </summary>
+    public const float ThrowAngularCap = 3f * MathF.PI;
+
     public const float PushbackDefault = 2f;
 
     /// <summary>
@@ -42,15 +47,18 @@ public void TryThrow(
         float strength = 1.0f,
         EntityUid? user = null,
         float pushbackRatio = PushbackDefault,
-        bool playSound = true)
+        bool recoil = true,
+        bool animated = true,
+        bool playSound = true,
+        bool doSpin = true)
     {
-        var thrownPos = Transform(uid).MapPosition;
-        var mapPos = coordinates.ToMap(EntityManager, _transform);
+        var thrownPos = _transform.GetMapCoordinates(uid);
+        var mapPos = _transform.ToMapCoordinates(coordinates);
 
         if (mapPos.MapId != thrownPos.MapId)
             return;
 
-        TryThrow(uid, mapPos.Position - thrownPos.Position, strength, user, pushbackRatio, playSound);
+        TryThrow(uid, mapPos.Position - thrownPos.Position, strength, user, pushbackRatio, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
     }
 
     /// <summary>
@@ -60,19 +68,22 @@ public void TryThrow(
     /// <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="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="doSpin">Whether spin will be applied to the thrown entity.</param>
     public void TryThrow(EntityUid uid,
         Vector2 direction,
         float strength = 1.0f,
         EntityUid? user = null,
         float pushbackRatio = PushbackDefault,
-        bool playSound = true)
+        bool recoil = true,
+        bool animated = true,
+        bool playSound = true,
+        bool doSpin = true)
     {
         var physicsQuery = GetEntityQuery<PhysicsComponent>();
         if (!physicsQuery.TryGetComponent(uid, out var physics))
             return;
 
         var projectileQuery = GetEntityQuery<ProjectileComponent>();
-        var tagQuery = GetEntityQuery<TagComponent>();
 
         TryThrow(
             uid,
@@ -82,8 +93,7 @@ public void TryThrow(EntityUid uid,
             projectileQuery,
             strength,
             user,
-            pushbackRatio,
-            playSound);
+            pushbackRatio, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
     }
 
     /// <summary>
@@ -93,6 +103,7 @@ public void TryThrow(EntityUid uid,
     /// <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="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="doSpin">Whether spin will be applied to the thrown entity.</param>
     public void TryThrow(EntityUid uid,
         Vector2 direction,
         PhysicsComponent physics,
@@ -101,7 +112,10 @@ public void TryThrow(EntityUid uid,
         float strength = 1.0f,
         EntityUid? user = null,
         float pushbackRatio = PushbackDefault,
-        bool playSound = true)
+        bool recoil = true,
+        bool animated = true,
+        bool playSound = true,
+        bool doSpin = true)
     {
         if (strength <= 0 || direction == Vector2Helpers.Infinity || direction == Vector2Helpers.NaN || direction == Vector2.Zero)
             return;
@@ -116,12 +130,17 @@ public void TryThrow(EntityUid uid,
         if (projectileQuery.TryGetComponent(uid, out var proj) && !proj.OnlyCollideWhenShot)
             return;
 
-        var comp = new ThrownItemComponent();
-        comp.Thrower = user;
+        var comp = new ThrownItemComponent
+        {
+            Thrower = user,
+            Animate = animated,
+        };
 
         // Estimate time to arrival so we can apply OnGround status and slow it much faster.
         var time = direction.Length() / strength;
         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);
@@ -133,17 +152,20 @@ public void TryThrow(EntityUid uid,
         ThrowingAngleComponent? throwingAngle = null;
 
         // Give it a l'il spin.
-        if (physics.InvI > 0f && (!TryComp(uid, out throwingAngle) || throwingAngle.AngularVelocity))
-        {
-            _physics.ApplyAngularImpulse(uid, ThrowAngularImpulse / physics.InvI, body: physics);
-        }
-        else
+        if (doSpin)
         {
-            Resolve(uid, ref throwingAngle, false);
-            var gridRot = _transform.GetWorldRotation(transform.ParentUid);
-            var angle = direction.ToWorldAngle() - gridRot;
-            var offset = throwingAngle?.Angle ?? Angle.Zero;
-            _transform.SetLocalRotation(uid, angle + offset);
+            if (physics.InvI > 0f && (!TryComp(uid, out throwingAngle) || throwingAngle.AngularVelocity))
+            {
+                _physics.ApplyAngularImpulse(uid, ThrowAngularImpulse / physics.InvI, body: physics);
+            }
+            else
+            {
+                Resolve(uid, ref throwingAngle, false);
+                var gridRot = _transform.GetWorldRotation(transform.ParentUid);
+                var angle = direction.ToWorldAngle() - gridRot;
+                var offset = throwingAngle?.Angle ?? Angle.Zero;
+                _transform.SetLocalRotation(uid, angle + offset);
+            }
         }
 
         var throwEvent = new ThrownEvent(user, uid);
@@ -166,7 +188,8 @@ public void TryThrow(EntityUid uid,
         if (user == null)
             return;
 
-        _recoil.KickCamera(user.Value, -direction * 0.04f);
+        if (recoil)
+            _recoil.KickCamera(user.Value, -direction * 0.04f);
 
         // Give thrower an impulse in the other direction
         if (pushbackRatio != 0.0f &&
diff --git a/Content.Shared/Throwing/ThrownItemComponent.cs b/Content.Shared/Throwing/ThrownItemComponent.cs
index 16c9b13254c..f7defaa4aab 100644
--- a/Content.Shared/Throwing/ThrownItemComponent.cs
+++ b/Content.Shared/Throwing/ThrownItemComponent.cs
@@ -8,6 +8,12 @@ namespace Content.Shared.Throwing
     [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), AutoGenerateComponentPause]
     public sealed partial class ThrownItemComponent : Component
     {
+        /// <summary>
+        /// Should the in-air throwing animation play.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool Animate = true;
+
         /// <summary>
         ///     The entity that threw this entity.
         /// </summary>
diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
index cc50094e3dd..ef28db26727 100644
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -3,8 +3,7 @@
 using Content.Shared.Database;
 using Content.Shared.Gravity;
 using Content.Shared.Physics;
-using Content.Shared.Physics.Pull;
-using Robust.Shared.GameStates;
+using Content.Shared.Movement.Pulling.Events;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -85,8 +84,8 @@ private void OnSleep(EntityUid uid, ThrownItemComponent thrownItem, ref PhysicsS
         private void HandlePullStarted(PullStartedMessage message)
         {
             // TODO: this isn't directed so things have to be done the bad way
-            if (EntityManager.TryGetComponent(message.Pulled.Owner, out ThrownItemComponent? thrownItemComponent))
-                StopThrow(message.Pulled.Owner, thrownItemComponent);
+            if (EntityManager.TryGetComponent(message.PulledUid, out ThrownItemComponent? thrownItemComponent))
+                StopThrow(message.PulledUid, thrownItemComponent);
         }
 
         public void StopThrow(EntityUid uid, ThrownItemComponent thrownItemComponent)
diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs
index 1f8408319d3..0d368495f18 100644
--- a/Content.Shared/Tiles/FloorTileSystem.cs
+++ b/Content.Shared/Tiles/FloorTileSystem.cs
@@ -116,7 +116,7 @@ private void OnAfterInteract(EntityUid uid, FloorTileComponent component, AfterI
                 }
             }
         }
-        _mapManager.TryGetGrid(location.EntityId, out var mapGrid);
+        TryComp<MapGridComponent>(location.EntityId, out var mapGrid);
 
         foreach (var currentTile in component.OutputTiles)
         {
diff --git a/Content.Shared/Timing/StartEndTime.cs b/Content.Shared/Timing/StartEndTime.cs
new file mode 100644
index 00000000000..fde9f7341c0
--- /dev/null
+++ b/Content.Shared/Timing/StartEndTime.cs
@@ -0,0 +1,68 @@
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Timing;
+
+/// <summary>
+/// Represents a range of an "action" in time, as start/end times.
+/// </summary>
+/// <remarks>
+/// Positions in time are represented as <see cref="TimeSpan"/>s, usually from <see cref="IGameTiming.CurTime"/>
+/// or <see cref="IGameTiming.RealTime"/>.
+/// </remarks>
+/// <param name="Start">The time the action starts.</param>
+/// <param name="End">The time action ends.</param>
+[Serializable]
+public record struct StartEndTime(TimeSpan Start, TimeSpan End)
+{
+    /// <summary>
+    /// How long the action takes.
+    /// </summary>
+    public TimeSpan Length => End - Start;
+
+    /// <summary>
+    /// Get how far the action has progressed relative to a time value.
+    /// </summary>
+    /// <param name="time">The time to get the current progress value for.</param>
+    /// <param name="clamp">If true, clamp values outside the time range to 0 through 1.</param>
+    /// <returns>
+    /// <para>
+    /// A progress value. Zero means <paramref name="time"/> is at <see cref="Start"/>,
+    /// one means <paramref name="time"/> is at <see cref="End"/>.
+    /// </para>
+    /// <para>
+    /// This function returns <see cref="float.NaN"/> if <see cref="Start"/> and <see cref="End"/> are identical.
+    /// </para>
+    /// </returns>
+    public float ProgressAt(TimeSpan time, bool clamp = true)
+    {
+        var length = Length;
+        if (length == default)
+            return float.NaN;
+
+        var progress = (float) ((time - Start) / length);
+        if (clamp)
+            progress = MathHelper.Clamp01(progress);
+
+        return progress;
+    }
+
+    public static StartEndTime FromStartDuration(TimeSpan start, TimeSpan duration)
+    {
+        return new StartEndTime(start, start + duration);
+    }
+
+    public static StartEndTime FromStartDuration(TimeSpan start, float durationSeconds)
+    {
+        return new StartEndTime(start, start + TimeSpan.FromSeconds(durationSeconds));
+    }
+
+    public static StartEndTime FromCurTime(IGameTiming gameTiming, TimeSpan duration)
+    {
+        return FromStartDuration(gameTiming.CurTime, duration);
+    }
+
+    public static StartEndTime FromCurTime(IGameTiming gameTiming, float durationSeconds)
+    {
+        return FromStartDuration(gameTiming.CurTime, durationSeconds);
+    }
+}
diff --git a/Content.Shared/Toilet/Components/ToiletComponent.cs b/Content.Shared/Toilet/Components/ToiletComponent.cs
new file mode 100644
index 00000000000..5de74e08f6e
--- /dev/null
+++ b/Content.Shared/Toilet/Components/ToiletComponent.cs
@@ -0,0 +1,40 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Toilet.Components
+{
+    /// <summary>
+    /// Toilets that can be flushed, seats toggled up and down, items hidden in cistern.
+    /// </summary>
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    public sealed partial class ToiletComponent : Component
+    {
+        /// <summary>
+        /// Toggles seat state.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool ToggleSeat;
+
+
+        /// <summary>
+        /// Sound to play when toggling toilet seat.
+        /// </summary>
+        [DataField]
+        public SoundSpecifier SeatSound = new SoundPathSpecifier("/Audio/Effects/toilet_seat_down.ogg");
+    }
+
+    [Serializable, NetSerializable]
+    public enum ToiletVisuals : byte
+    {
+        SeatVisualState,
+    }
+
+    [Serializable, NetSerializable]
+    public enum SeatVisualState : byte
+    {
+        SeatUp,
+        SeatDown
+    }
+}
+
diff --git a/Content.Shared/Toilet/Systems/SharedToiletSystem.cs b/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
new file mode 100644
index 00000000000..87df69e88da
--- /dev/null
+++ b/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
@@ -0,0 +1,109 @@
+using Content.Shared.Buckle.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Verbs;
+using Content.Shared.Plunger.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+using Content.Shared.Toilet.Components;
+
+namespace Content.Shared.Toilet.Systems
+{
+    /// <summary>
+    /// Handles sprite changes for both toilet seat up and down as well as for lid open and closed. Handles interactions with hidden stash
+    /// </summary>
+
+    public abstract class SharedToiletSystem : EntitySystem
+    {
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly SharedAudioSystem _audio = default!;
+        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<ToiletComponent, MapInitEvent>(OnMapInit);
+            SubscribeLocalEvent<ToiletComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleSeatVerb);
+            SubscribeLocalEvent<ToiletComponent, ActivateInWorldEvent>(OnActivateInWorld);
+        }
+
+        private void OnMapInit(EntityUid uid, ToiletComponent component, MapInitEvent args)
+        {
+            if (_random.Prob(0.5f))
+                component.ToggleSeat = true;
+
+            if (_random.Prob(0.3f))
+            {
+                TryComp<PlungerUseComponent>(uid, out var plunger);
+
+                if (plunger == null)
+                    return;
+
+                plunger.NeedsPlunger = true;
+            }
+
+            UpdateAppearance(uid);
+            Dirty(uid, component);
+        }
+
+        public bool CanToggle(EntityUid uid)
+        {
+            return TryComp<StrapComponent>(uid, out var strap) && strap.BuckledEntities.Count == 0;
+        }
+
+        private void OnToggleSeatVerb(EntityUid uid, ToiletComponent component, GetVerbsEvent<AlternativeVerb> args)
+        {
+            if (!args.CanInteract || !args.CanAccess || !CanToggle(uid) || args.Hands == null)
+                return;
+
+            AlternativeVerb toggleVerb = new()
+            {
+                Act = () => ToggleToiletSeat(uid, args.User, component)
+            };
+
+            if (component.ToggleSeat)
+            {
+                toggleVerb.Text = Loc.GetString("toilet-seat-close");
+                toggleVerb.Icon =
+                    new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/close.svg.192dpi.png"));
+            }
+            else
+            {
+                toggleVerb.Text = Loc.GetString("toilet-seat-open");
+                toggleVerb.Icon =
+                    new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/open.svg.192dpi.png"));
+            }
+            args.Verbs.Add(toggleVerb);
+        }
+
+        private void OnActivateInWorld(EntityUid uid, ToiletComponent comp, ActivateInWorldEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            args.Handled = true;
+            ToggleToiletSeat(uid, args.User, comp);
+        }
+
+        public void ToggleToiletSeat(EntityUid uid, EntityUid? user = null, ToiletComponent? component = null, MetaDataComponent? meta = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+
+            component.ToggleSeat = !component.ToggleSeat;
+
+            _audio.PlayPredicted(component.SeatSound, uid, uid);
+            UpdateAppearance(uid, component);
+            Dirty(uid, component, meta);
+        }
+
+        private void UpdateAppearance(EntityUid uid, ToiletComponent? component = null)
+        {
+            if (!Resolve(uid, ref component))
+                return;
+
+            _appearance.SetData(uid, ToiletVisuals.SeatVisualState, component.ToggleSeat ? SeatVisualState.SeatUp : SeatVisualState.SeatDown);
+        }
+    }
+}
diff --git a/Content.Shared/Toilet/ToiletComponent.cs b/Content.Shared/Toilet/ToiletComponent.cs
deleted file mode 100644
index 161bf81c992..00000000000
--- a/Content.Shared/Toilet/ToiletComponent.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.DoAfter;
-using Content.Shared.Tools;
-using Robust.Shared.Audio;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Toilet
-{
-    [RegisterComponent]
-    public sealed partial class ToiletComponent : Component
-    {
-        [DataField("pryLidTime")]
-        public float PryLidTime = 1f;
-
-        [DataField("pryingQuality", customTypeSerializer:typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
-        public string PryingQuality = "Prying";
-
-        [DataField("toggleSound")]
-        public SoundSpecifier ToggleSound = new SoundPathSpecifier("/Audio/Effects/toilet_seat_down.ogg");
-
-        [DataField("lidOpen")]
-        public bool LidOpen = false;
-
-        [DataField("isSeatUp")]
-        public bool IsSeatUp = false;
-    }
-
-    [Serializable, NetSerializable]
-    public sealed partial class ToiletPryDoAfterEvent : SimpleDoAfterEvent
-    {
-    }
-}
diff --git a/Content.Shared/Toilet/ToiletVisuals.cs b/Content.Shared/Toilet/ToiletVisuals.cs
deleted file mode 100644
index c5992bc0be1..00000000000
--- a/Content.Shared/Toilet/ToiletVisuals.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Toilet;
-
-[Serializable, NetSerializable]
-public enum ToiletVisuals
-{
-    LidOpen,
-    SeatUp
-}
diff --git a/Content.Shared/Tools/Systems/WeldableSystem.cs b/Content.Shared/Tools/Systems/WeldableSystem.cs
index f887ed3049f..b0ea68f713f 100644
--- a/Content.Shared/Tools/Systems/WeldableSystem.cs
+++ b/Content.Shared/Tools/Systems/WeldableSystem.cs
@@ -15,14 +15,7 @@ public sealed class WeldableSystem : EntitySystem
     [Dependency] private readonly SharedToolSystem _toolSystem = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-
-    public bool IsWelded(EntityUid uid, WeldableComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, false))
-            return false;
-
-        return component.IsWelded;
-    }
+    private EntityQuery<WeldableComponent> _query;
 
     public override void Initialize()
     {
@@ -31,6 +24,13 @@ public override void Initialize()
         SubscribeLocalEvent<WeldableComponent, WeldFinishedEvent>(OnWeldFinished);
         SubscribeLocalEvent<LayerChangeOnWeldComponent, WeldableChangedEvent>(OnWeldChanged);
         SubscribeLocalEvent<WeldableComponent, ExaminedEvent>(OnExamine);
+
+        _query = GetEntityQuery<WeldableComponent>();
+    }
+
+    public bool IsWelded(EntityUid uid, WeldableComponent? component = null)
+    {
+        return _query.Resolve(uid, ref component, false) && component.IsWelded;
     }
 
     private void OnExamine(EntityUid uid, WeldableComponent component, ExaminedEvent args)
@@ -49,7 +49,7 @@ private void OnInteractUsing(EntityUid uid, WeldableComponent component, Interac
 
     private bool CanWeld(EntityUid uid, EntityUid tool, EntityUid user, WeldableComponent? component = null)
     {
-        if (!Resolve(uid, ref component))
+        if (!_query.Resolve(uid, ref component))
             return false;
 
         // Other component systems
@@ -63,7 +63,7 @@ private bool CanWeld(EntityUid uid, EntityUid tool, EntityUid user, WeldableComp
 
     private bool TryWeld(EntityUid uid, EntityUid tool, EntityUid user, WeldableComponent? component = null)
     {
-        if (!Resolve(uid, ref component))
+        if (!_query.Resolve(uid, ref component))
             return false;
 
         if (!CanWeld(uid, tool, user, component))
@@ -115,17 +115,13 @@ private void OnWeldChanged(EntityUid uid, LayerChangeOnWeldComponent component,
 
     private void UpdateAppearance(EntityUid uid, WeldableComponent? component = null)
     {
-        if (!Resolve(uid, ref component))
-            return;
-
-        if (!TryComp(uid, out AppearanceComponent? appearance))
-            return;
-        _appearance.SetData(uid, WeldableVisuals.IsWelded, component.IsWelded, appearance);
+        if (_query.Resolve(uid, ref component))
+            _appearance.SetData(uid, WeldableVisuals.IsWelded, component.IsWelded);
     }
 
     public void SetWeldedState(EntityUid uid, bool state, WeldableComponent? component = null)
     {
-        if (!Resolve(uid, ref component))
+        if (!_query.Resolve(uid, ref component))
             return;
 
         if (component.IsWelded == state)
@@ -141,7 +137,7 @@ public void SetWeldedState(EntityUid uid, bool state, WeldableComponent? compone
 
     public void SetWeldingTime(EntityUid uid, TimeSpan time, WeldableComponent? component = null)
     {
-        if (!Resolve(uid, ref component))
+        if (!_query.Resolve(uid, ref component))
             return;
 
         if (component.WeldingTime.Equals(time))
diff --git a/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs b/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
index 62d2f5899a4..e69de29bb2d 100644
--- a/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
+++ b/Content.Shared/Traits/Assorted/Components/LightweightDrunkComponent.cs
@@ -1,15 +0,0 @@
-using Content.Shared.Drunk;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Traits.Assorted.Components;
-
-/// <summary>
-/// Used for the lightweight trait. DrunkSystem will check for this component and modify the boozePower accordingly if it finds it.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedDrunkSystem))]
-public sealed partial class LightweightDrunkComponent : Component
-{
-    [DataField("boozeStrengthMultiplier"), ViewVariables(VVAccess.ReadWrite)]
-    public float BoozeStrengthMultiplier = 4f;
-}
diff --git a/Content.Shared/Traits/Assorted/Components/NormalVisionComponent.cs b/Content.Shared/Traits/Assorted/Components/NormalVisionComponent.cs
new file mode 100644
index 00000000000..442bb6f0084
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Components/NormalVisionComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted.Components;
+
+/// <summary>
+///     This is used for removing species specific vision traits
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class NormalVisionComponent : Component
+{
+}
+
diff --git a/Content.Shared/Traits/Assorted/Systems/NormalVisionSystem.cs b/Content.Shared/Traits/Assorted/Systems/NormalVisionSystem.cs
new file mode 100644
index 00000000000..ee25bf364b9
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/Systems/NormalVisionSystem.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Abilities;
+using Content.Shared.Traits.Assorted.Components;
+
+namespace Content.Shared.Traits.Assorted.Systems;
+
+/// <summary>
+///     This handles removing species-specific vision traits.
+/// </summary>
+public sealed class NormalVisionSystem : EntitySystem
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<NormalVisionComponent, ComponentInit>(OnStartup);
+    }
+
+
+    private void OnStartup(EntityUid uid, NormalVisionComponent component, ComponentInit args)
+    {
+        RemComp<DogVisionComponent>(uid);
+        RemComp<UltraVisionComponent>(uid);
+    }
+}
diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs
index 725dc60e3bc..23130bb8f39 100644
--- a/Content.Shared/VendingMachines/VendingMachineComponent.cs
+++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs
@@ -51,8 +51,6 @@ public sealed partial class VendingMachineComponent : Component
 
         public bool Broken;
 
-        public bool ShouldSayThankYou;
-
         /// <summary>
         /// When true, will forcefully throw any object it dispenses
         /// </summary>
diff --git a/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs b/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
index 2bb87819e30..28558919461 100644
--- a/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
+++ b/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
@@ -11,21 +11,37 @@ public enum VoiceMaskUIKey : byte
 [Serializable, NetSerializable]
 public sealed class VoiceMaskBuiState : BoundUserInterfaceState
 {
-    public string Name { get; }
+    public readonly string Name;
+    public readonly string? Verb;
 
-    public VoiceMaskBuiState(string name)
+    public VoiceMaskBuiState(string name, string? verb)
     {
         Name = name;
+        Verb = verb;
     }
 }
 
 [Serializable, NetSerializable]
 public sealed class VoiceMaskChangeNameMessage : BoundUserInterfaceMessage
 {
-    public string Name { get; }
+    public readonly string Name;
 
     public VoiceMaskChangeNameMessage(string name)
     {
         Name = name;
     }
 }
+
+/// <summary>
+/// Change the speech verb prototype to override, or null to use the user's verb.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class VoiceMaskChangeVerbMessage : BoundUserInterfaceMessage
+{
+    public readonly string? Verb;
+
+    public VoiceMaskChangeVerbMessage(string? verb)
+    {
+        Verb = verb;
+    }
+}
diff --git a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
new file mode 100644
index 00000000000..5bf74802026
--- /dev/null
+++ b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
@@ -0,0 +1,108 @@
+using Content.Shared.Weapons.Melee.Components;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Shared.Weapons.Melee;
+
+/// <summary>
+/// This handles <see cref="MeleeSoundComponent"/>
+/// </summary>
+public sealed class MeleeSoundSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+
+    public const float DamagePitchVariation = 0.05f;
+
+    /// <summary>
+    /// Plays the SwingSound from a weapon component
+    /// for immediate feedback, misses and such
+    /// (Swinging a weapon goes "whoosh" whether it hits or not)
+    /// </summary>
+    public void PlaySwingSound(EntityUid userUid, EntityUid weaponUid, MeleeWeaponComponent weaponComponent)
+    {
+        _audio.PlayPredicted(weaponComponent.SwingSound, weaponUid, userUid);
+    }
+
+    /// <summary>
+    /// Takes a "damageType" string as an argument and uses it to
+    /// search one of the various Dictionaries in the MeleeSoundComponent
+    /// for a sound to play, and falls back if that fails
+    /// </summary>
+    /// <param name="damageType"> Serves as a lookup key for a hit sound </param>
+    /// <param name="hitSoundOverride"> A sound can be supplied by the <see cref="MeleeHitEvent"/> itself to override everything else </param>
+    public void PlayHitSound(EntityUid targetUid, EntityUid? userUid, string? damageType, SoundSpecifier? hitSoundOverride, MeleeWeaponComponent weaponComponent)
+    {
+        var hitSound      = weaponComponent.HitSound;
+        var noDamageSound = weaponComponent.NoDamageSound;
+
+        var playedSound = false;
+
+        if (Deleted(targetUid))
+            return;
+
+        // hitting can obv destroy an entity so we play at coords and not following them
+        var coords = Transform(targetUid).Coordinates;
+        // Play sound based off of highest damage type.
+        if (TryComp<MeleeSoundComponent>(targetUid, out var damageSoundComp))
+        {
+            if (damageType == null && damageSoundComp.NoDamageSound != null)
+            {
+                _audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+            else if (damageType != null && damageSoundComp.SoundTypes?.TryGetValue(damageType, out var damageSoundType) == true)
+            {
+                _audio.PlayPredicted(damageSoundType, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+            else if (damageType != null && damageSoundComp.SoundGroups?.TryGetValue(damageType, out var damageSoundGroup) == true)
+            {
+                _audio.PlayPredicted(damageSoundGroup, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+        }
+
+        // Use weapon sounds if the thing being hit doesn't specify its own sounds.
+        if (!playedSound)
+        {
+            if (hitSoundOverride != null)
+            {
+                _audio.PlayPredicted(hitSoundOverride, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+            else if (hitSound != null)
+            {
+                _audio.PlayPredicted(hitSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+            else
+            {
+                _audio.PlayPredicted(noDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                playedSound = true;
+            }
+        }
+
+        // Fallback to generic sounds.
+        if (!playedSound)
+        {
+            switch (damageType)
+            {
+                // Unfortunately heat returns caustic group so can't just use the damagegroup in that instance.
+                case "Burn":
+                case "Heat":
+                case "Radiation":
+                case "Cold":
+                    _audio.PlayPredicted(new SoundPathSpecifier("/Audio/Items/welder.ogg"), targetUid, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                    break;
+                // No damage, fallback to tappies
+                case null:
+                    _audio.PlayPredicted(new SoundCollectionSpecifier("WeakHit"), targetUid, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                    break;
+                case "Brute":
+                    _audio.PlayPredicted(new SoundCollectionSpecifier("MetalThud"), targetUid, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                    break;
+            }
+        }
+    }
+
+}
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 6a5127f2c95..e59b4a13fed 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -21,8 +21,6 @@
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Systems;
@@ -36,22 +34,21 @@ namespace Content.Shared.Weapons.Melee;
 
 public abstract class SharedMeleeWeaponSystem : EntitySystem
 {
-    [Dependency] protected readonly IGameTiming Timing = default!;
-    [Dependency] protected readonly IMapManager MapManager = default!;
-    [Dependency] private   readonly IPrototypeManager _protoManager = default!;
-    [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
-    [Dependency] protected readonly ActionBlockerSystem Blocker = default!;
-    [Dependency] protected readonly DamageableSystem Damageable = default!;
-    [Dependency] private   readonly InventorySystem _inventory = default!;
-    [Dependency] protected readonly SharedAudioSystem Audio = default!;
-    [Dependency] protected readonly SharedCombatModeSystem CombatMode = default!;
-    [Dependency] protected readonly SharedInteractionSystem Interaction = default!;
-    [Dependency] private   readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
-    [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
-    [Dependency] private   readonly StaminaSystem _stamina = default!;
-
-    public const float DamagePitchVariation = 0.05f;
+    [Dependency] protected readonly ISharedAdminLogManager   AdminLogger     = default!;
+    [Dependency] protected readonly ActionBlockerSystem      Blocker         = default!;
+    [Dependency] protected readonly SharedCombatModeSystem   CombatMode      = default!;
+    [Dependency] protected readonly DamageableSystem         Damageable      = default!;
+    [Dependency] protected readonly SharedInteractionSystem  Interaction     = default!;
+    [Dependency] protected readonly IMapManager              MapManager      = default!;
+    [Dependency] protected readonly SharedPopupSystem        PopupSystem     = default!;
+    [Dependency] protected readonly IGameTiming              Timing          = default!;
+    [Dependency] protected readonly SharedTransformSystem    TransformSystem = default!;
+    [Dependency] private   readonly InventorySystem         _inventory       = default!;
+    [Dependency] private   readonly MeleeSoundSystem        _meleeSound      = default!;
+    [Dependency] private   readonly SharedPhysicsSystem     _physics         = default!;
+    [Dependency] private   readonly IPrototypeManager       _protoManager    = default!;
+    [Dependency] private   readonly StaminaSystem           _stamina         = default!;
+
     private const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
 
     /// <summary>
@@ -83,7 +80,8 @@ public override void Initialize()
         SubscribeAllEvent<StopAttackEvent>(OnStopAttack);
 
 #if DEBUG
-        SubscribeLocalEvent<MeleeWeaponComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<MeleeWeaponComponent,
+                            MapInitEvent>                   (OnMapInit);
     }
 
     private void OnMapInit(EntityUid uid, MeleeWeaponComponent component, MapInitEvent args)
@@ -465,7 +463,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
             }
             var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, null);
             RaiseLocalEvent(meleeUid, missEvent);
-            Audio.PlayPredicted(component.SwingSound, meleeUid, user);
+            _meleeSound.PlaySwingSound(user, meleeUid, component);
             return;
         }
 
@@ -520,7 +518,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
 
         }
 
-        PlayHitSound(target.Value, user, GetHighestDamageSound(modifiedDamage, _protoManager), hitEvent.HitSoundOverride, component.HitSound, component.NoDamageSound);
+        _meleeSound.PlayHitSound(target.Value, user, GetHighestDamageSound(modifiedDamage, _protoManager), hitEvent.HitSoundOverride, component);
 
         if (damageResult?.GetTotal() > FixedPoint2.Zero)
         {
@@ -563,7 +561,9 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
             var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, direction);
             RaiseLocalEvent(meleeUid, missEvent);
 
-            Audio.PlayPredicted(component.SwingSound, meleeUid, user);
+            // immediate audio feedback
+            _meleeSound.PlaySwingSound(user, meleeUid, component);
+
             return true;
         }
 
@@ -658,7 +658,7 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
         if (entities.Count != 0)
         {
             var target = entities.First();
-            PlayHitSound(target, user, GetHighestDamageSound(appliedDamage, _protoManager), hitEvent.HitSoundOverride, component.HitSound, component.NoDamageSound);
+            _meleeSound.PlayHitSound(target, user, GetHighestDamageSound(appliedDamage, _protoManager), hitEvent.HitSoundOverride, component);
         }
 
         if (appliedDamage.GetTotal() > FixedPoint2.Zero)
@@ -702,77 +702,6 @@ protected virtual bool ArcRaySuccessful(EntityUid targetUid, Vector2 position, A
         return true;
     }
 
-    public void PlayHitSound(EntityUid target, EntityUid? user, string? type, SoundSpecifier? hitSoundOverride, SoundSpecifier? hitSound, SoundSpecifier? noDamageSound)
-    {
-        var playedSound = false;
-
-        if (Deleted(target))
-            return;
-
-        // hitting can obv destroy an entity so we play at coords and not following them
-        var coords = Transform(target).Coordinates;
-        // Play sound based off of highest damage type.
-        if (TryComp<MeleeSoundComponent>(target, out var damageSoundComp))
-        {
-            if (type == null && damageSoundComp.NoDamageSound != null)
-            {
-                Audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-            else if (type != null && damageSoundComp.SoundTypes?.TryGetValue(type, out var damageSoundType) == true)
-            {
-                Audio.PlayPredicted(damageSoundType, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-            else if (type != null && damageSoundComp.SoundGroups?.TryGetValue(type, out var damageSoundGroup) == true)
-            {
-                Audio.PlayPredicted(damageSoundGroup, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-        }
-
-        // Use weapon sounds if the thing being hit doesn't specify its own sounds.
-        if (!playedSound)
-        {
-            if (hitSoundOverride != null)
-            {
-                Audio.PlayPredicted(hitSoundOverride, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-            else if (hitSound != null)
-            {
-                Audio.PlayPredicted(hitSound, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-            else if (noDamageSound != null)
-            {
-                Audio.PlayPredicted(noDamageSound, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                playedSound = true;
-            }
-        }
-
-        // Fallback to generic sounds.
-        if (!playedSound)
-        {
-            switch (type)
-            {
-                // Unfortunately heat returns caustic group so can't just use the damagegroup in that instance.
-                case "Burn":
-                case "Heat":
-                case "Radiation":
-                case "Cold":
-                    Audio.PlayPredicted(new SoundPathSpecifier("/Audio/Items/welder.ogg"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                    break;
-                // No damage, fallback to tappies
-                case null:
-                    Audio.PlayPredicted(new SoundCollectionSpecifier("WeakHit"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                    break;
-                case "Brute":
-                    Audio.PlayPredicted(new SoundCollectionSpecifier("MetalThud"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
-                    break;
-            }
-        }
-    }
 
     public static string? GetHighestDamageSound(DamageSpecifier modifiedDamage, IPrototypeManager protoManager)
     {
@@ -809,7 +738,7 @@ protected virtual bool DoDisarm(EntityUid user, DisarmAttackEvent ev, EntityUid
         }
 
         // Play a sound to give instant feedback; same with playing the animations
-        Audio.PlayPredicted(component.SwingSound, meleeUid, user);
+        _meleeSound.PlaySwingSound(user, meleeUid, component);
         return true;
     }
 
diff --git a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
index 58c5fec2d83..ce96639e3c4 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
@@ -17,4 +17,20 @@ public sealed partial class GunWieldBonusComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("maxAngle"), AutoNetworkedField]
     public Angle MaxAngle = Angle.FromDegrees(-43);
+
+    /// <summary>
+    /// Recoil bonuses applied upon being wielded.
+    /// Higher angle decay bonus, quicker recovery.
+    /// Lower angle increase bonus (negative numbers), slower buildup.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Angle AngleDecay = Angle.FromDegrees(0);
+
+	/// <summary>
+    /// Recoil bonuses applied upon being wielded.
+    /// Higher angle decay bonus, quicker recovery.
+    /// Lower angle increase bonus (negative numbers), slower buildup.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Angle AngleIncrease = Angle.FromDegrees(0);
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
index d47d024de5e..274828a2086 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
@@ -102,7 +102,7 @@ public void CycleFire(EntityUid uid, GunComponent component, EntityUid? user = n
     // TODO: Actions need doing for guns anyway.
     private sealed partial class CycleModeEvent : InstantActionEvent
     {
-        public SelectiveFire Mode;
+        public SelectiveFire Mode = default;
     }
 
     private void OnCycleMode(EntityUid uid, GunComponent component, CycleModeEvent args)
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
index 57db1d2b9cf..9eb290ab65c 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Verbs;
-using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Containers;
 
@@ -13,6 +12,7 @@ public abstract partial class SharedGunSystem
 
     protected virtual void InitializeMagazine()
     {
+        SubscribeLocalEvent<MagazineAmmoProviderComponent, MapInitEvent>(OnMagazineMapInit);
         SubscribeLocalEvent<MagazineAmmoProviderComponent, TakeAmmoEvent>(OnMagazineTakeAmmo);
         SubscribeLocalEvent<MagazineAmmoProviderComponent, GetAmmoCountEvent>(OnMagazineAmmoCount);
         SubscribeLocalEvent<MagazineAmmoProviderComponent, GetVerbsEvent<AlternativeVerb>>(OnMagazineVerb);
@@ -22,6 +22,11 @@ protected virtual void InitializeMagazine()
         SubscribeLocalEvent<MagazineAmmoProviderComponent, ExaminedEvent>(OnMagazineExamine);
     }
 
+    private void OnMagazineMapInit(Entity<MagazineAmmoProviderComponent> ent, ref MapInitEvent args)
+    {
+        MagazineSlotChanged(ent);
+    }
+
     private void OnMagazineExamine(EntityUid uid, MagazineAmmoProviderComponent component, ExaminedEvent args)
     {
         if (!args.IsInDetailsRange)
@@ -62,16 +67,21 @@ protected virtual void OnMagazineSlotChange(EntityUid uid, MagazineAmmoProviderC
         if (MagazineSlot != args.Container.ID)
             return;
 
-        UpdateAmmoCount(uid);
-        if (!TryComp<AppearanceComponent>(uid, out var appearance))
+        MagazineSlotChanged((uid, component));
+    }
+
+    private void MagazineSlotChanged(Entity<MagazineAmmoProviderComponent> ent)
+    {
+        UpdateAmmoCount(ent);
+        if (!TryComp<AppearanceComponent>(ent, out var appearance))
             return;
 
-        var magEnt = GetMagazineEntity(uid);
-        Appearance.SetData(uid, AmmoVisuals.MagLoaded, magEnt != null, appearance);
+        var magEnt = GetMagazineEntity(ent);
+        Appearance.SetData(ent, AmmoVisuals.MagLoaded, magEnt != null, appearance);
 
         if (magEnt != null)
         {
-            UpdateMagazineAppearance(uid, component, magEnt.Value);
+            UpdateMagazineAppearance(ent, ent, magEnt.Value);
         }
     }
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index ff8b102bb57..1dfdede1afa 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -205,6 +205,14 @@ private void StopShooting(EntityUid uid, GunComponent gun)
         Dirty(uid, gun);
     }
 
+    /// <summary>
+    /// Sets the targeted entity of the gun. Should be called before attempting to shoot to avoid shooting over the target.
+    /// </summary>
+    public void SetTarget(GunComponent gun, EntityUid target)
+    {
+        gun.Target = target;
+    }
+
     /// <summary>
     /// Attempts to shoot at the target coordinates. Resets the shot counter after every shot.
     /// </summary>
diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index b7529328793..6bd406c1cad 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -34,7 +34,7 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<WieldableComponent, UseInHandEvent>(OnUseInHand);
+        SubscribeLocalEvent<WieldableComponent, UseInHandEvent>(OnUseInHand, before: [typeof(SharedGunSystem)]);
         SubscribeLocalEvent<WieldableComponent, ItemUnwieldedEvent>(OnItemUnwielded);
         SubscribeLocalEvent<WieldableComponent, GotUnequippedHandEvent>(OnItemLeaveHand);
         SubscribeLocalEvent<WieldableComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
@@ -90,6 +90,8 @@ private void OnGunRefreshModifiers(Entity<GunWieldBonusComponent> bonus, ref Gun
         {
             args.MinAngle += bonus.Comp.MinAngle;
             args.MaxAngle += bonus.Comp.MaxAngle;
+            args.AngleDecay += bonus.Comp.AngleDecay;
+            args.AngleIncrease += bonus.Comp.AngleIncrease;
         }
     }
 
@@ -195,8 +197,9 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use
             && !_delay.TryResetDelay((used, useDelay), true))
             return false;
 
-        _popupSystem.PopupClient(Loc.GetString("wieldable-component-successful-wield", ("item", used)), user, user);
-        _popupSystem.PopupEntity(Loc.GetString("wieldable-component-successful-wield-other", ("user", user), ("item", used)), user, Filter.PvsExcept(user), true);
+        var selfMessage = Loc.GetString("wieldable-component-successful-wield", ("item", used));
+        var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", user), ("item", used));
+        _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
 
         var targEv = new ItemWieldedEvent();
         RaiseLocalEvent(used, ref targEv);
@@ -239,10 +242,9 @@ private void OnItemUnwielded(EntityUid uid, WieldableComponent component, ItemUn
             if (component.UnwieldSound != null)
                 _audioSystem.PlayPredicted(component.UnwieldSound, uid, args.User);
 
-            _popupSystem.PopupClient(Loc.GetString("wieldable-component-failed-wield",
-                ("item", uid)), args.User.Value, args.User.Value);
-            _popupSystem.PopupEntity(Loc.GetString("wieldable-component-failed-wield-other",
-                ("user", args.User.Value), ("item", uid)), args.User.Value, Filter.PvsExcept(args.User.Value), true);
+            var selfMessage = Loc.GetString("wieldable-component-failed-wield", ("item", uid));
+            var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", args.User.Value), ("item", uid));
+            _popupSystem.PopupPredicted(selfMessage, othersMessage, args.User.Value, args.User.Value);
         }
 
         _appearance.SetData(uid, WieldableVisuals.Wielded, false);
diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs
index f069687ffb7..b4b0768e0f7 100644
--- a/Content.Shared/Wires/SharedWiresSystem.cs
+++ b/Content.Shared/Wires/SharedWiresSystem.cs
@@ -28,15 +28,24 @@ private void OnPanelDoAfter(EntityUid uid, WiresPanelComponent panel, WirePanelD
         if (args.Cancelled)
             return;
 
-        TogglePanel(uid, panel, !panel.Open);
+        if (!TogglePanel(uid, panel, !panel.Open, args.User))
+            return;
+
         AdminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.User):user} screwed {ToPrettyString(uid):target}'s maintenance panel {(panel.Open ? "open" : "closed")}");
 
         var sound = panel.Open ? panel.ScrewdriverOpenSound : panel.ScrewdriverCloseSound;
         Audio.PlayPredicted(sound, uid, args.User);
+        args.Handled = true;
     }
 
     private void OnInteractUsing(Entity<WiresPanelComponent> ent, ref InteractUsingEvent args)
     {
+        if (!Tool.HasQuality(args.Used, ent.Comp.OpeningTool))
+            return;
+
+        if (!CanTogglePanel(ent, args.User))
+            return;
+
         if (!Tool.UseTool(
                 args.Used,
                 args.User,
@@ -89,14 +98,25 @@ protected void UpdateAppearance(EntityUid uid, WiresPanelComponent panel)
             Appearance.SetData(uid, WiresVisuals.MaintenancePanelState, panel.Open && panel.Visible, appearance);
     }
 
-    public void TogglePanel(EntityUid uid, WiresPanelComponent component, bool open)
+    public bool TogglePanel(EntityUid uid, WiresPanelComponent component, bool open, EntityUid? user = null)
     {
+        if (!CanTogglePanel((uid, component), user))
+            return false;
+
         component.Open = open;
         UpdateAppearance(uid, component);
         Dirty(uid, component);
 
         var ev = new PanelChangedEvent(component.Open);
         RaiseLocalEvent(uid, ref ev);
+        return true;
+    }
+
+    public bool CanTogglePanel(Entity<WiresPanelComponent> ent, EntityUid? user)
+    {
+        var attempt = new AttemptChangePanelEvent(ent.Comp.Open, user);
+        RaiseLocalEvent(ent, ref attempt);
+        return !attempt.Cancelled;
     }
 
     public bool IsPanelOpen(Entity<WiresPanelComponent?> entity)
diff --git a/Content.Shared/Wires/WiresPanelComponent.cs b/Content.Shared/Wires/WiresPanelComponent.cs
index 9c7444778e7..a18e590e21b 100644
--- a/Content.Shared/Wires/WiresPanelComponent.cs
+++ b/Content.Shared/Wires/WiresPanelComponent.cs
@@ -57,6 +57,12 @@ public sealed partial class WiresPanelComponent : Component
     public LocId? ExamineTextOpen = "wires-panel-component-on-examine-open";
 }
 
+/// <summary>
+/// Event raised on a <see cref="WiresPanelComponent"/> before its open state is about to be changed.
+/// </summary>
+[ByRefEvent]
+public record struct AttemptChangePanelEvent(bool Open, EntityUid? User, bool Cancelled = false);
+
 /// <summary>
 /// Event raised when a panel is opened or closed.
 /// </summary>
diff --git a/Content.Tests/Shared/Chat/V2/Moderation/SimpleCensor.cs b/Content.Tests/Shared/Chat/V2/Moderation/SimpleCensor.cs
new file mode 100644
index 00000000000..09870af317c
--- /dev/null
+++ b/Content.Tests/Shared/Chat/V2/Moderation/SimpleCensor.cs
@@ -0,0 +1,162 @@
+using System.Text.Unicode;
+using Content.Shared.Chat.V2.Moderation;
+using NUnit.Framework;
+
+namespace Content.Tests.Shared.Chat.V2.Moderation;
+
+public sealed class SimpleCensorTests
+{
+    [Test]
+    public void CanCensorASingleWord()
+    {
+        var sut = new SimpleCensor().WithCustomDictionary(["amogus"]);
+        var output = sut.Censor("hello amogus");
+
+        Assert.That(output, Is.EqualTo("hello ******"));
+    }
+
+    // Basics - use custom dictionary
+
+    [Test]
+    public void CanCensorMultipleWordInstances()
+    {
+        var sut= new SimpleCensor().WithCustomDictionary(["amogus"]);
+        var output = sut.Censor("amogus hello amogus");
+
+        Assert.That(output, Is.EqualTo("****** hello ******"));
+    }
+
+    [Test]
+    public void CanCensorMultipleWords()
+    {
+        var sut= new SimpleCensor().WithCustomDictionary(["amogus", "sus"]);
+        var output = sut.Censor("amogus hello sus");
+
+        Assert.That(output, Is.EqualTo("****** hello ***"));
+    }
+
+    [Test]
+    public void CanUseDifferentCensorSymbols()
+    {
+        var sut= new SimpleCensor().WithCustomDictionary(["amogus", "sus"]);
+        var output = sut.Censor("amogus hello sus", '#');
+
+        Assert.That(output, Is.EqualTo("###### hello ###"));
+    }
+
+    [Test]
+    public void CanCatchCapitalizedWords()
+    {
+        var sut= new SimpleCensor().WithCustomDictionary(["amogus", "sus"]);
+        var output = sut.Censor("AMOGUS hello SUS");
+
+        Assert.That(output, Is.EqualTo("****** hello ***"));
+    }
+
+    [Test]
+    public void CanCatchWordsWithSomeCaptialsInThem()
+    {
+        var sut= new SimpleCensor().WithCustomDictionary(["amogus", "sus"]);
+        var output = sut.Censor("AmoGuS hello SuS");
+
+        Assert.That(output, Is.EqualTo("****** hello ***"));
+    }
+
+    [Test]
+    public void CanCatchWordsHiddenInsideOtherWords()
+    {
+        var sut= new SimpleCensor().WithCustomDictionary(["amogus", "sus"]);
+        var output = sut.Censor("helamoguslo suspicious");
+
+        Assert.That(output, Is.EqualTo("hel******lo ***picious"));
+    }
+
+    // Sanitizing Leetspeak
+
+    [Test]
+    public void CanSanitizeLeetspeak()
+    {
+        var sut = new SimpleCensor().WithCustomDictionary(["amogus", "sus"]).WithSanitizeLeetSpeak();
+        var output = sut.Censor("am0gu5 hello 5u5");
+
+        Assert.That(output, Is.EqualTo("****** hello ***"));
+    }
+
+    [Test]
+    public void SanitizingLeetspeakOnlyOccursWhenTheWordIsBlocked()
+    {
+        var sut = new SimpleCensor().WithCustomDictionary(["amogus", "sus"]).WithSanitizeLeetSpeak();
+        var output = sut.Censor("he110");
+
+        Assert.That(output, Is.EqualTo("he110"));
+    }
+
+    [Test]
+    public void CanCatchLeetspeakReplacementsWithMoreThanOneLetter()
+    {
+        var sut = new SimpleCensor().WithCustomDictionary(["amogus", "sus"]).WithSanitizeLeetSpeak();
+        var output = sut.Censor("am()gu5 hello 5u5");
+
+        Assert.That(output, Is.EqualTo("******* hello ***"));
+    }
+
+    // Sanitizing special characters
+
+    [Test]
+    public void DoesNotSanitizeOutUncensoredSpecialCharacters()
+    {
+        var sut = new SimpleCensor().WithCustomDictionary(["amogus", "sus"]).WithSanitizeSpecialCharacters();
+        var output = sut.Censor("amogus!hello!sus");
+
+        Assert.That(output, Is.EqualTo("******!hello!***"));
+    }
+
+    [Test]
+    public void DoesSanitizeOutCensoredSpecialCharacters()
+    {
+        var sut = new SimpleCensor().WithCustomDictionary(["amogus", "sus"]).WithSanitizeSpecialCharacters();
+        var output = sut.Censor("amo!gus hello s?us");
+
+        Assert.That(output, Is.EqualTo("***!*** hello *?**"));
+    }
+
+    // Unicode ranges
+
+    [Test]
+    public void SanitizesOutNonLatinCharaters()
+    {
+        var sut = new SimpleCensor().WithRanges([UnicodeRanges.BasicLatin, UnicodeRanges.Latin1Supplement]);
+        var output = sut.Censor("amogus Україна sus 日本");
+
+        Assert.That(output, Is.EqualTo("amogus  sus "));
+    }
+
+    [Test]
+    public void SanitizesOutNonLatinOrCyrillicCharaters()
+    {
+        var sut = new SimpleCensor().WithRanges([UnicodeRanges.BasicLatin, UnicodeRanges.Latin1Supplement, UnicodeRanges.Cyrillic]);
+        var output = sut.Censor("amogus Україна sus 日本");
+
+        Assert.That(output, Is.EqualTo("amogus Україна sus "));
+    }
+
+    // False positives
+    [Test]
+    public void CanHandleFalsePositives()
+    {
+        var sut = new SimpleCensor().WithCustomDictionary(["amogus", "sus"]).WithFalsePositives(["amogusus"]);
+        var output = sut.Censor("amogusus hello amogus hello sus");
+
+        Assert.That(output, Is.EqualTo("amogusus hello ****** hello ***"));
+    }
+
+    // False negatives
+    [Test]
+    public void CanHandleFalseNegatives()
+    {
+        var sut = new SimpleCensor().WithCustomDictionary(["amogus", "sus"]).WithFalsePositives(["amogusus"]).WithFalseNegatives(["susamogusus"]);
+        var output = sut.Censor("susamogusus hello amogus hello sus amogusus");
+
+        Assert.That(output, Is.EqualTo("*********** hello ****** hello *** ********"));
+    }
+}
diff --git a/Content.YAMLLinter/Program.cs b/Content.YAMLLinter/Program.cs
index b7b70bd1188..78867fcb8ab 100644
--- a/Content.YAMLLinter/Program.cs
+++ b/Content.YAMLLinter/Program.cs
@@ -97,7 +97,7 @@ await instance.WaitPost(() =>
                         yamlErrors[kind] = set;
                 }
 
-                fieldErrors = protoMan.ValidateFields(prototypes);
+                fieldErrors = protoMan.ValidateStaticFields(prototypes);
             });
 
             return (yamlErrors, fieldErrors);
diff --git a/Resources/Audio/Admin/Smites/bookify.ogg b/Resources/Audio/Admin/Smites/bookify.ogg
new file mode 100644
index 00000000000..522225e3ac4
Binary files /dev/null and b/Resources/Audio/Admin/Smites/bookify.ogg differ
diff --git a/Resources/Audio/Admin/Smites/manup.ogg b/Resources/Audio/Admin/Smites/manup.ogg
new file mode 100644
index 00000000000..cdfa76fbf7e
Binary files /dev/null and b/Resources/Audio/Admin/Smites/manup.ogg differ
diff --git a/Resources/Audio/Admin/Smites/pleaseroleplay.ogg b/Resources/Audio/Admin/Smites/pleaseroleplay.ogg
new file mode 100644
index 00000000000..3d2c301229e
Binary files /dev/null and b/Resources/Audio/Admin/Smites/pleaseroleplay.ogg differ
diff --git a/Resources/Audio/Admin/Smites/smite.ogg b/Resources/Audio/Admin/Smites/smite.ogg
new file mode 100644
index 00000000000..2f62cfb3691
Binary files /dev/null and b/Resources/Audio/Admin/Smites/smite.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/aliens.ogg b/Resources/Audio/Announcements/Intern/aliens.ogg
new file mode 100644
index 00000000000..9dd3c076978
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/aliens.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/animes.ogg b/Resources/Audio/Announcements/Intern/animes.ogg
new file mode 100644
index 00000000000..36102c3e60e
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/animes.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce.ogg b/Resources/Audio/Announcements/Intern/announce.ogg
new file mode 100644
index 00000000000..0ee0f36d56f
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/1.ogg b/Resources/Audio/Announcements/Intern/announce/1.ogg
new file mode 100644
index 00000000000..c4d182bc8c9
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/1.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/10.ogg b/Resources/Audio/Announcements/Intern/announce/10.ogg
new file mode 100644
index 00000000000..7380ccdeefd
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/10.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/11.ogg b/Resources/Audio/Announcements/Intern/announce/11.ogg
new file mode 100644
index 00000000000..ca548dcc20a
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/11.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/12.ogg b/Resources/Audio/Announcements/Intern/announce/12.ogg
new file mode 100644
index 00000000000..8d71419798f
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/12.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/13.ogg b/Resources/Audio/Announcements/Intern/announce/13.ogg
new file mode 100644
index 00000000000..128c7aa424d
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/13.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/14.ogg b/Resources/Audio/Announcements/Intern/announce/14.ogg
new file mode 100644
index 00000000000..81d54101be5
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/14.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/2.ogg b/Resources/Audio/Announcements/Intern/announce/2.ogg
new file mode 100644
index 00000000000..a2ef615d56c
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/2.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/3.ogg b/Resources/Audio/Announcements/Intern/announce/3.ogg
new file mode 100644
index 00000000000..51613ff0367
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/3.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/4.ogg b/Resources/Audio/Announcements/Intern/announce/4.ogg
new file mode 100644
index 00000000000..874536ca72f
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/4.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/5.ogg b/Resources/Audio/Announcements/Intern/announce/5.ogg
new file mode 100644
index 00000000000..0af0d28ce18
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/5.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/6.ogg b/Resources/Audio/Announcements/Intern/announce/6.ogg
new file mode 100644
index 00000000000..a65006a8c01
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/6.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/7.ogg b/Resources/Audio/Announcements/Intern/announce/7.ogg
new file mode 100644
index 00000000000..4a1d3f013ae
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/7.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/8.ogg b/Resources/Audio/Announcements/Intern/announce/8.ogg
new file mode 100644
index 00000000000..83ca80f4939
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/8.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/announce/9.ogg b/Resources/Audio/Announcements/Intern/announce/9.ogg
new file mode 100644
index 00000000000..3c0c45b25d0
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/9.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/anomaly.ogg b/Resources/Audio/Announcements/Intern/anomaly.ogg
new file mode 100644
index 00000000000..9bed8eae3aa
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/anomaly.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/commandreport/1.ogg b/Resources/Audio/Announcements/Intern/commandreport/1.ogg
new file mode 100644
index 00000000000..e3108b13d17
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/commandreport/1.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/commandreport/2.ogg b/Resources/Audio/Announcements/Intern/commandreport/2.ogg
new file mode 100644
index 00000000000..cd67500426c
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/commandreport/2.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/commandreport/3.ogg b/Resources/Audio/Announcements/Intern/commandreport/3.ogg
new file mode 100644
index 00000000000..94241c5ba52
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/commandreport/3.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/intercept.ogg b/Resources/Audio/Announcements/Intern/intercept.ogg
new file mode 100644
index 00000000000..a87274abd97
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/intercept.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/ionstorm.ogg b/Resources/Audio/Announcements/Intern/ionstorm.ogg
new file mode 100644
index 00000000000..9e7b5c6b23e
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/ionstorm.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/meteors.ogg b/Resources/Audio/Announcements/Intern/meteors.ogg
new file mode 100644
index 00000000000..c68c4bd8cc4
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/meteors.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/newai.ogg b/Resources/Audio/Announcements/Intern/newai.ogg
new file mode 100644
index 00000000000..c40b0990206
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/newai.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/outbreak7.ogg b/Resources/Audio/Announcements/Intern/outbreak7.ogg
new file mode 100644
index 00000000000..297a1bbe8db
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/outbreak7.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/poweroff.ogg b/Resources/Audio/Announcements/Intern/poweroff.ogg
new file mode 100644
index 00000000000..4b71053653f
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/poweroff.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/poweron.ogg b/Resources/Audio/Announcements/Intern/poweron.ogg
new file mode 100644
index 00000000000..509cd398e6e
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/poweron.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/radiation.ogg b/Resources/Audio/Announcements/Intern/radiation.ogg
new file mode 100644
index 00000000000..08db53ebfd2
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/radiation.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/shuttlecalled.ogg b/Resources/Audio/Announcements/Intern/shuttlecalled.ogg
new file mode 100644
index 00000000000..c903367cdff
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/shuttlecalled.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/shuttledock.ogg b/Resources/Audio/Announcements/Intern/shuttledock.ogg
new file mode 100644
index 00000000000..9f6ccd1a937
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/shuttledock.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/shuttlerecalled.ogg b/Resources/Audio/Announcements/Intern/shuttlerecalled.ogg
new file mode 100644
index 00000000000..e259a79f35e
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/shuttlerecalled.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/welcome/1.ogg b/Resources/Audio/Announcements/Intern/welcome/1.ogg
new file mode 100644
index 00000000000..758f1967e09
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/1.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/welcome/2.ogg b/Resources/Audio/Announcements/Intern/welcome/2.ogg
new file mode 100644
index 00000000000..c2e72be510e
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/2.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/welcome/3.ogg b/Resources/Audio/Announcements/Intern/welcome/3.ogg
new file mode 100644
index 00000000000..004f57371de
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/3.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/welcome/4.ogg b/Resources/Audio/Announcements/Intern/welcome/4.ogg
new file mode 100644
index 00000000000..c4e1f7667cd
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/4.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/welcome/5.ogg b/Resources/Audio/Announcements/Intern/welcome/5.ogg
new file mode 100644
index 00000000000..641b8208a4e
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/5.ogg differ
diff --git a/Resources/Audio/Announcements/Intern/welcome/6.ogg b/Resources/Audio/Announcements/Intern/welcome/6.ogg
new file mode 100644
index 00000000000..b0fc38237f8
Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/6.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/aliens.ogg b/Resources/Audio/Announcements/MedBot/aliens.ogg
new file mode 100644
index 00000000000..57fa70c3cae
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/aliens.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/animes.ogg b/Resources/Audio/Announcements/MedBot/animes.ogg
new file mode 100644
index 00000000000..7615a744a66
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/animes.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/announce.ogg b/Resources/Audio/Announcements/MedBot/announce.ogg
new file mode 100644
index 00000000000..0ee0f36d56f
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/announce.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/anomaly.ogg b/Resources/Audio/Announcements/MedBot/anomaly.ogg
new file mode 100644
index 00000000000..d710999e1e1
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/anomaly.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/attention.ogg b/Resources/Audio/Announcements/MedBot/attention.ogg
new file mode 100644
index 00000000000..d4d5a270852
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/attention.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/commandreport.ogg b/Resources/Audio/Announcements/MedBot/commandreport.ogg
new file mode 100644
index 00000000000..4e5c2e1d1ff
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/commandreport.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/fallback.ogg b/Resources/Audio/Announcements/MedBot/fallback.ogg
new file mode 100644
index 00000000000..d4d5a270852
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/fallback.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/intercept.ogg b/Resources/Audio/Announcements/MedBot/intercept.ogg
new file mode 100644
index 00000000000..c59d0455c1c
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/intercept.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/ionstorm.ogg b/Resources/Audio/Announcements/MedBot/ionstorm.ogg
new file mode 100644
index 00000000000..15aeac9f7ff
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/ionstorm.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/meteors.ogg b/Resources/Audio/Announcements/MedBot/meteors.ogg
new file mode 100644
index 00000000000..91208cae122
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/meteors.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/newai.ogg b/Resources/Audio/Announcements/MedBot/newai.ogg
new file mode 100644
index 00000000000..c40b0990206
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/newai.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/outbreak7.ogg b/Resources/Audio/Announcements/MedBot/outbreak7.ogg
new file mode 100644
index 00000000000..1fc542534db
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/outbreak7.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/poweroff.ogg b/Resources/Audio/Announcements/MedBot/poweroff.ogg
new file mode 100644
index 00000000000..875df350025
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/poweroff.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/poweron.ogg b/Resources/Audio/Announcements/MedBot/poweron.ogg
new file mode 100644
index 00000000000..4b1605b1c74
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/poweron.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/radiation.ogg b/Resources/Audio/Announcements/MedBot/radiation.ogg
new file mode 100644
index 00000000000..5c48830b5f2
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/radiation.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/shuttlecalled.ogg b/Resources/Audio/Announcements/MedBot/shuttlecalled.ogg
new file mode 100644
index 00000000000..a775567abed
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/shuttlecalled.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/shuttledock.ogg b/Resources/Audio/Announcements/MedBot/shuttledock.ogg
new file mode 100644
index 00000000000..933928db067
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/shuttledock.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/shuttlerecalled.ogg b/Resources/Audio/Announcements/MedBot/shuttlerecalled.ogg
new file mode 100644
index 00000000000..53b622576d4
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/shuttlerecalled.ogg differ
diff --git a/Resources/Audio/Announcements/MedBot/welcome.ogg b/Resources/Audio/Announcements/MedBot/welcome.ogg
new file mode 100644
index 00000000000..f9a698fd080
Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/welcome.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/announce.ogg b/Resources/Audio/Announcements/NEIL/announce.ogg
new file mode 100644
index 00000000000..0ee0f36d56f
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/announce.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/attention.ogg b/Resources/Audio/Announcements/NEIL/attention.ogg
new file mode 100644
index 00000000000..310fad3ef63
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/attention.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/bureaucraticerror.ogg b/Resources/Audio/Announcements/NEIL/bureaucraticerror.ogg
new file mode 100644
index 00000000000..0cbafcf6276
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/bureaucraticerror.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/code_blue.ogg b/Resources/Audio/Announcements/NEIL/code_blue.ogg
new file mode 100644
index 00000000000..48d9c6548b6
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_blue.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/code_delta.ogg b/Resources/Audio/Announcements/NEIL/code_delta.ogg
new file mode 100644
index 00000000000..70826719156
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_delta.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/code_epsilon.ogg b/Resources/Audio/Announcements/NEIL/code_epsilon.ogg
new file mode 100644
index 00000000000..a8db858b1af
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_epsilon.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/code_gamma.ogg b/Resources/Audio/Announcements/NEIL/code_gamma.ogg
new file mode 100644
index 00000000000..3351acc2e0d
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_gamma.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/code_green.ogg b/Resources/Audio/Announcements/NEIL/code_green.ogg
new file mode 100644
index 00000000000..3c0031833be
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_green.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/code_red.ogg b/Resources/Audio/Announcements/NEIL/code_red.ogg
new file mode 100644
index 00000000000..209eb36ba11
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_red.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/code_violet.ogg b/Resources/Audio/Announcements/NEIL/code_violet.ogg
new file mode 100644
index 00000000000..c1681c1edb8
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_violet.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/code_white.ogg b/Resources/Audio/Announcements/NEIL/code_white.ogg
new file mode 100644
index 00000000000..24c942dfcb2
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_white.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/code_yellow.ogg b/Resources/Audio/Announcements/NEIL/code_yellow.ogg
new file mode 100644
index 00000000000..9139446d2b6
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_yellow.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/fallback.ogg b/Resources/Audio/Announcements/NEIL/fallback.ogg
new file mode 100644
index 00000000000..310fad3ef63
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/fallback.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/gasleak.ogg b/Resources/Audio/Announcements/NEIL/gasleak.ogg
new file mode 100644
index 00000000000..8efffd02c45
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/gasleak.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/kudzu.ogg b/Resources/Audio/Announcements/NEIL/kudzu.ogg
new file mode 100644
index 00000000000..4ddd2f636bc
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/kudzu.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/meteors.ogg b/Resources/Audio/Announcements/NEIL/meteors.ogg
new file mode 100644
index 00000000000..cf525441745
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/meteors.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/newai.ogg b/Resources/Audio/Announcements/NEIL/newai.ogg
new file mode 100644
index 00000000000..35aba34564f
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/newai.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/noosphericstorm.ogg b/Resources/Audio/Announcements/NEIL/noosphericstorm.ogg
new file mode 100644
index 00000000000..47b52f7cb47
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/noosphericstorm.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/outbreak7.ogg b/Resources/Audio/Announcements/NEIL/outbreak7.ogg
new file mode 100644
index 00000000000..91067960125
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/outbreak7.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/poweroff.ogg b/Resources/Audio/Announcements/NEIL/poweroff.ogg
new file mode 100644
index 00000000000..7d7a43825fe
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/poweroff.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/poweron.ogg b/Resources/Audio/Announcements/NEIL/poweron.ogg
new file mode 100644
index 00000000000..961b50a5031
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/poweron.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/radiation.ogg b/Resources/Audio/Announcements/NEIL/radiation.ogg
new file mode 100644
index 00000000000..3ea2928c1d9
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/radiation.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/shuttlecalled.ogg b/Resources/Audio/Announcements/NEIL/shuttlecalled.ogg
new file mode 100644
index 00000000000..482bf133193
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/shuttlecalled.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/shuttledock.ogg b/Resources/Audio/Announcements/NEIL/shuttledock.ogg
new file mode 100644
index 00000000000..0615536555b
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/shuttledock.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/shuttlerecalled.ogg b/Resources/Audio/Announcements/NEIL/shuttlerecalled.ogg
new file mode 100644
index 00000000000..5a198ca5fe4
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/shuttlerecalled.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/ventclog.ogg b/Resources/Audio/Announcements/NEIL/ventclog.ogg
new file mode 100644
index 00000000000..90350f0e359
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/ventclog.ogg differ
diff --git a/Resources/Audio/Announcements/NEIL/welcome.ogg b/Resources/Audio/Announcements/NEIL/welcome.ogg
new file mode 100644
index 00000000000..00c8991276c
Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/welcome.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/aliens.ogg b/Resources/Audio/Announcements/VoxFem/aliens.ogg
new file mode 100644
index 00000000000..f7d1746247f
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/aliens.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/announce.ogg b/Resources/Audio/Announcements/VoxFem/announce.ogg
new file mode 100644
index 00000000000..0ee0f36d56f
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/announce.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/anomaly.ogg b/Resources/Audio/Announcements/VoxFem/anomaly.ogg
new file mode 100644
index 00000000000..7680726f153
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/anomaly.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/attention.ogg b/Resources/Audio/Announcements/VoxFem/attention.ogg
new file mode 100644
index 00000000000..912be4425eb
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/attention.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/commandreport.ogg b/Resources/Audio/Announcements/VoxFem/commandreport.ogg
new file mode 100644
index 00000000000..82e4ca425de
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/commandreport.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/fallback.ogg b/Resources/Audio/Announcements/VoxFem/fallback.ogg
new file mode 100644
index 00000000000..912be4425eb
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/fallback.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/ionstorm.ogg b/Resources/Audio/Announcements/VoxFem/ionstorm.ogg
new file mode 100644
index 00000000000..9f39713de6e
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/ionstorm.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/meteors.ogg b/Resources/Audio/Announcements/VoxFem/meteors.ogg
new file mode 100644
index 00000000000..8f1c3aeacbb
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/meteors.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/newai.ogg b/Resources/Audio/Announcements/VoxFem/newai.ogg
new file mode 100644
index 00000000000..35aba34564f
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/newai.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/outbreak7.ogg b/Resources/Audio/Announcements/VoxFem/outbreak7.ogg
new file mode 100644
index 00000000000..f21d4fca443
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/outbreak7.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/poweroff.ogg b/Resources/Audio/Announcements/VoxFem/poweroff.ogg
new file mode 100644
index 00000000000..1c6377c9d8d
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/poweroff.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/poweron.ogg b/Resources/Audio/Announcements/VoxFem/poweron.ogg
new file mode 100644
index 00000000000..9d18797d6ea
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/poweron.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/radiation.ogg b/Resources/Audio/Announcements/VoxFem/radiation.ogg
new file mode 100644
index 00000000000..ef395af3101
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/radiation.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/shuttlecalled.ogg b/Resources/Audio/Announcements/VoxFem/shuttlecalled.ogg
new file mode 100644
index 00000000000..716bf824654
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/shuttlecalled.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/shuttledock.ogg b/Resources/Audio/Announcements/VoxFem/shuttledock.ogg
new file mode 100644
index 00000000000..0f70bebc751
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/shuttledock.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/shuttlerecalled.ogg b/Resources/Audio/Announcements/VoxFem/shuttlerecalled.ogg
new file mode 100644
index 00000000000..5f6db404b87
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/shuttlerecalled.ogg differ
diff --git a/Resources/Audio/Announcements/VoxFem/welcome.ogg b/Resources/Audio/Announcements/VoxFem/welcome.ogg
new file mode 100644
index 00000000000..c7013dcbd5f
Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/welcome.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce.ogg b/Resources/Audio/Announcers/Intern/comms/announce.ogg
new file mode 100644
index 00000000000..0ee0f36d56f
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/1.ogg b/Resources/Audio/Announcers/Intern/comms/announce/1.ogg
new file mode 100644
index 00000000000..c4d182bc8c9
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/1.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/10.ogg b/Resources/Audio/Announcers/Intern/comms/announce/10.ogg
new file mode 100644
index 00000000000..7380ccdeefd
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/10.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/11.ogg b/Resources/Audio/Announcers/Intern/comms/announce/11.ogg
new file mode 100644
index 00000000000..ca548dcc20a
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/11.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/12.ogg b/Resources/Audio/Announcers/Intern/comms/announce/12.ogg
new file mode 100644
index 00000000000..8d71419798f
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/12.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/13.ogg b/Resources/Audio/Announcers/Intern/comms/announce/13.ogg
new file mode 100644
index 00000000000..128c7aa424d
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/13.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/14.ogg b/Resources/Audio/Announcers/Intern/comms/announce/14.ogg
new file mode 100644
index 00000000000..81d54101be5
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/14.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/2.ogg b/Resources/Audio/Announcers/Intern/comms/announce/2.ogg
new file mode 100644
index 00000000000..a2ef615d56c
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/2.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/3.ogg b/Resources/Audio/Announcers/Intern/comms/announce/3.ogg
new file mode 100644
index 00000000000..51613ff0367
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/3.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/4.ogg b/Resources/Audio/Announcers/Intern/comms/announce/4.ogg
new file mode 100644
index 00000000000..874536ca72f
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/4.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/5.ogg b/Resources/Audio/Announcers/Intern/comms/announce/5.ogg
new file mode 100644
index 00000000000..0af0d28ce18
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/5.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/6.ogg b/Resources/Audio/Announcers/Intern/comms/announce/6.ogg
new file mode 100644
index 00000000000..a65006a8c01
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/6.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/7.ogg b/Resources/Audio/Announcers/Intern/comms/announce/7.ogg
new file mode 100644
index 00000000000..4a1d3f013ae
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/7.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/8.ogg b/Resources/Audio/Announcers/Intern/comms/announce/8.ogg
new file mode 100644
index 00000000000..83ca80f4939
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/8.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/announce/9.ogg b/Resources/Audio/Announcers/Intern/comms/announce/9.ogg
new file mode 100644
index 00000000000..3c0c45b25d0
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/announce/9.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/commandReport/1.ogg b/Resources/Audio/Announcers/Intern/comms/commandReport/1.ogg
new file mode 100644
index 00000000000..e3108b13d17
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/commandReport/1.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/commandReport/2.ogg b/Resources/Audio/Announcers/Intern/comms/commandReport/2.ogg
new file mode 100644
index 00000000000..cd67500426c
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/commandReport/2.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/commandReport/3.ogg b/Resources/Audio/Announcers/Intern/comms/commandReport/3.ogg
new file mode 100644
index 00000000000..94241c5ba52
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/commandReport/3.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/welcome/1.ogg b/Resources/Audio/Announcers/Intern/comms/welcome/1.ogg
new file mode 100644
index 00000000000..758f1967e09
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/welcome/1.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/welcome/2.ogg b/Resources/Audio/Announcers/Intern/comms/welcome/2.ogg
new file mode 100644
index 00000000000..c2e72be510e
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/welcome/2.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/welcome/3.ogg b/Resources/Audio/Announcers/Intern/comms/welcome/3.ogg
new file mode 100644
index 00000000000..004f57371de
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/welcome/3.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/welcome/4.ogg b/Resources/Audio/Announcers/Intern/comms/welcome/4.ogg
new file mode 100644
index 00000000000..c4e1f7667cd
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/welcome/4.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/welcome/5.ogg b/Resources/Audio/Announcers/Intern/comms/welcome/5.ogg
new file mode 100644
index 00000000000..641b8208a4e
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/welcome/5.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/comms/welcome/6.ogg b/Resources/Audio/Announcers/Intern/comms/welcome/6.ogg
new file mode 100644
index 00000000000..b0fc38237f8
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/comms/welcome/6.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/events/aliens.ogg b/Resources/Audio/Announcers/Intern/events/aliens.ogg
new file mode 100644
index 00000000000..9dd3c076978
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/events/aliens.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/events/anomaly.ogg b/Resources/Audio/Announcers/Intern/events/anomaly.ogg
new file mode 100644
index 00000000000..9bed8eae3aa
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/events/anomaly.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/events/ion_storm.ogg b/Resources/Audio/Announcers/Intern/events/ion_storm.ogg
new file mode 100644
index 00000000000..9e7b5c6b23e
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/events/ion_storm.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/events/meteors.ogg b/Resources/Audio/Announcers/Intern/events/meteors.ogg
new file mode 100644
index 00000000000..c68c4bd8cc4
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/events/meteors.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/events/power_grid_check-complete.ogg b/Resources/Audio/Announcers/Intern/events/power_grid_check-complete.ogg
new file mode 100644
index 00000000000..509cd398e6e
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/events/power_grid_check-complete.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/events/power_grid_check.ogg b/Resources/Audio/Announcers/Intern/events/power_grid_check.ogg
new file mode 100644
index 00000000000..4b71053653f
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/events/power_grid_check.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/shuttle/shuttlecalled.ogg b/Resources/Audio/Announcers/Intern/shuttle/shuttlecalled.ogg
new file mode 100644
index 00000000000..c903367cdff
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/shuttle/shuttlecalled.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/shuttle/shuttledock.ogg b/Resources/Audio/Announcers/Intern/shuttle/shuttledock.ogg
new file mode 100644
index 00000000000..9f6ccd1a937
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/shuttle/shuttledock.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/shuttle/shuttlerecalled.ogg b/Resources/Audio/Announcers/Intern/shuttle/shuttlerecalled.ogg
new file mode 100644
index 00000000000..e259a79f35e
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/shuttle/shuttlerecalled.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/unused/animes.ogg b/Resources/Audio/Announcers/Intern/unused/animes.ogg
new file mode 100644
index 00000000000..36102c3e60e
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/unused/animes.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/unused/intercept.ogg b/Resources/Audio/Announcers/Intern/unused/intercept.ogg
new file mode 100644
index 00000000000..a87274abd97
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/unused/intercept.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/unused/newai.ogg b/Resources/Audio/Announcers/Intern/unused/newai.ogg
new file mode 100644
index 00000000000..c40b0990206
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/unused/newai.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/unused/outbreak7.ogg b/Resources/Audio/Announcers/Intern/unused/outbreak7.ogg
new file mode 100644
index 00000000000..297a1bbe8db
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/unused/outbreak7.ogg differ
diff --git a/Resources/Audio/Announcers/Intern/unused/radiation.ogg b/Resources/Audio/Announcers/Intern/unused/radiation.ogg
new file mode 100644
index 00000000000..08db53ebfd2
Binary files /dev/null and b/Resources/Audio/Announcers/Intern/unused/radiation.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/comms/announce.ogg b/Resources/Audio/Announcers/MedBot/comms/announce.ogg
new file mode 100644
index 00000000000..0ee0f36d56f
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/comms/announce.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/comms/attention.ogg b/Resources/Audio/Announcers/MedBot/comms/attention.ogg
new file mode 100644
index 00000000000..d4d5a270852
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/comms/attention.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/comms/command_report.ogg b/Resources/Audio/Announcers/MedBot/comms/command_report.ogg
new file mode 100644
index 00000000000..4e5c2e1d1ff
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/comms/command_report.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/comms/welcome.ogg b/Resources/Audio/Announcers/MedBot/comms/welcome.ogg
new file mode 100644
index 00000000000..f9a698fd080
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/comms/welcome.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/events/aliens.ogg b/Resources/Audio/Announcers/MedBot/events/aliens.ogg
new file mode 100644
index 00000000000..57fa70c3cae
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/events/aliens.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/events/anomaly.ogg b/Resources/Audio/Announcers/MedBot/events/anomaly.ogg
new file mode 100644
index 00000000000..d710999e1e1
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/events/anomaly.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/events/ion_storm.ogg b/Resources/Audio/Announcers/MedBot/events/ion_storm.ogg
new file mode 100644
index 00000000000..15aeac9f7ff
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/events/ion_storm.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/events/meteors.ogg b/Resources/Audio/Announcers/MedBot/events/meteors.ogg
new file mode 100644
index 00000000000..91208cae122
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/events/meteors.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/events/power_grid_check-complete.ogg b/Resources/Audio/Announcers/MedBot/events/power_grid_check-complete.ogg
new file mode 100644
index 00000000000..4b1605b1c74
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/events/power_grid_check-complete.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/events/power_grid_check.ogg b/Resources/Audio/Announcers/MedBot/events/power_grid_check.ogg
new file mode 100644
index 00000000000..875df350025
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/events/power_grid_check.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/fallback.ogg b/Resources/Audio/Announcers/MedBot/fallback.ogg
new file mode 100644
index 00000000000..d4d5a270852
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/fallback.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/shuttle/shuttlecalled.ogg b/Resources/Audio/Announcers/MedBot/shuttle/shuttlecalled.ogg
new file mode 100644
index 00000000000..a775567abed
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/shuttle/shuttlecalled.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/shuttle/shuttledock.ogg b/Resources/Audio/Announcers/MedBot/shuttle/shuttledock.ogg
new file mode 100644
index 00000000000..933928db067
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/shuttle/shuttledock.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/shuttle/shuttlerecalled.ogg b/Resources/Audio/Announcers/MedBot/shuttle/shuttlerecalled.ogg
new file mode 100644
index 00000000000..53b622576d4
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/shuttle/shuttlerecalled.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/unused/animes.ogg b/Resources/Audio/Announcers/MedBot/unused/animes.ogg
new file mode 100644
index 00000000000..7615a744a66
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/unused/animes.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/unused/intercept.ogg b/Resources/Audio/Announcers/MedBot/unused/intercept.ogg
new file mode 100644
index 00000000000..c59d0455c1c
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/unused/intercept.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/unused/newai.ogg b/Resources/Audio/Announcers/MedBot/unused/newai.ogg
new file mode 100644
index 00000000000..c40b0990206
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/unused/newai.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/unused/outbreak7.ogg b/Resources/Audio/Announcers/MedBot/unused/outbreak7.ogg
new file mode 100644
index 00000000000..1fc542534db
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/unused/outbreak7.ogg differ
diff --git a/Resources/Audio/Announcers/MedBot/unused/radiation.ogg b/Resources/Audio/Announcers/MedBot/unused/radiation.ogg
new file mode 100644
index 00000000000..5c48830b5f2
Binary files /dev/null and b/Resources/Audio/Announcers/MedBot/unused/radiation.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/alerts/blue.ogg b/Resources/Audio/Announcers/Michael/alerts/blue.ogg
new file mode 100644
index 00000000000..f6458c00bb3
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/alerts/blue.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/alerts/epsilon.ogg b/Resources/Audio/Announcers/Michael/alerts/epsilon.ogg
new file mode 100644
index 00000000000..82815eda27d
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/alerts/epsilon.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/alerts/gamma.ogg b/Resources/Audio/Announcers/Michael/alerts/gamma.ogg
new file mode 100644
index 00000000000..0a402b6d331
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/alerts/gamma.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/alerts/green.ogg b/Resources/Audio/Announcers/Michael/alerts/green.ogg
new file mode 100644
index 00000000000..d9d0f036fd4
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/alerts/green.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/alerts/red.ogg b/Resources/Audio/Announcers/Michael/alerts/red.ogg
new file mode 100644
index 00000000000..4a7f1e9472a
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/alerts/red.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/alerts/rename.js b/Resources/Audio/Announcers/Michael/alerts/rename.js
new file mode 100644
index 00000000000..0c52f5fb327
--- /dev/null
+++ b/Resources/Audio/Announcers/Michael/alerts/rename.js
@@ -0,0 +1,191 @@
+// Set the method variable to one of these
+const methods = [
+	'startsWith', // Replaces beginning with replace if matches searchfor  OR  cuts off the beginning if matches searchfor if replace is undefined
+	'endsWith', // Replaces end with replace if matches searchfor  OR  cuts off the end if matches searchfor if replace is undefined
+	'includes', // Replaces all instances of searchfor with replace  OR  removes all instances of searchfor if replace is undefined
+
+	'numberedSuffix', // Adds a numbered suffix to the end of the file name
+	'numberedPrefix', // Adds a numbered prefix to the beginning of the file name
+	'numbered', // Replaces the file name with a number
+];
+
+// User set variables
+const dirname = './'; // Where to look for files ('./' is the current directory)
+const includedirs = false; // Whether or not to include directories in the search
+const searchfor = 'code_'; // What to search for
+const replace = undefined; // What to replace with (undefined will remove the searchfor from the file name entirely)
+const removeextraperiods = true; // Whether or not to remove extra periods in the file name (good for numbered methods)
+const method = 'startsWith'; // Which method to use (see above)
+const startingnumber = 0; // What number to start at (only used with numbered methods)
+const debuglog = true; // Provides some extra info about what's going on
+// End of user set variables
+
+
+// Check if method is valid
+if (typeof method !== 'string' || !methods.includes(method)) return console.log(`ERROR:  Invalid method ${method}`);
+else console.log('INFO:  Using method: ' + method);
+
+// Check if dirname is valid
+if (typeof dirname !== 'string') return console.log('ERROR:  Invalid dirname');
+else console.log('INFO:  Using directory: ' + dirname);
+
+// Warn of includedirs
+if (includedirs) console.log('WARNING:  Including directories in search');
+else console.log('INFO:  Not including directories in search');
+
+// Check if searchfor is valid
+if (typeof searchfor !== 'string' && !method.includes('numbered')) return console.log('ERROR:  Invalid searchfor');
+if (typeof searchfor !== 'string' && method.includes('numbered')) console.log('WARNING:  Searchfor is undefined, this will replace the file name with a number');
+else console.log(`INFO:  Searching for: ${searchfor}`);
+
+// Warn if replace is undefined
+if (replace === undefined) console.log('WARNING:  Replace is undefined, this will remove the searchfor from the file name entirely');
+else console.log(`INFO:  Replacing with: ${replace}`);
+
+// Tell user if startingnumber is not 0
+if (startingnumber !== 0) console.log(`INFO:  Starting number: ${startingnumber}`);
+
+// Check if debuglog is enabled
+if (debuglog) console.log('INFO:  Debug log is enabled');
+else console.log('INFO:  Debug log is disabled');
+
+
+console.log('\n');
+console.log('INFO:  Starting search...');
+console.log('\n');
+
+
+const fs = require('fs');
+const files = fs.readdirSync(dirname);
+let number = 0 + startingnumber;
+
+
+// Debug log
+if (debuglog) {
+	console.log('DEBUG:  Files:');
+	console.log(files);
+	console.log(`DEBUG:  Files type: ${typeof files}`);
+	console.log('\n');
+}
+
+
+files.forEach((file) => {
+	// Split file name and extension
+	// If there is no extension, name[1] will be a blank string to avoid files getting fucked up
+	let name = file.includes('.') ? file.split('.') : [file, ''];
+	name.reverse();
+	if (name[0].length > 0) name[0] = '.' + name[0];
+	var extension = name[0];
+	name.reverse();
+	if (removeextraperiods) name = [name.join('').slice(0, -extension.length), extension];
+	else name = [name.join('.').slice(0, -extension.length), extension];
+
+
+	// Check if file is this script
+	if (process.argv[1].includes(name.join(''))) return;
+
+
+	// Debug log
+	if (debuglog) console.log(`DEBUG:  File name: ${name[0]}`);
+
+
+	// Check if file is a directory
+	if (!includedirs) {
+		try {
+			if (fs.readdirSync(dirname + file).length) {
+				if (debuglog) console.log(`DEBUG:  File is a directory, skipping: ${name[0]}`);
+				if (debuglog) console.log('\n');
+				return;
+			}
+		} catch (e) {
+			if (debuglog) console.log(`DEBUG:  File is a file: ${name[0]}`);
+		}
+	} else {
+		try {
+			if (fs.readdirSync(dirname + file).length) {
+				if (debuglog) console.log(`DEBUG:  File is a directory: ${name[0]}`);
+			}
+		} catch (e) {
+			if (debuglog) console.log(`DEBUG:  File is a file: ${name[0]}`);
+		}
+	}
+
+
+	if (method === 'startsWith') {
+		if (!name[0].startsWith(searchfor)) {
+			if (debuglog) console.log(`DEBUG:  File name does not start with '${searchfor}': ${name[0]}`);
+			if (debuglog) console.log('\n');
+			return;
+		}
+
+		if (replace) {
+			fs.renameSync(dirname + '/' + file, dirname + '/' + replace + name[0].slice(searchfor.length) + name[1]);
+		} else {
+			fs.renameSync(dirname + '/' + file, dirname + '/' + name[0].slice(searchfor.length) + name[1]);
+		}
+	} else if (method === 'endsWith') {
+		if (!name[0].endsWith(searchfor)) {
+			if (debuglog) console.log(`DEBUG:  File name does not end with '${searchfor}': ${name[0]}`);
+			if (debuglog) console.log('\n');
+			return;
+		}
+
+		if (replace) {
+			fs.renameSync(dirname + '/' + file, dirname + '/' + name[0].slice(0, -searchfor.length) + replace + name[1]);
+		} else {
+			fs.renameSync(dirname + '/' + file, dirname + '/' + name[0].slice(0, -searchfor.length) + name[1]);
+		}
+	} else if (method === 'includes') {
+		if (!name[0].includes(searchfor)) {
+			if (debuglog) console.log(`DEBUG:  File name does not include '${searchfor}': ${name[0]}`);
+			if (debuglog) console.log('\n');
+			return;
+		}
+
+		const regex = new RegExp(searchfor, 'g');
+
+		if (replace) {
+			fs.renameSync(dirname + '/' + file, dirname + '/' + name[0].replace(regex, replace) + name[1]);
+		} else {
+			fs.renameSync(dirname + '/' + file, dirname + '/' + name[0].replace(regex, '') + name[1]);
+		}
+	} else if (method === 'numberedPrefix') {
+		if (!name[0].startsWith(searchfor)) {
+			if (debuglog) console.log(`DEBUG:  File name does not start with '${searchfor}': ${name[0]}`);
+			if (debuglog) console.log('\n');
+			return;
+		}
+
+		fs.renameSync(dirname + '/' + file, dirname + '/' + number + name[0] + name[1]);
+
+		number++;
+	} else if (method === 'numberedSuffix') {
+		if (!name[0].endsWith(searchfor)) {
+			if (debuglog) console.log(`DEBUG:  File name does not end with '${searchfor}': ${name[0]}`);
+			if (debuglog) console.log('\n');
+			return;
+		}
+
+		fs.renameSync(dirname + '/' + file, dirname + '/' + name[0] + number + name[1]);
+
+		number++;
+	} else if (method === 'numbered') {
+		if (typeof searchfor === 'string') {
+			if (!name[0].includes(searchfor)) {
+				if (debuglog) console.log(`DEBUG:  File name does not include '${searchfor}': ${name[0]}`);
+				if (debuglog) console.log('\n');
+				return;
+			}
+
+			fs.renameSync(dirname + '/' + file, dirname + '/' + number + name[1]);
+		} else {
+			fs.renameSync(dirname + '/' + file, dirname + '/' + number + name[1]);
+		}
+
+		number++;
+	}
+
+	console.log('\n');
+});
+
+console.log('INFO:  Search complete');
diff --git a/Resources/Audio/Announcers/Michael/alerts/violet.ogg b/Resources/Audio/Announcers/Michael/alerts/violet.ogg
new file mode 100644
index 00000000000..7a611d819eb
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/alerts/violet.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/alerts/white.ogg b/Resources/Audio/Announcers/Michael/alerts/white.ogg
new file mode 100644
index 00000000000..1bb3afd354c
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/alerts/white.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/alerts/yellow.ogg b/Resources/Audio/Announcers/Michael/alerts/yellow.ogg
new file mode 100644
index 00000000000..3a72eca3bbc
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/alerts/yellow.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/comms/attention.ogg b/Resources/Audio/Announcers/Michael/comms/attention.ogg
new file mode 100644
index 00000000000..e25fdf2af7e
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/comms/attention.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/comms/welcome.ogg b/Resources/Audio/Announcers/Michael/comms/welcome.ogg
new file mode 100644
index 00000000000..32d90041090
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/comms/welcome.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/events/aliens.ogg b/Resources/Audio/Announcers/Michael/events/aliens.ogg
new file mode 100644
index 00000000000..1293b3ced5b
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/events/aliens.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/events/bureaucratic_error.ogg b/Resources/Audio/Announcers/Michael/events/bureaucratic_error.ogg
new file mode 100644
index 00000000000..2bb2710acf0
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/events/bureaucratic_error.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/events/gas_leak.ogg b/Resources/Audio/Announcers/Michael/events/gas_leak.ogg
new file mode 100644
index 00000000000..26912c859d1
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/events/gas_leak.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/events/kudzu_growth.ogg b/Resources/Audio/Announcers/Michael/events/kudzu_growth.ogg
new file mode 100644
index 00000000000..31eccef518b
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/events/kudzu_growth.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/events/meteors.ogg b/Resources/Audio/Announcers/Michael/events/meteors.ogg
new file mode 100644
index 00000000000..62a21625712
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/events/meteors.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/events/noospheric_storm.ogg b/Resources/Audio/Announcers/Michael/events/noospheric_storm.ogg
new file mode 100644
index 00000000000..eedaaf5699b
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/events/noospheric_storm.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/events/power_grid_check-complete.ogg b/Resources/Audio/Announcers/Michael/events/power_grid_check-complete.ogg
new file mode 100644
index 00000000000..de5fa1ff401
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/events/power_grid_check-complete.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/events/power_grid_check.ogg b/Resources/Audio/Announcers/Michael/events/power_grid_check.ogg
new file mode 100644
index 00000000000..07964d240e7
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/events/power_grid_check.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/events/vent_clog.ogg b/Resources/Audio/Announcers/Michael/events/vent_clog.ogg
new file mode 100644
index 00000000000..16fbf88e03f
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/events/vent_clog.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/fallback.ogg b/Resources/Audio/Announcers/Michael/fallback.ogg
new file mode 100644
index 00000000000..e25fdf2af7e
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/fallback.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/shuttle/shuttle_called.ogg b/Resources/Audio/Announcers/Michael/shuttle/shuttle_called.ogg
new file mode 100644
index 00000000000..261ecabf6e5
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/shuttle/shuttle_called.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/shuttle/shuttle_dock.ogg b/Resources/Audio/Announcers/Michael/shuttle/shuttle_dock.ogg
new file mode 100644
index 00000000000..a83b482f49a
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/shuttle/shuttle_dock.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/shuttle/shuttle_recalled.ogg b/Resources/Audio/Announcers/Michael/shuttle/shuttle_recalled.ogg
new file mode 100644
index 00000000000..b104ea561a8
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/shuttle/shuttle_recalled.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/unused/outbreak7.ogg b/Resources/Audio/Announcers/Michael/unused/outbreak7.ogg
new file mode 100644
index 00000000000..fc584db60c4
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/unused/outbreak7.ogg differ
diff --git a/Resources/Audio/Announcers/Michael/unused/radiation.ogg b/Resources/Audio/Announcers/Michael/unused/radiation.ogg
new file mode 100644
index 00000000000..7b7ca0c2b9e
Binary files /dev/null and b/Resources/Audio/Announcers/Michael/unused/radiation.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/alerts/code_blue.ogg b/Resources/Audio/Announcers/NEIL/alerts/code_blue.ogg
new file mode 100644
index 00000000000..48d9c6548b6
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/alerts/code_blue.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/alerts/code_delta.ogg b/Resources/Audio/Announcers/NEIL/alerts/code_delta.ogg
new file mode 100644
index 00000000000..70826719156
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/alerts/code_delta.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/alerts/code_epsilon.ogg b/Resources/Audio/Announcers/NEIL/alerts/code_epsilon.ogg
new file mode 100644
index 00000000000..a8db858b1af
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/alerts/code_epsilon.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/alerts/code_gamma.ogg b/Resources/Audio/Announcers/NEIL/alerts/code_gamma.ogg
new file mode 100644
index 00000000000..3351acc2e0d
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/alerts/code_gamma.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/alerts/code_green.ogg b/Resources/Audio/Announcers/NEIL/alerts/code_green.ogg
new file mode 100644
index 00000000000..3c0031833be
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/alerts/code_green.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/alerts/code_red.ogg b/Resources/Audio/Announcers/NEIL/alerts/code_red.ogg
new file mode 100644
index 00000000000..209eb36ba11
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/alerts/code_red.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/alerts/code_violet.ogg b/Resources/Audio/Announcers/NEIL/alerts/code_violet.ogg
new file mode 100644
index 00000000000..c1681c1edb8
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/alerts/code_violet.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/alerts/code_white.ogg b/Resources/Audio/Announcers/NEIL/alerts/code_white.ogg
new file mode 100644
index 00000000000..24c942dfcb2
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/alerts/code_white.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/alerts/code_yellow.ogg b/Resources/Audio/Announcers/NEIL/alerts/code_yellow.ogg
new file mode 100644
index 00000000000..9139446d2b6
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/alerts/code_yellow.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/comms/announce.ogg b/Resources/Audio/Announcers/NEIL/comms/announce.ogg
new file mode 100644
index 00000000000..0ee0f36d56f
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/comms/announce.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/comms/attention.ogg b/Resources/Audio/Announcers/NEIL/comms/attention.ogg
new file mode 100644
index 00000000000..310fad3ef63
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/comms/attention.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/comms/welcome.ogg b/Resources/Audio/Announcers/NEIL/comms/welcome.ogg
new file mode 100644
index 00000000000..00c8991276c
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/comms/welcome.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/events/bureaucraticerror.ogg b/Resources/Audio/Announcers/NEIL/events/bureaucraticerror.ogg
new file mode 100644
index 00000000000..0cbafcf6276
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/events/bureaucraticerror.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/events/gasleak.ogg b/Resources/Audio/Announcers/NEIL/events/gasleak.ogg
new file mode 100644
index 00000000000..8efffd02c45
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/events/gasleak.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/events/kudzu.ogg b/Resources/Audio/Announcers/NEIL/events/kudzu.ogg
new file mode 100644
index 00000000000..4ddd2f636bc
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/events/kudzu.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/events/meteors.ogg b/Resources/Audio/Announcers/NEIL/events/meteors.ogg
new file mode 100644
index 00000000000..cf525441745
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/events/meteors.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/events/noosphericstorm.ogg b/Resources/Audio/Announcers/NEIL/events/noosphericstorm.ogg
new file mode 100644
index 00000000000..47b52f7cb47
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/events/noosphericstorm.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/events/power_grid_check-complete.ogg b/Resources/Audio/Announcers/NEIL/events/power_grid_check-complete.ogg
new file mode 100644
index 00000000000..961b50a5031
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/events/power_grid_check-complete.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/events/power_grid_check.ogg b/Resources/Audio/Announcers/NEIL/events/power_grid_check.ogg
new file mode 100644
index 00000000000..7d7a43825fe
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/events/power_grid_check.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/events/ventclog.ogg b/Resources/Audio/Announcers/NEIL/events/ventclog.ogg
new file mode 100644
index 00000000000..90350f0e359
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/events/ventclog.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/fallback.ogg b/Resources/Audio/Announcers/NEIL/fallback.ogg
new file mode 100644
index 00000000000..310fad3ef63
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/fallback.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/shuttle/shuttlecalled.ogg b/Resources/Audio/Announcers/NEIL/shuttle/shuttlecalled.ogg
new file mode 100644
index 00000000000..482bf133193
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/shuttle/shuttlecalled.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/shuttle/shuttledock.ogg b/Resources/Audio/Announcers/NEIL/shuttle/shuttledock.ogg
new file mode 100644
index 00000000000..0615536555b
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/shuttle/shuttledock.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/shuttle/shuttlerecalled.ogg b/Resources/Audio/Announcers/NEIL/shuttle/shuttlerecalled.ogg
new file mode 100644
index 00000000000..5a198ca5fe4
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/shuttle/shuttlerecalled.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/unused/outbreak7.ogg b/Resources/Audio/Announcers/NEIL/unused/outbreak7.ogg
new file mode 100644
index 00000000000..91067960125
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/unused/outbreak7.ogg differ
diff --git a/Resources/Audio/Announcers/NEIL/unused/radiation.ogg b/Resources/Audio/Announcers/NEIL/unused/radiation.ogg
new file mode 100644
index 00000000000..3ea2928c1d9
Binary files /dev/null and b/Resources/Audio/Announcers/NEIL/unused/radiation.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/comms/announce.ogg b/Resources/Audio/Announcers/VoxFem/comms/announce.ogg
new file mode 100644
index 00000000000..0ee0f36d56f
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/comms/announce.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/comms/attention.ogg b/Resources/Audio/Announcers/VoxFem/comms/attention.ogg
new file mode 100644
index 00000000000..912be4425eb
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/comms/attention.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/comms/command_report.ogg b/Resources/Audio/Announcers/VoxFem/comms/command_report.ogg
new file mode 100644
index 00000000000..82e4ca425de
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/comms/command_report.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/comms/welcome.ogg b/Resources/Audio/Announcers/VoxFem/comms/welcome.ogg
new file mode 100644
index 00000000000..c7013dcbd5f
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/comms/welcome.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/events/aliens.ogg b/Resources/Audio/Announcers/VoxFem/events/aliens.ogg
new file mode 100644
index 00000000000..f7d1746247f
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/events/aliens.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/events/anomaly.ogg b/Resources/Audio/Announcers/VoxFem/events/anomaly.ogg
new file mode 100644
index 00000000000..7680726f153
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/events/anomaly.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/events/ion_storm.ogg b/Resources/Audio/Announcers/VoxFem/events/ion_storm.ogg
new file mode 100644
index 00000000000..9f39713de6e
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/events/ion_storm.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/events/meteors.ogg b/Resources/Audio/Announcers/VoxFem/events/meteors.ogg
new file mode 100644
index 00000000000..8f1c3aeacbb
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/events/meteors.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/events/power_grid_check-complete.ogg b/Resources/Audio/Announcers/VoxFem/events/power_grid_check-complete.ogg
new file mode 100644
index 00000000000..9d18797d6ea
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/events/power_grid_check-complete.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/events/power_grid_check.ogg b/Resources/Audio/Announcers/VoxFem/events/power_grid_check.ogg
new file mode 100644
index 00000000000..1c6377c9d8d
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/events/power_grid_check.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/fallback.ogg b/Resources/Audio/Announcers/VoxFem/fallback.ogg
new file mode 100644
index 00000000000..912be4425eb
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/fallback.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/shuttle/shuttlecalled.ogg b/Resources/Audio/Announcers/VoxFem/shuttle/shuttlecalled.ogg
new file mode 100644
index 00000000000..716bf824654
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/shuttle/shuttlecalled.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/shuttle/shuttledock.ogg b/Resources/Audio/Announcers/VoxFem/shuttle/shuttledock.ogg
new file mode 100644
index 00000000000..0f70bebc751
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/shuttle/shuttledock.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/shuttle/shuttlerecalled.ogg b/Resources/Audio/Announcers/VoxFem/shuttle/shuttlerecalled.ogg
new file mode 100644
index 00000000000..5f6db404b87
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/shuttle/shuttlerecalled.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/unused/newai.ogg b/Resources/Audio/Announcers/VoxFem/unused/newai.ogg
new file mode 100644
index 00000000000..35aba34564f
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/unused/newai.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/unused/outbreak7.ogg b/Resources/Audio/Announcers/VoxFem/unused/outbreak7.ogg
new file mode 100644
index 00000000000..f21d4fca443
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/unused/outbreak7.ogg differ
diff --git a/Resources/Audio/Announcers/VoxFem/unused/radiation.ogg b/Resources/Audio/Announcers/VoxFem/unused/radiation.ogg
new file mode 100644
index 00000000000..ef395af3101
Binary files /dev/null and b/Resources/Audio/Announcers/VoxFem/unused/radiation.ogg differ
diff --git a/Resources/Audio/Effects/Fluids/attributions.yml b/Resources/Audio/Effects/Fluids/attributions.yml
index 4e28c992528..aebe3e3c3ff 100644
--- a/Resources/Audio/Effects/Fluids/attributions.yml
+++ b/Resources/Audio/Effects/Fluids/attributions.yml
@@ -12,3 +12,13 @@
   license: "CC0-1.0"
   copyright: "Created by brittmosel"
   source: "https://freesound.org/people/brittmosel/sounds/529300/"
+
+- files: ["splash.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by deadrobotmusic"
+  source: "https://freesound.org/people/deadrobotmusic/sounds/609953/"
+
+- files: ["flush.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by the_toilet_guy"
+  source: "https://freesound.org/people/the_toilet_guy/sounds/98770/"
diff --git a/Resources/Audio/Effects/Fluids/flush.ogg b/Resources/Audio/Effects/Fluids/flush.ogg
new file mode 100644
index 00000000000..f4ef31c2ab1
Binary files /dev/null and b/Resources/Audio/Effects/Fluids/flush.ogg differ
diff --git a/Resources/Audio/Effects/Fluids/splash.ogg b/Resources/Audio/Effects/Fluids/splash.ogg
new file mode 100644
index 00000000000..4233eff6db3
Binary files /dev/null and b/Resources/Audio/Effects/Fluids/splash.ogg differ
diff --git a/Resources/Audio/Effects/Lightning/attributions.yml b/Resources/Audio/Effects/Lightning/attributions.yml
index fa6cc9d165f..0bd92af1bbc 100644
--- a/Resources/Audio/Effects/Lightning/attributions.yml
+++ b/Resources/Audio/Effects/Lightning/attributions.yml
@@ -2,3 +2,13 @@
   license: CC-BY-NC-SA-3.0
   copyright: Citadel Station 13
   source: https://github.com/Citadel-Station-13/Citadel-Station-13/commit/35a1723e98a60f375df590ca572cc90f1bb80bd5
+
+- files: ["strobeepsilon.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by dj-34 (https://github.com/dj-34). Modified by Ko4erga"
+  source: "https://github.com/ss220-space/Paradise/blob/05043bcfb35c2e7bcf1efbdbfbf976e1a2504bc2/sound/effects/epsilon.ogg" 
+
+- files: ["strobe.ogg"]
+  source: "https://freesound.org/people/blukotek/sounds/431651/"
+  license: "CC0-1.0"
+  copyright: "Piotr Zaczek (blukotek) on freesound.org. Modified by Ko4erga"
diff --git a/Resources/Audio/Effects/Lightning/strobe.ogg b/Resources/Audio/Effects/Lightning/strobe.ogg
new file mode 100644
index 00000000000..0d8228c8865
Binary files /dev/null and b/Resources/Audio/Effects/Lightning/strobe.ogg differ
diff --git a/Resources/Audio/Effects/Lightning/strobeepsilon.ogg b/Resources/Audio/Effects/Lightning/strobeepsilon.ogg
new file mode 100644
index 00000000000..9f77e93b2dc
Binary files /dev/null and b/Resources/Audio/Effects/Lightning/strobeepsilon.ogg differ
diff --git a/Resources/Audio/Effects/Shadowkin/Powers/darkswapoff.ogg b/Resources/Audio/Effects/Shadowkin/Powers/darkswapoff.ogg
new file mode 100644
index 00000000000..61f331a68a1
Binary files /dev/null and b/Resources/Audio/Effects/Shadowkin/Powers/darkswapoff.ogg differ
diff --git a/Resources/Audio/Effects/Shadowkin/Powers/darkswapon.ogg b/Resources/Audio/Effects/Shadowkin/Powers/darkswapon.ogg
new file mode 100644
index 00000000000..deb6139934e
Binary files /dev/null and b/Resources/Audio/Effects/Shadowkin/Powers/darkswapon.ogg differ
diff --git a/Resources/Audio/Effects/Shadowkin/Powers/futuristic-teleport.ogg b/Resources/Audio/Effects/Shadowkin/Powers/futuristic-teleport.ogg
new file mode 100644
index 00000000000..87aeb33fdd9
Binary files /dev/null and b/Resources/Audio/Effects/Shadowkin/Powers/futuristic-teleport.ogg differ
diff --git a/Resources/Audio/Effects/Shadowkin/Powers/license.txt b/Resources/Audio/Effects/Shadowkin/Powers/license.txt
new file mode 100644
index 00000000000..c77ea8eb098
--- /dev/null
+++ b/Resources/Audio/Effects/Shadowkin/Powers/license.txt
@@ -0,0 +1,4 @@
+darkswapon.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/
+darkswapoff.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/
+futuristic-teleport.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/
+teleport.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/
diff --git a/Resources/Audio/Effects/Shadowkin/Powers/teleport.ogg b/Resources/Audio/Effects/Shadowkin/Powers/teleport.ogg
new file mode 100644
index 00000000000..3cca66b47cb
Binary files /dev/null and b/Resources/Audio/Effects/Shadowkin/Powers/teleport.ogg differ
diff --git a/Resources/Audio/Effects/closet_close.ogg b/Resources/Audio/Effects/closet_close.ogg
new file mode 100644
index 00000000000..124f5d85f5e
Binary files /dev/null and b/Resources/Audio/Effects/closet_close.ogg differ
diff --git a/Resources/Audio/Effects/closet_open.ogg b/Resources/Audio/Effects/closet_open.ogg
new file mode 100644
index 00000000000..86cbcea0d01
Binary files /dev/null and b/Resources/Audio/Effects/closet_open.ogg differ
diff --git a/Resources/Audio/Effects/phasein.ogg b/Resources/Audio/Effects/phasein.ogg
new file mode 100644
index 00000000000..8b74a7d42fd
Binary files /dev/null and b/Resources/Audio/Effects/phasein.ogg differ
diff --git a/Resources/Audio/Effects/podwoosh.ogg b/Resources/Audio/Effects/podwoosh.ogg
new file mode 100644
index 00000000000..e6fd58c7fc2
Binary files /dev/null and b/Resources/Audio/Effects/podwoosh.ogg differ
diff --git a/Resources/Audio/Effects/toggleoffcombat.ogg b/Resources/Audio/Effects/toggleoffcombat.ogg
new file mode 100644
index 00000000000..98df1726e98
Binary files /dev/null and b/Resources/Audio/Effects/toggleoffcombat.ogg differ
diff --git a/Resources/Audio/Effects/toggleoncombat.ogg b/Resources/Audio/Effects/toggleoncombat.ogg
new file mode 100644
index 00000000000..7336b9cf0e1
Binary files /dev/null and b/Resources/Audio/Effects/toggleoncombat.ogg differ
diff --git a/Resources/Audio/Items/Equip/toolbelt_equip.ogg b/Resources/Audio/Items/Equip/toolbelt_equip.ogg
new file mode 100644
index 00000000000..0ef67a3fd6c
Binary files /dev/null and b/Resources/Audio/Items/Equip/toolbelt_equip.ogg differ
diff --git a/Resources/Audio/Items/Handling/ammobox_drop.ogg b/Resources/Audio/Items/Handling/ammobox_drop.ogg
new file mode 100644
index 00000000000..13fce70fe3d
Binary files /dev/null and b/Resources/Audio/Items/Handling/ammobox_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/ammobox_pickup.ogg b/Resources/Audio/Items/Handling/ammobox_pickup.ogg
new file mode 100644
index 00000000000..9532a7697b9
Binary files /dev/null and b/Resources/Audio/Items/Handling/ammobox_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/book_drop.ogg b/Resources/Audio/Items/Handling/book_drop.ogg
new file mode 100644
index 00000000000..b492b665f59
Binary files /dev/null and b/Resources/Audio/Items/Handling/book_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/book_pickup.ogg b/Resources/Audio/Items/Handling/book_pickup.ogg
new file mode 100644
index 00000000000..120a4e4721a
Binary files /dev/null and b/Resources/Audio/Items/Handling/book_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/cardboardbox_drop.ogg b/Resources/Audio/Items/Handling/cardboardbox_drop.ogg
new file mode 100644
index 00000000000..7070ba1c342
Binary files /dev/null and b/Resources/Audio/Items/Handling/cardboardbox_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/cardboardbox_pickup.ogg b/Resources/Audio/Items/Handling/cardboardbox_pickup.ogg
new file mode 100644
index 00000000000..aa4e72129b0
Binary files /dev/null and b/Resources/Audio/Items/Handling/cardboardbox_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/cloth_drop.ogg b/Resources/Audio/Items/Handling/cloth_drop.ogg
new file mode 100644
index 00000000000..5bf734caba0
Binary files /dev/null and b/Resources/Audio/Items/Handling/cloth_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/cloth_pickup.ogg b/Resources/Audio/Items/Handling/cloth_pickup.ogg
new file mode 100644
index 00000000000..f46988887d1
Binary files /dev/null and b/Resources/Audio/Items/Handling/cloth_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/component_drop.ogg b/Resources/Audio/Items/Handling/component_drop.ogg
new file mode 100644
index 00000000000..95ba2591a31
Binary files /dev/null and b/Resources/Audio/Items/Handling/component_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/component_pickup.ogg b/Resources/Audio/Items/Handling/component_pickup.ogg
new file mode 100644
index 00000000000..fee7dd9d29f
Binary files /dev/null and b/Resources/Audio/Items/Handling/component_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/crowbar_drop.ogg b/Resources/Audio/Items/Handling/crowbar_drop.ogg
new file mode 100644
index 00000000000..77464110661
Binary files /dev/null and b/Resources/Audio/Items/Handling/crowbar_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/crowbar_pickup.ogg b/Resources/Audio/Items/Handling/crowbar_pickup.ogg
new file mode 100644
index 00000000000..79b276f8451
Binary files /dev/null and b/Resources/Audio/Items/Handling/crowbar_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/disk_drop.ogg b/Resources/Audio/Items/Handling/disk_drop.ogg
new file mode 100644
index 00000000000..3174b88117f
Binary files /dev/null and b/Resources/Audio/Items/Handling/disk_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/disk_pickup.ogg b/Resources/Audio/Items/Handling/disk_pickup.ogg
new file mode 100644
index 00000000000..8f67406a5fb
Binary files /dev/null and b/Resources/Audio/Items/Handling/disk_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/drinkglass_drop.ogg b/Resources/Audio/Items/Handling/drinkglass_drop.ogg
new file mode 100644
index 00000000000..43bb732db3d
Binary files /dev/null and b/Resources/Audio/Items/Handling/drinkglass_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/drinkglass_pickup.ogg b/Resources/Audio/Items/Handling/drinkglass_pickup.ogg
new file mode 100644
index 00000000000..fcd1c7d3126
Binary files /dev/null and b/Resources/Audio/Items/Handling/drinkglass_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/matchbox_drop.ogg b/Resources/Audio/Items/Handling/matchbox_drop.ogg
new file mode 100644
index 00000000000..8e4e276c9e1
Binary files /dev/null and b/Resources/Audio/Items/Handling/matchbox_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/matchbox_pickup.ogg b/Resources/Audio/Items/Handling/matchbox_pickup.ogg
new file mode 100644
index 00000000000..82c23410e11
Binary files /dev/null and b/Resources/Audio/Items/Handling/matchbox_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/multitool_drop.ogg b/Resources/Audio/Items/Handling/multitool_drop.ogg
new file mode 100644
index 00000000000..67e0a41042c
Binary files /dev/null and b/Resources/Audio/Items/Handling/multitool_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/multitool_pickup.ogg b/Resources/Audio/Items/Handling/multitool_pickup.ogg
new file mode 100644
index 00000000000..cbd598ce896
Binary files /dev/null and b/Resources/Audio/Items/Handling/multitool_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/paper_drop.ogg b/Resources/Audio/Items/Handling/paper_drop.ogg
new file mode 100644
index 00000000000..27ce2b3d1a7
Binary files /dev/null and b/Resources/Audio/Items/Handling/paper_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/paper_pickup.ogg b/Resources/Audio/Items/Handling/paper_pickup.ogg
new file mode 100644
index 00000000000..55ae2b3d2db
Binary files /dev/null and b/Resources/Audio/Items/Handling/paper_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/screwdriver_drop.ogg b/Resources/Audio/Items/Handling/screwdriver_drop.ogg
new file mode 100644
index 00000000000..cca91f4dddd
Binary files /dev/null and b/Resources/Audio/Items/Handling/screwdriver_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/screwdriver_pickup.ogg b/Resources/Audio/Items/Handling/screwdriver_pickup.ogg
new file mode 100644
index 00000000000..6f6b29ddfc9
Binary files /dev/null and b/Resources/Audio/Items/Handling/screwdriver_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/sword_sheath.ogg b/Resources/Audio/Items/Handling/sword_sheath.ogg
new file mode 100644
index 00000000000..9e1d5cdc009
Binary files /dev/null and b/Resources/Audio/Items/Handling/sword_sheath.ogg differ
diff --git a/Resources/Audio/Items/Handling/sword_unsheath.ogg b/Resources/Audio/Items/Handling/sword_unsheath.ogg
new file mode 100644
index 00000000000..09867f5966a
Binary files /dev/null and b/Resources/Audio/Items/Handling/sword_unsheath.ogg differ
diff --git a/Resources/Audio/Items/Handling/toolbelt_drop.ogg b/Resources/Audio/Items/Handling/toolbelt_drop.ogg
new file mode 100644
index 00000000000..2a3c4655c49
Binary files /dev/null and b/Resources/Audio/Items/Handling/toolbelt_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/toolbelt_pickup.ogg b/Resources/Audio/Items/Handling/toolbelt_pickup.ogg
new file mode 100644
index 00000000000..58e5d25979a
Binary files /dev/null and b/Resources/Audio/Items/Handling/toolbelt_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/toolbox_drop.ogg b/Resources/Audio/Items/Handling/toolbox_drop.ogg
new file mode 100644
index 00000000000..abf56946278
Binary files /dev/null and b/Resources/Audio/Items/Handling/toolbox_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/toolbox_pickup.ogg b/Resources/Audio/Items/Handling/toolbox_pickup.ogg
new file mode 100644
index 00000000000..01a4ab4b3fa
Binary files /dev/null and b/Resources/Audio/Items/Handling/toolbox_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/welder_drop.ogg b/Resources/Audio/Items/Handling/welder_drop.ogg
new file mode 100644
index 00000000000..58b722ad7a7
Binary files /dev/null and b/Resources/Audio/Items/Handling/welder_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/welder_pickup.ogg b/Resources/Audio/Items/Handling/welder_pickup.ogg
new file mode 100644
index 00000000000..da78b06b848
Binary files /dev/null and b/Resources/Audio/Items/Handling/welder_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/wirecutter_drop.ogg b/Resources/Audio/Items/Handling/wirecutter_drop.ogg
new file mode 100644
index 00000000000..e099870fc7d
Binary files /dev/null and b/Resources/Audio/Items/Handling/wirecutter_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/wirecutter_pickup.ogg b/Resources/Audio/Items/Handling/wirecutter_pickup.ogg
new file mode 100644
index 00000000000..078faaf4324
Binary files /dev/null and b/Resources/Audio/Items/Handling/wirecutter_pickup.ogg differ
diff --git a/Resources/Audio/Items/Handling/wrench_drop.ogg b/Resources/Audio/Items/Handling/wrench_drop.ogg
new file mode 100644
index 00000000000..86020bf822c
Binary files /dev/null and b/Resources/Audio/Items/Handling/wrench_drop.ogg differ
diff --git a/Resources/Audio/Items/Handling/wrench_pickup.ogg b/Resources/Audio/Items/Handling/wrench_pickup.ogg
new file mode 100644
index 00000000000..860e0d70879
Binary files /dev/null and b/Resources/Audio/Items/Handling/wrench_pickup.ogg differ
diff --git a/Resources/Audio/Items/Whistle/closet_close.ogg b/Resources/Audio/Items/Whistle/closet_close.ogg
new file mode 100644
index 00000000000..124f5d85f5e
Binary files /dev/null and b/Resources/Audio/Items/Whistle/closet_close.ogg differ
diff --git a/Resources/Audio/Items/Whistle/closet_open.ogg b/Resources/Audio/Items/Whistle/closet_open.ogg
new file mode 100644
index 00000000000..86cbcea0d01
Binary files /dev/null and b/Resources/Audio/Items/Whistle/closet_open.ogg differ
diff --git a/Resources/Audio/Items/Whistle/phasein.ogg b/Resources/Audio/Items/Whistle/phasein.ogg
new file mode 100644
index 00000000000..8b74a7d42fd
Binary files /dev/null and b/Resources/Audio/Items/Whistle/phasein.ogg differ
diff --git a/Resources/Audio/Items/Whistle/podwoosh.ogg b/Resources/Audio/Items/Whistle/podwoosh.ogg
new file mode 100644
index 00000000000..e6fd58c7fc2
Binary files /dev/null and b/Resources/Audio/Items/Whistle/podwoosh.ogg differ
diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index e63b678ef81..c6fea50bd25 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -107,3 +107,13 @@
   license: "CC0-1.0"
   copyright: "Bhijn and Myr (github username deathride58)"
   source: "https://github.com/space-wizards/space-station-14/pull/23476"
+
+- files: ["drill_hit.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Created by vanilla with sounds from MinecraftGamerLR and stomachache on freesound.org"
+  source: "https://github.com/space-wizards/space-station-14/pull/26622"
+
+- files: ["drill_use.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by stomachache on freesound.org, processed by vanilla"
+  source: "https://freesound.org/s/262213/"
diff --git a/Resources/Audio/Items/drill_hit.ogg b/Resources/Audio/Items/drill_hit.ogg
index 0f8fa631aa1..dcdfe5df3a1 100644
Binary files a/Resources/Audio/Items/drill_hit.ogg and b/Resources/Audio/Items/drill_hit.ogg differ
diff --git a/Resources/Audio/Items/drill_use.ogg b/Resources/Audio/Items/drill_use.ogg
index 82f37cd35bb..6cd027d3b27 100644
Binary files a/Resources/Audio/Items/drill_use.ogg and b/Resources/Audio/Items/drill_use.ogg differ
diff --git a/Resources/Audio/Lobby/01 The Gamble.ogg b/Resources/Audio/Lobby/01 The Gamble.ogg
new file mode 100644
index 00000000000..c1cfdd53850
Binary files /dev/null and b/Resources/Audio/Lobby/01 The Gamble.ogg differ
diff --git a/Resources/Audio/Lobby/02 Guilty Pleasures.ogg b/Resources/Audio/Lobby/02 Guilty Pleasures.ogg
new file mode 100644
index 00000000000..9a281d19485
Binary files /dev/null and b/Resources/Audio/Lobby/02 Guilty Pleasures.ogg differ
diff --git a/Resources/Audio/Lobby/03 Jazzcuzzi.ogg b/Resources/Audio/Lobby/03 Jazzcuzzi.ogg
new file mode 100644
index 00000000000..49e7a332050
Binary files /dev/null and b/Resources/Audio/Lobby/03 Jazzcuzzi.ogg differ
diff --git a/Resources/Audio/Lobby/04 The Walk.ogg b/Resources/Audio/Lobby/04 The Walk.ogg
new file mode 100644
index 00000000000..481b08e650f
Binary files /dev/null and b/Resources/Audio/Lobby/04 The Walk.ogg differ
diff --git a/Resources/Audio/Lobby/05 Velvet Bossa.ogg b/Resources/Audio/Lobby/05 Velvet Bossa.ogg
new file mode 100644
index 00000000000..dcb639de436
Binary files /dev/null and b/Resources/Audio/Lobby/05 Velvet Bossa.ogg differ
diff --git a/Resources/Audio/Lobby/06 Colors.ogg b/Resources/Audio/Lobby/06 Colors.ogg
new file mode 100644
index 00000000000..83a8d3a3ee2
Binary files /dev/null and b/Resources/Audio/Lobby/06 Colors.ogg differ
diff --git a/Resources/Audio/Lobby/07 Midnight Jam.ogg b/Resources/Audio/Lobby/07 Midnight Jam.ogg
new file mode 100644
index 00000000000..18e4e8de8a1
Binary files /dev/null and b/Resources/Audio/Lobby/07 Midnight Jam.ogg differ
diff --git a/Resources/Audio/Lobby/08 Miles Ahead.ogg b/Resources/Audio/Lobby/08 Miles Ahead.ogg
new file mode 100644
index 00000000000..db632e77218
Binary files /dev/null and b/Resources/Audio/Lobby/08 Miles Ahead.ogg differ
diff --git a/Resources/Audio/Lobby/09 Moody.ogg b/Resources/Audio/Lobby/09 Moody.ogg
new file mode 100644
index 00000000000..29720317d21
Binary files /dev/null and b/Resources/Audio/Lobby/09 Moody.ogg differ
diff --git a/Resources/Audio/Lobby/10 Flying Away.ogg b/Resources/Audio/Lobby/10 Flying Away.ogg
new file mode 100644
index 00000000000..84bda9db8f7
Binary files /dev/null and b/Resources/Audio/Lobby/10 Flying Away.ogg differ
diff --git a/Resources/Audio/Lobby/11 Take It Easy.ogg b/Resources/Audio/Lobby/11 Take It Easy.ogg
new file mode 100644
index 00000000000..f305357554d
Binary files /dev/null and b/Resources/Audio/Lobby/11 Take It Easy.ogg differ
diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml
index dd7136875ab..1c5bac283ef 100644
--- a/Resources/Audio/Lobby/attributions.yml
+++ b/Resources/Audio/Lobby/attributions.yml
@@ -1,4 +1,4 @@
-- files: ["thunderdome.ogg"]
+- files: ["thunderdome.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "-Sector11 by MashedByMachines. Converted from MP3 to OGG."
   source: "https://www.newgrounds.com/audio/listen/312622"
diff --git a/Resources/Audio/Machines/AI/borg_death.ogg b/Resources/Audio/Machines/AI/borg_death.ogg
new file mode 100644
index 00000000000..9f6d1861904
Binary files /dev/null and b/Resources/Audio/Machines/AI/borg_death.ogg differ
diff --git a/Resources/Audio/Machines/Arcade/attributions.yml b/Resources/Audio/Machines/Arcade/attributions.yml
new file mode 100644
index 00000000000..afb120bee04
--- /dev/null
+++ b/Resources/Audio/Machines/Arcade/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["hahaha.ogg", "pew_pew.ogg", "sting_*.ogg"]
+  license: "CC0-1.0"
+  copyright: "Recorded by https://github.com/Tayrtahn"
+  source: "https://github.com/space-wizards/space-station-14/pull/24200"
diff --git a/Resources/Audio/Machines/Arcade/hahaha.ogg b/Resources/Audio/Machines/Arcade/hahaha.ogg
new file mode 100644
index 00000000000..8a01e5dd999
Binary files /dev/null and b/Resources/Audio/Machines/Arcade/hahaha.ogg differ
diff --git a/Resources/Audio/Machines/Arcade/pew_pew.ogg b/Resources/Audio/Machines/Arcade/pew_pew.ogg
new file mode 100644
index 00000000000..7919ca1e3aa
Binary files /dev/null and b/Resources/Audio/Machines/Arcade/pew_pew.ogg differ
diff --git a/Resources/Audio/Machines/Arcade/sting_01.ogg b/Resources/Audio/Machines/Arcade/sting_01.ogg
new file mode 100644
index 00000000000..e1b7e7fd779
Binary files /dev/null and b/Resources/Audio/Machines/Arcade/sting_01.ogg differ
diff --git a/Resources/Audio/Machines/Arcade/sting_02.ogg b/Resources/Audio/Machines/Arcade/sting_02.ogg
new file mode 100644
index 00000000000..83651e37a40
Binary files /dev/null and b/Resources/Audio/Machines/Arcade/sting_02.ogg differ
diff --git a/Resources/Audio/Machines/Arcade/sting_03.ogg b/Resources/Audio/Machines/Arcade/sting_03.ogg
new file mode 100644
index 00000000000..99bb7259cb3
Binary files /dev/null and b/Resources/Audio/Machines/Arcade/sting_03.ogg differ
diff --git a/Resources/Audio/Machines/Arcade/sting_04.ogg b/Resources/Audio/Machines/Arcade/sting_04.ogg
new file mode 100644
index 00000000000..07d39ca3ea0
Binary files /dev/null and b/Resources/Audio/Machines/Arcade/sting_04.ogg differ
diff --git a/Resources/Audio/Machines/Arcade/sting_05.ogg b/Resources/Audio/Machines/Arcade/sting_05.ogg
new file mode 100644
index 00000000000..2ebed2da3c8
Binary files /dev/null and b/Resources/Audio/Machines/Arcade/sting_05.ogg differ
diff --git a/Resources/Audio/Machines/Arcade/sting_06.ogg b/Resources/Audio/Machines/Arcade/sting_06.ogg
new file mode 100644
index 00000000000..6b369aa4c07
Binary files /dev/null and b/Resources/Audio/Machines/Arcade/sting_06.ogg differ
diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml
index a0f1c9f7e7f..38267ebd694 100644
--- a/Resources/Audio/Machines/attributions.yml
+++ b/Resources/Audio/Machines/attributions.yml
@@ -152,3 +152,12 @@
   license: "CC0-1.0"
   copyright: "dakamakat on freesound.org"
   source: "https://freesound.org/people/Dakamakat/sounds/717370/"
+
+- files:
+  - twobeep.ogg
+  - chime.ogg
+  - buzz-sigh.ogg
+  - buzztwo.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from TG station."
+  source: "https://github.com/tgstation/tgstation/tree/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0"
diff --git a/Resources/Audio/Machines/buzz-sigh.ogg b/Resources/Audio/Machines/buzz-sigh.ogg
new file mode 100644
index 00000000000..109c196e2c4
Binary files /dev/null and b/Resources/Audio/Machines/buzz-sigh.ogg differ
diff --git a/Resources/Audio/Machines/buzz-two.ogg b/Resources/Audio/Machines/buzz-two.ogg
new file mode 100644
index 00000000000..3f79e2a0e91
Binary files /dev/null and b/Resources/Audio/Machines/buzz-two.ogg differ
diff --git a/Resources/Audio/Machines/chime.ogg b/Resources/Audio/Machines/chime.ogg
new file mode 100644
index 00000000000..f20eb11d11b
Binary files /dev/null and b/Resources/Audio/Machines/chime.ogg differ
diff --git a/Resources/Audio/Machines/machine_vend.ogg b/Resources/Audio/Machines/machine_vend.ogg
index 8f7c187d0c3..92867a1f3d3 100644
Binary files a/Resources/Audio/Machines/machine_vend.ogg and b/Resources/Audio/Machines/machine_vend.ogg differ
diff --git a/Resources/Audio/Machines/twobeep.ogg b/Resources/Audio/Machines/twobeep.ogg
new file mode 100644
index 00000000000..26fc5a95a57
Binary files /dev/null and b/Resources/Audio/Machines/twobeep.ogg differ
diff --git a/Resources/Audio/Music/attributions.yml b/Resources/Audio/Music/attributions.yml
new file mode 100644
index 00000000000..c1ed2f1027f
--- /dev/null
+++ b/Resources/Audio/Music/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["deadling.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by Bolgarich"
+  source: "https://youtu.be/q7_NFEeeEac"
diff --git a/Resources/Audio/Music/deadline.ogg b/Resources/Audio/Music/deadline.ogg
new file mode 100644
index 00000000000..6ab081fc236
Binary files /dev/null and b/Resources/Audio/Music/deadline.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Equip/toolbelt_equip.ogg b/Resources/Audio/SimpleStation14/Items/Equip/toolbelt_equip.ogg
new file mode 100644
index 00000000000..0ef67a3fd6c
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Equip/toolbelt_equip.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/ammobox_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/ammobox_drop.ogg
new file mode 100644
index 00000000000..13fce70fe3d
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/ammobox_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/ammobox_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/ammobox_pickup.ogg
new file mode 100644
index 00000000000..9532a7697b9
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/ammobox_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/book_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/book_drop.ogg
new file mode 100644
index 00000000000..b492b665f59
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/book_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/book_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/book_pickup.ogg
new file mode 100644
index 00000000000..120a4e4721a
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/book_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_drop.ogg
new file mode 100644
index 00000000000..7070ba1c342
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_pickup.ogg
new file mode 100644
index 00000000000..aa4e72129b0
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/cloth_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/cloth_drop.ogg
new file mode 100644
index 00000000000..5bf734caba0
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/cloth_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/cloth_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/cloth_pickup.ogg
new file mode 100644
index 00000000000..f46988887d1
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/cloth_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/component_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/component_drop.ogg
new file mode 100644
index 00000000000..95ba2591a31
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/component_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/component_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/component_pickup.ogg
new file mode 100644
index 00000000000..fee7dd9d29f
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/component_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/crowbar_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/crowbar_drop.ogg
new file mode 100644
index 00000000000..77464110661
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/crowbar_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/crowbar_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/crowbar_pickup.ogg
new file mode 100644
index 00000000000..79b276f8451
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/crowbar_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/disk_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/disk_drop.ogg
new file mode 100644
index 00000000000..3174b88117f
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/disk_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/disk_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/disk_pickup.ogg
new file mode 100644
index 00000000000..8f67406a5fb
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/disk_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
new file mode 100644
index 00000000000..43bb732db3d
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg
new file mode 100644
index 00000000000..fcd1c7d3126
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/matchbox_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/matchbox_drop.ogg
new file mode 100644
index 00000000000..8e4e276c9e1
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/matchbox_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/matchbox_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/matchbox_pickup.ogg
new file mode 100644
index 00000000000..82c23410e11
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/matchbox_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/multitool_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/multitool_drop.ogg
new file mode 100644
index 00000000000..67e0a41042c
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/multitool_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/multitool_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/multitool_pickup.ogg
new file mode 100644
index 00000000000..cbd598ce896
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/multitool_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/paper_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/paper_drop.ogg
new file mode 100644
index 00000000000..27ce2b3d1a7
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/paper_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/paper_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/paper_pickup.ogg
new file mode 100644
index 00000000000..55ae2b3d2db
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/paper_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_drop.ogg
new file mode 100644
index 00000000000..cca91f4dddd
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_pickup.ogg
new file mode 100644
index 00000000000..6f6b29ddfc9
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/sword_sheath.ogg b/Resources/Audio/SimpleStation14/Items/Handling/sword_sheath.ogg
new file mode 100644
index 00000000000..9e1d5cdc009
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/sword_sheath.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg b/Resources/Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg
new file mode 100644
index 00000000000..09867f5966a
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_drop.ogg
new file mode 100644
index 00000000000..2a3c4655c49
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_pickup.ogg
new file mode 100644
index 00000000000..58e5d25979a
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/toolbox_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/toolbox_drop.ogg
new file mode 100644
index 00000000000..abf56946278
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/toolbox_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/toolbox_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/toolbox_pickup.ogg
new file mode 100644
index 00000000000..01a4ab4b3fa
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/toolbox_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/welder_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/welder_drop.ogg
new file mode 100644
index 00000000000..58b722ad7a7
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/welder_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/welder_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/welder_pickup.ogg
new file mode 100644
index 00000000000..da78b06b848
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/welder_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_drop.ogg
new file mode 100644
index 00000000000..e099870fc7d
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_pickup.ogg
new file mode 100644
index 00000000000..078faaf4324
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/wrench_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/wrench_drop.ogg
new file mode 100644
index 00000000000..86020bf822c
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/wrench_drop.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Items/Handling/wrench_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/wrench_pickup.ogg
new file mode 100644
index 00000000000..860e0d70879
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/wrench_pickup.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Machines/machine_vend.ogg b/Resources/Audio/SimpleStation14/Machines/machine_vend.ogg
new file mode 100644
index 00000000000..92867a1f3d3
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Machines/machine_vend.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Weapons/Melee/banjohit.ogg b/Resources/Audio/SimpleStation14/Weapons/Melee/banjohit.ogg
new file mode 100644
index 00000000000..06a86a535dd
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Weapons/Melee/banjohit.ogg differ
diff --git a/Resources/Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg b/Resources/Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg
new file mode 100644
index 00000000000..401fcf9677c
Binary files /dev/null and b/Resources/Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg differ
diff --git a/Resources/Audio/Voice/Slime/slime_crackleslap.ogg b/Resources/Audio/Voice/Slime/slime_crackleslap.ogg
new file mode 100644
index 00000000000..c9fcfbee448
Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_crackleslap.ogg differ
diff --git a/Resources/Audio/Voice/Slime/slime_laugh_f1.ogg b/Resources/Audio/Voice/Slime/slime_laugh_f1.ogg
new file mode 100644
index 00000000000..4b3b36810f3
Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_laugh_f1.ogg differ
diff --git a/Resources/Audio/Voice/Slime/slime_laugh_m1.ogg b/Resources/Audio/Voice/Slime/slime_laugh_m1.ogg
new file mode 100644
index 00000000000..7ad1ba95dae
Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_laugh_m1.ogg differ
diff --git a/Resources/Audio/Voice/Slime/slime_laugh_m2.ogg b/Resources/Audio/Voice/Slime/slime_laugh_m2.ogg
new file mode 100644
index 00000000000..0d08e954523
Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_laugh_m2.ogg differ
diff --git a/Resources/Audio/Voice/Slime/slime_schlorp.ogg b/Resources/Audio/Voice/Slime/slime_schlorp.ogg
new file mode 100644
index 00000000000..f125fbc03b0
Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_schlorp.ogg differ
diff --git a/Resources/Audio/Voice/Slime/slime_scream_f1.ogg b/Resources/Audio/Voice/Slime/slime_scream_f1.ogg
new file mode 100644
index 00000000000..99f8e7f91fa
Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_scream_f1.ogg differ
diff --git a/Resources/Audio/Voice/Slime/slime_scream_f2.ogg b/Resources/Audio/Voice/Slime/slime_scream_f2.ogg
new file mode 100644
index 00000000000..71ea5f4bdce
Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_scream_f2.ogg differ
diff --git a/Resources/Audio/Voice/Slime/slime_scream_m1.ogg b/Resources/Audio/Voice/Slime/slime_scream_m1.ogg
new file mode 100644
index 00000000000..67f4734bcf4
Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_scream_m1.ogg differ
diff --git a/Resources/Audio/Voice/Slime/slime_scream_m2.ogg b/Resources/Audio/Voice/Slime/slime_scream_m2.ogg
new file mode 100644
index 00000000000..bc499bad782
Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_scream_m2.ogg differ
diff --git a/Resources/Audio/Voice/Slime/slime_squish.ogg b/Resources/Audio/Voice/Slime/slime_squish.ogg
index 60e118e217b..e7c3509c4d8 100644
Binary files a/Resources/Audio/Voice/Slime/slime_squish.ogg and b/Resources/Audio/Voice/Slime/slime_squish.ogg differ
diff --git a/Resources/Audio/Weapons/Melee/banjohit.ogg b/Resources/Audio/Weapons/Melee/banjohit.ogg
new file mode 100644
index 00000000000..06a86a535dd
Binary files /dev/null and b/Resources/Audio/Weapons/Melee/banjohit.ogg differ
diff --git a/Resources/Audio/Weapons/Melee/rapierhit.ogg b/Resources/Audio/Weapons/Melee/rapierhit.ogg
new file mode 100644
index 00000000000..401fcf9677c
Binary files /dev/null and b/Resources/Audio/Weapons/Melee/rapierhit.ogg differ
diff --git a/Resources/Audio/Weapons/glug.ogg b/Resources/Audio/Weapons/glug.ogg
new file mode 100644
index 00000000000..424bedd3516
Binary files /dev/null and b/Resources/Audio/Weapons/glug.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1b79764a611..90223611fda 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4313,3 +4313,308 @@ Entries:
       message: You can now sign paper by alt-clicking it while holding a pen.
   id: 6139
   time: '2024-07-05T17:33:39.0000000+00:00'
+- author: WarMechanic
+  changes:
+    - type: Add
+      message: Added the Thievery trait, which provides various soft stripping bonuses
+    - type: Tweak
+      message: >-
+        Felinids no longer have passive thieving gloves, they instead get the
+        Thievery trait by default
+  id: 6140
+  time: '2024-07-05T17:49:25.0000000+00:00'
+- author: Froffy025
+  changes:
+    - type: Add
+      message: You can now carry most of the station pets.
+  id: 6141
+  time: '2024-07-05T17:49:57.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Fix
+      message: Job requirements are now displayed correctly.
+  id: 6142
+  time: '2024-07-05T19:10:24.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Tweak
+      message: >-
+        Events should now occur as frequently as before. Note: server owner can
+        configure the frequency on their server manually.
+  id: 6143
+  time: '2024-07-05T21:03:28.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        The catalog of items available via Loadouts has been greatly expanded.
+        Have fun customizing your characters!
+  id: 6144
+  time: '2024-07-05T22:53:36.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Tweak
+      message: Translator implants are now proper implants that can be removed.
+    - type: Tweak
+      message: Animalistic languages should now look less messy.
+    - type: Fix
+      message: Hopefully fixed language menu desync and other issues.
+  id: 6145
+  time: '2024-07-05T23:49:47.0000000+00:00'
+- author: Spatison
+  changes:
+    - type: Add
+      message: Added system
+  id: 6146
+  time: '2024-07-06T00:19:35.0000000+00:00'
+- author: Velcroboy
+  changes:
+    - type: Tweak
+      message: Changed asteroids to have more ore...and some danger
+  id: 6147
+  time: '2024-07-08T07:03:39.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Add
+      message: Languages are now marked in the chat!
+  id: 6148
+  time: '2024-07-09T19:01:38.0000000+00:00'
+- author: Spatison
+  changes:
+    - type: Fix
+      message: Food and handcuffs can now be given
+  id: 6149
+  time: '2024-07-09T19:32:11.0000000+00:00'
+- author: FoxxoTrrystan
+  changes:
+    - type: Tweak
+      message: >-
+        Power Resprites! (New SMES, APC, Airlarm, Camera, Substation, LightTube,
+        Intercom, FireAlarm and Substation)
+  id: 6150
+  time: '2024-07-09T19:37:03.0000000+00:00'
+- author: CodedCrow
+  changes:
+    - type: Add
+      message: Added an Arachne plushie
+  id: 6151
+  time: '2024-07-11T17:23:58.0000000+00:00'
+- author: osjarw
+  changes:
+    - type: Add
+      message: Wallmount substation electronics can now be created at an autolathe.
+  id: 6152
+  time: '2024-07-11T17:24:30.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Tweak
+      message: 'Players can now vote on two more gamemodes: Traitors and Hellshift.'
+  id: 6153
+  time: '2024-07-11T17:26:41.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: >-
+        Added two new foreigner traits that make your character unable to speak
+        Galactic Common and give you a translator instead.
+    - type: Tweak
+      message: >-
+        Translators can now be equipped in the neck slot and display useful info
+        when examined.
+  id: 6154
+  time: '2024-07-12T01:19:09.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Fix
+      message: Foreigner traits now work correctly.
+  id: 6155
+  time: '2024-07-12T17:46:37.0000000+00:00'
+- author: WarMechanic
+  changes:
+    - type: Add
+      message: >-
+        Added the Heavyweight Drunk trait, which doubles your alcoholism
+        potential.
+  id: 6156
+  time: '2024-07-12T19:02:15.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Add
+      message: Added 4 new announcers that will randomly be selected every shift
+  id: 6157
+  time: '2024-07-12T20:13:50.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: 'Mass Contests have returned in a new reworked form. '
+    - type: Add
+      message: >-
+        Weapon Recoil is now resisted by character mass. More massive characters
+        take less recoil, less massive characters take more recoil.
+    - type: Add
+      message: >-
+        Disarm and Shove actions are now modified by relative character mass. It
+        is easier to shove people around if you're bigger than them.
+    - type: Add
+      message: >-
+        Cablecuffs and Zipties are now easier to escape out of if you're
+        smaller. 
+  id: 6158
+  time: '2024-07-13T08:05:52.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Tweak
+      message: We got new ID Cards the old ones were soo tiny that they were lost.
+  id: 6159
+  time: '2024-07-14T23:12:33.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Tweak
+      message: >-
+        Shock collars can now be manufactured in the security techfab. They also
+        deal less damage and ignore insulated gloves.
+  id: 6160
+  time: '2024-07-14T23:14:03.0000000+00:00'
+- author: WarMechanic
+  changes:
+    - type: Fix
+      message: Fixed thieving trait not granting pocket vision
+  id: 6161
+  time: '2024-07-16T17:41:42.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: Many new sound effects have been implemented for items.
+  id: 6162
+  time: '2024-07-16T17:52:03.0000000+00:00'
+- author: gluesniffler
+  changes:
+    - type: Add
+      message: Added a new icon to the offer item interaction.
+    - type: Fix
+      message: Fixed typos in the offer item prompts.
+  id: 6163
+  time: '2024-07-16T18:18:18.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: You can now configure your zoom more precisely.
+  id: 6164
+  time: '2024-07-16T18:18:57.0000000+00:00'
+- author: dootythefrooty
+  changes:
+    - type: Add
+      message: Added Harpy Wings as a delicious dish.
+  id: 6165
+  time: '2024-07-16T18:21:27.0000000+00:00'
+- author: gluesniffler
+  changes:
+    - type: Add
+      message: Added an alert on the UI for when the user is walking or running.
+  id: 6166
+  time: '2024-07-16T21:39:46.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: >-
+        You can now lie down and stand up at will! The default keybind for it is
+        "R", but it can be changed in settings.
+  id: 6167
+  time: '2024-07-18T02:33:16.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: >-
+        Harpies can no longer buy Loadout items that are impossible for them to
+        wear due to having digitigrade legs. 
+  id: 6168
+  time: '2024-07-18T02:34:52.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Fix
+      message: Foreigner translator should now consume power, as intended.
+  id: 6169
+  time: '2024-07-18T08:22:52.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Atmospheric "Throws" are now calculated using object mass, and behave
+        accordingly. Tiny objects will shoot out of rooms quite fast!
+  id: 6170
+  time: '2024-07-18T08:24:58.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Rampant Brand Intelligence has been spotted infesting NT Stations, be on
+        the lookout for highly aggressive vending machines.
+  id: 6171
+  time: '2024-07-18T19:30:00.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Add
+      message: Added the ability to speak with Sign Language.
+  id: 6172
+  time: '2024-07-19T17:20:30.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Harpy Update 3, New markings for Harpies, all new species-specific
+        hardsuit & softsuit variations that feature wing sleeves.
+  id: 6173
+  time: '2024-07-20T04:40:01.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Add
+      message: Merged ~250-500 WizDen PRs
+  id: 6174
+  time: '2024-07-20T05:24:50.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Voice will no longer travel through space. If you are in space, you must
+        either have a radio to communicate with others, or get within hugging
+        distance of someone to talk.
+  id: 6175
+  time: '2024-07-21T06:47:41.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Camera Shake is now affected by character mass. Small characters
+        experience more camera shake. Large characters experience less. 
+  id: 6176
+  time: '2024-07-21T06:50:25.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        The Head Of Personnel can now hire people onto basic roles for each
+        department by vending PDAs. 
+  id: 6177
+  time: '2024-07-22T19:12:01.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: >-
+        Pipes and Wires are now correctly hidden by grass and asphalt once more.
+        Use a shovel to expose pipes hidden by grass.
+  id: 6178
+  time: '2024-07-22T19:34:07.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Fix
+      message: Job playtime requirements for loadouts and traits show correctly
+  id: 6179
+  time: '2024-07-23T14:18:46.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Fix
+      message: >-
+        False alarm event will no longer report events that should not be
+        reported.
+  id: 6180
+  time: '2024-07-24T03:18:56.0000000+00:00'
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 84796a94662..276f44a01f0 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, beck-thompson, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, CodedCrow, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Mnemotechnician, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, superjj18, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Fonts/Copperplate.otf b/Resources/Fonts/Copperplate.otf
new file mode 100644
index 00000000000..40d45aa46b6
Binary files /dev/null and b/Resources/Fonts/Copperplate.otf differ
diff --git a/Resources/Fonts/Mangat.ttf b/Resources/Fonts/Mangat.ttf
new file mode 100644
index 00000000000..de4c11beba5
Binary files /dev/null and b/Resources/Fonts/Mangat.ttf differ
diff --git a/Resources/Fonts/Noganas.ttf b/Resources/Fonts/Noganas.ttf
new file mode 100644
index 00000000000..afa0c82f03e
Binary files /dev/null and b/Resources/Fonts/Noganas.ttf differ
diff --git a/Resources/Fonts/RubikBubbles.ttf b/Resources/Fonts/RubikBubbles.ttf
new file mode 100644
index 00000000000..a653715c6cd
Binary files /dev/null and b/Resources/Fonts/RubikBubbles.ttf differ
diff --git a/Resources/Locale/en-US/administration/managers/admin-manager.ftl b/Resources/Locale/en-US/administration/managers/admin-manager.ftl
index b1bbcc4c8c1..b70f550fc37 100644
--- a/Resources/Locale/en-US/administration/managers/admin-manager.ftl
+++ b/Resources/Locale/en-US/administration/managers/admin-manager.ftl
@@ -6,4 +6,8 @@ admin-manager-no-longer-admin-message = You are no longer an admin.
 admin-manager-admin-permissions-updated-message = Your admin permission have been updated.
 admin-manager-admin-logout-message = Admin logout: {$name}
 admin-manager-admin-login-message = Admin login: {$name}
-admin-manager-admin-data-host-title = Host
\ No newline at end of file
+admin-manager-admin-data-host-title = Host
+admin-manager-stealthed-message = You are now a hidden admin.
+admin-manager-unstealthed-message = You are no longer hidden.
+admin-manager-self-enable-stealth = {$stealthAdminName} is now hidden.
+admin-manager-self-disable-stealth = {$exStealthAdminName} is no longer hidden.
diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl
index 795d740141b..ff2c0d9ee29 100644
--- a/Resources/Locale/en-US/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/alerts/alerts.ftl
@@ -110,3 +110,9 @@ alerts-revenant-essence-desc = The power of souls. It sustains you and is used f
 
 alerts-revenant-corporeal-name = Corporeal
 alerts-revenant-corporeal-desc = You have manifested physically. People around you can see and hurt you.
+
+alerts-walking-name = Walking
+alerts-walking-desc = Indicates how fast you're moving.
+
+alerts-offer-name = Offer
+alerts-offer-desc = Someone offers you an item.
diff --git a/Resources/Locale/en-US/announcements/announcers/announcers.ftl b/Resources/Locale/en-US/announcements/announcers/announcers.ftl
new file mode 100644
index 00000000000..d18857a38e2
--- /dev/null
+++ b/Resources/Locale/en-US/announcements/announcers/announcers.ftl
@@ -0,0 +1,5 @@
+announcer-Intern-name=Central Command
+announcer-MedBot-name=Automated
+announcer-Michael-name=Michael
+announcer-NEIL-name=N.E.I.L.
+announcer-VoxFem-name=Automated
diff --git a/Resources/Locale/en-US/anomaly/anomaly.ftl b/Resources/Locale/en-US/anomaly/anomaly.ftl
index 3a398d482e7..da5882fa62f 100644
--- a/Resources/Locale/en-US/anomaly/anomaly.ftl
+++ b/Resources/Locale/en-US/anomaly/anomaly.ftl
@@ -8,20 +8,29 @@ anomaly-particles-delta = Delta particles
 anomaly-particles-epsilon = Epsilon particles
 anomaly-particles-zeta = Zeta particles
 anomaly-particles-omega = Omega particles
+anomaly-particles-sigma = Sigma particles
 
 anomaly-scanner-component-scan-complete = Scan complete!
 
 anomaly-scanner-ui-title = anomaly scanner
 anomaly-scanner-no-anomaly = No anomaly currently scanned.
 anomaly-scanner-severity-percentage = Current severity: [color=gray]{$percent}[/color]
+anomaly-scanner-severity-percentage-unknown = Current severity: [color=red]ERROR[/color]
 anomaly-scanner-stability-low = Current anomaly state: [color=gold]Decaying[/color]
 anomaly-scanner-stability-medium = Current anomaly state: [color=forestgreen]Stable[/color]
 anomaly-scanner-stability-high = Current anomaly state: [color=crimson]Growing[/color]
+anomaly-scanner-stability-unknown = Current anomaly state: [color=red]ERROR[/color]
 anomaly-scanner-point-output = Point output: [color=gray]{$point}[/color]
+anomaly-scanner-point-output-unknown = Point output: [color=red]ERROR[/color]
 anomaly-scanner-particle-readout = Particle Reaction Analysis:
 anomaly-scanner-particle-danger = - [color=crimson]Danger type:[/color] {$type}
 anomaly-scanner-particle-unstable = - [color=plum]Unstable type:[/color] {$type}
 anomaly-scanner-particle-containment = - [color=goldenrod]Containment type:[/color] {$type}
+anomaly-scanner-particle-transformation = - [color=#6b75fa]Transformation type:[/color] {$type}
+anomaly-scanner-particle-danger-unknown = - [color=crimson]Danger type:[/color] [color=red]ERROR[/color]
+anomaly-scanner-particle-unstable-unknown = - [color=plum]Unstable type:[/color] [color=red]ERROR[/color]
+anomaly-scanner-particle-containment-unknown = - [color=goldenrod]Containment type:[/color] [color=red]ERROR[/color]
+anomaly-scanner-particle-transformation-unknown = - [color=#6b75fa]Transformation type:[/color] [color=red]ERROR[/color]
 anomaly-scanner-pulse-timer = Time until next pulse: [color=gray]{$time}[/color]
 
 anomaly-gorilla-core-slot-name = Anomaly core
@@ -65,3 +74,23 @@ anomaly-command-supercritical = Makes a target anomaly go supercritical
 # Flavor text on the footer
 anomaly-generator-flavor-left = Anomaly may spawn inside the operator.
 anomaly-generator-flavor-right = v1.1
+
+anomaly-behavior-unknown = [color=red]ERROR. Cannot be read.[/color]
+
+anomaly-behavior-title = behavior deviation analysis:
+anomaly-behavior-point =[color=gold]Anomaly produces {$mod}% of the points[/color] 
+
+anomaly-behavior-safe = [color=forestgreen]The anomaly is extremely stable. Extremely rare pulsations.[/color]
+anomaly-behavior-slow = [color=forestgreen]The frequency of pulsations is much less frequent.[/color]
+anomaly-behavior-light = [color=forestgreen]Pulsation power is significantly reduced.[/color]
+anomaly-behavior-balanced = No behavior deviations detected.
+anomaly-behavior-delayed-force = The frequency of pulsations is greatly reduced, but their power is increased.
+anomaly-behavior-rapid = The frequency of the pulsation is much higher, but its strength is attenuated.
+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-secret = Interference detected. Some data cannot be read
+anomaly-behavior-inconstancy = [color=crimson]Impermanence has been detected. Particle types can change over time.[/color]
+anomaly-behavior-fast = [color=crimson]The pulsation frequency is strongly increased.[/color]
+anomaly-behavior-strenght = [color=crimson]The pulsation power is significantly increased.[/color]
+anomaly-behavior-moving = [color=crimson]Coordinate instability was detected.[/color]
\ No newline at end of file
diff --git a/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl b/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl
new file mode 100644
index 00000000000..500a5305621
--- /dev/null
+++ b/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl
@@ -0,0 +1,6 @@
+
+### Announcement
+
+earlyleave-cryo-job-unknown = Unknown
+earlyleave-cryo-announcement = {$character} ({$job}) has entered cryogenic storage!
+earlyleave-cryo-sender = Station
diff --git a/Resources/Locale/en-US/burning/bodyburn.ftl b/Resources/Locale/en-US/burning/bodyburn.ftl
new file mode 100644
index 00000000000..896a0b6d042
--- /dev/null
+++ b/Resources/Locale/en-US/burning/bodyburn.ftl
@@ -0,0 +1 @@
+bodyburn-text-others = {$name}'s body burns to ash!
diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl
index 63c68de1053..b332517c70d 100644
--- a/Resources/Locale/en-US/cargo/bounties.ftl
+++ b/Resources/Locale/en-US/cargo/bounties.ftl
@@ -47,8 +47,24 @@ bounty-item-organs = Organ
 bounty-item-labeler = Hand labeler
 bounty-item-warm-cloth = Warm clothes
 bounty-item-battery = Battery
-bounty-lasergun = Laser gun
-bounty-food = Meat food
+bounty-item-lasergun = Laser gun
+bounty-item-food = Meat food
+bounty-item-fruit = Fruit
+bounty-item-vegetable = Vegetable
+bounty-item-chili = Bowl of chili
+bounty-item-rollerskates = Roller skates
+bounty-item-bedsheet = Bedsheet
+bounty-item-bandana = Bandana
+bounty-item-steak = Steak
+bounty-item-banana = Banana
+bounty-item-beer = Beer
+bounty-item-hi-viz-vest = Hi-viz vest
+bounty-item-torch = Torch
+bounty-item-medkit-box = Medkit box
+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-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.
@@ -100,3 +116,19 @@ bounty-description-warm-cloth = The Unath construction crew freezes and is unabl
 bounty-description-battery = As the Arachnid settlement prepares for a solar flare, they are requesting a large shipment of power batteries. We're sending out a request for delivery.
 bounty-description-lasergun = The Salvage Caravan requests a large shipment of laser weapons to mop up a hive of xenomorphs.
 bounty-description-food = After the rat king invasion, a neighboring unathi station was left completely without food. A large meat food shipment is needed.
+bounty-description-fruit = A heroic monkey helped the chaplain catch a troublemaker hiding in the chapel, and the crew wants to reward him for his good work.
+bounty-description-vegetable = The new chef is a vegetarian, and botany can't keep up with their demands. We need some additional veggies to help keep things stocked.
+bounty-description-chili = Today's the Centcomm Chili Cookoff, and, well, a few of us forgot to make some. Please help cover for us.
+bounty-description-rollerskates = CentComm Security is proposing a new strategy for helping officers win foot pursuits. Send them a couple so they cna learn how bad an idea this is.
+bounty-description-bedsheet = Someone in Atmos keeps turning down the heater, and we're all shivering in our beds. Please send us some extra sheets to stay warm.
+bounty-description-bandana =  Bzzzt... Transmission from prison planet OC-1001: We're... reorganizing our command structure. Send us some bandanas so we can tell gan- I mean, departments apart.
+bounty-description-steak = The vegetarian cook is refusing to make us anything with meat, and the lizards are getting restless. Can you smuggle us a few steaks to keep them happy?
+bounty-description-banana = Hi station! Botany won't gimme any more. They said slipping the HoS out an open airlock wasn't funny! Can you believe it? Help me out! HONK.
+bounty-description-beer = Some nefarious agent has stolen every single drink in the bar. Yes, everything. Help tide us over until we can find them.
+bounty-description-hi-viz-vest  = The clown stole the AME controller and won't back. It's pretty dark in here. Some hi-viz vests would make seeing each other in the dark a little mroe bearable.
+bounty-description-torch = The chef made all the monkeys and kobolds at once, and they rebelled and took over the cargo shuttle. They're demanding supplies and free passage to a jungle planet, and we're giving in to their demands. All they need now is a few torches.
+bounty-description-medkit-box = CentComm is putting on a play set in a hospital, and needs some props. Just send us some empty medkit boxes, and the show will go on!
+bounty-description-cardobard-box = "The Cardborgs Cometh" is a new play premiering tomorrow, and the costuming team is woefully unprepared. Send us some boxes to work with.
+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.
diff --git a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
index ec80d91f47f..bf7868e3df7 100644
--- a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
@@ -1,5 +1,6 @@
 bounty-console-menu-title = Cargo bounty console
 bounty-console-label-button-text = Print label
+bounty-console-skip-button-text = Skip
 bounty-console-time-label = Time: [color=orange]{$time}[/color]
 bounty-console-reward-label = Reward: [color=limegreen]${$reward}[/color]
 bounty-console-manifest-label = Manifest: [color=orange]{$item}[/color]
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index fab815b4f90..6fbeb83ed41 100644
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -21,11 +21,11 @@ chat-manager-whisper-headset-on-message = You can't whisper on the radio!
 chat-manager-server-wrap-message = [bold]{$message}[/bold]
 chat-manager-sender-announcement-wrap-message = [font size=14][bold]{$sender} Announcement:[/font][font size=12]
                                                 {$message}[/bold][/font]
-chat-manager-entity-say-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font]
-chat-manager-entity-say-bold-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent][bold]{$message}[/bold][/BubbleContent]"[/font]
+chat-manager-entity-say-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font="{$fontType}" size={$fontSize}]"[color={$color}][BubbleContent]{$message}[/BubbleContent][/color]"[/font]
+chat-manager-entity-say-bold-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font="{$fontType}" size={$fontSize}]"[color={$color}][BubbleContent][bold]{$message}[/bold][/BubbleContent][/color]"[/font]
 
-chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] whispers,"[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]
-chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Someone[/BubbleHeader] whispers, "[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]
+chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] whispers,"[color={$color}][BubbleContent]{$message}[/BubbleContent][/color]"[/italic][/font]
+chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Someone[/BubbleHeader] whispers, "[color={$color}][BubbleContent]{$message}[/BubbleContent][/color]"[/italic][/font]
 
 # THE() is not used here because the entity and its name can technically be disconnected if a nameOverride is passed...
 chat-manager-entity-me-wrap-message = [italic]{ PROPER($entity) ->
@@ -58,57 +58,80 @@ chat-speech-verb-suffix-question = ?
 chat-speech-verb-suffix-stutter = -
 chat-speech-verb-suffix-mumble = ..
 
+chat-speech-verb-name-none = None
+chat-speech-verb-name-default = Default
 chat-speech-verb-default = says
+chat-speech-verb-name-exclamation = Exclaiming
 chat-speech-verb-exclamation = exclaims
+chat-speech-verb-name-exclamation-strong = Yelling
 chat-speech-verb-exclamation-strong = yells
+chat-speech-verb-name-question = Asking
 chat-speech-verb-question = asks
+chat-speech-verb-name-stutter = Stuttering
 chat-speech-verb-stutter = stutters
+chat-speech-verb-name-mumble = Mumbling
 chat-speech-verb-mumble = mumbles
 
+chat-speech-verb-name-arachnid = Arachnid
 chat-speech-verb-insect-1 = chitters
 chat-speech-verb-insect-2 = chirps
 chat-speech-verb-insect-3 = clicks
 
+chat-speech-verb-name-moth = Moth
 chat-speech-verb-winged-1 = flutters
 chat-speech-verb-winged-2 = flaps
 chat-speech-verb-winged-3 = buzzes
 
+chat-speech-verb-name-slime = Slime
 chat-speech-verb-slime-1 = sloshes
 chat-speech-verb-slime-2 = burbles
 chat-speech-verb-slime-3 = oozes
 
+chat-speech-verb-name-plant = Diona
 chat-speech-verb-plant-1 = rustles
 chat-speech-verb-plant-2 = sways
 chat-speech-verb-plant-3 = creaks
 
+chat-speech-verb-name-robotic = Robotic
 chat-speech-verb-robotic-1 = states
 chat-speech-verb-robotic-2 = beeps
+chat-speech-verb-robotic-3 = boops
 
+chat-speech-verb-name-reptilian = Reptilian
 chat-speech-verb-reptilian-1 = hisses
 chat-speech-verb-reptilian-2 = snorts
 chat-speech-verb-reptilian-3 = huffs
 
+chat-speech-verb-name-skeleton = Skeleton
 chat-speech-verb-skeleton-1 = rattles
 chat-speech-verb-skeleton-2 = clacks
 chat-speech-verb-skeleton-3 = gnashes
 
+chat-speech-verb-name-vox = Vox
 chat-speech-verb-vox-1 = screeches
 chat-speech-verb-vox-2 = shrieks
 chat-speech-verb-vox-3 = croaks
 
+chat-speech-verb-name-canine = Canine
 chat-speech-verb-canine-1 = barks
 chat-speech-verb-canine-2 = woofs
 chat-speech-verb-canine-3 = howls
 
+chat-speech-verb-name-small-mob = Mouse
 chat-speech-verb-small-mob-1 = squeaks
 chat-speech-verb-small-mob-2 = pieps
 
+chat-speech-verb-name-large-mob = Carp
 chat-speech-verb-large-mob-1 = roars
 chat-speech-verb-large-mob-2 = growls
 
+chat-speech-verb-name-monkey = Monkey
 chat-speech-verb-monkey-1 = chimpers
 chat-speech-verb-monkey-2 = screeches
 
+chat-speech-verb-name-cluwne = Cluwne
+
+chat-speech-verb-name-parrot = Parrot
 chat-speech-verb-parrot-1 = squawks
 chat-speech-verb-parrot-2 = tweets
 chat-speech-verb-parrot-3 = chirps
@@ -117,11 +140,13 @@ chat-speech-verb-cluwne-1 = giggles
 chat-speech-verb-cluwne-2 = guffaws
 chat-speech-verb-cluwne-3 = laughs
 
+chat-speech-verb-name-ghost = Ghost
 chat-speech-verb-ghost-1 = complains
 chat-speech-verb-ghost-2 = breathes
 chat-speech-verb-ghost-3 = hums
 chat-speech-verb-ghost-4 = mutters
 
+chat-speech-verb-name-electricity = Electricity
 chat-speech-verb-electricity-1 = crackles
 chat-speech-verb-electricity-2 = buzzes
 chat-speech-verb-electricity-3 = screeches
diff --git a/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl b/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
index 7acbe8664c4..52dbf9010e3 100644
--- a/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
@@ -1,13 +1,21 @@
 ## UI
 
-hypospray-volume-text = Volume: [color=white]{$currentVolume}/{$totalVolume}[/color]
+hypospray-all-mode-text = Only Injects
+hypospray-mobs-only-mode-text = Draws and Injects
+hypospray-invalid-text = Invalid
+hypospray-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}u[/color]
+    Mode: [color=white]{$modeString}[/color]
 
 ## Entity
 
 hypospray-component-inject-other-message = You inject {$other}.
 hypospray-component-inject-self-message = You inject yourself.
 hypospray-component-inject-self-clumsy-message = Oops! You injected yourself.
-hypospray-component-empty-message = It's empty!
+hypospray-component-empty-message = Nothing to inject.
 hypospray-component-feel-prick-message = You feel a tiny prick!
 hypospray-component-transfer-already-full-message = {$owner} is already full!
 hypospray-cant-inject = Can't inject into {$target}!
+
+hypospray-verb-mode-label = Toggle Container Draw
+hypospray-verb-mode-inject-all = You cannot draw from containers anymore.
+hypospray-verb-mode-inject-mobs-only = You can now draw from containers.
diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
index b073bdb773f..efa1b7e7677 100644
--- a/Resources/Locale/en-US/customization/character-requirements.ftl
+++ b/Resources/Locale/en-US/customization/character-requirements.ftl
@@ -9,7 +9,7 @@ character-species-requirement = You must {$inverted ->
 character-trait-requirement = You must {$inverted ->
     [true] not have
     *[other] have
-} the trait [color=lightblue]{$trait}[/color]
+} one of these traits: [color=lightblue]{$traits}[/color]
 character-backpack-type-requirement = You must {$inverted ->
     [true] not use
     *[other] use
diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl b/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl
index b411cf2eec7..d5a1bf9882d 100644
--- a/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl
+++ b/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl
@@ -4,4 +4,4 @@ advertisement-courierdrobe-3 = Wear your brown with pride!
 advertisement-courierdrobe-4 = These shorts are comfy and easy to wear, get yours now!
 advertisement-courierdrobe-5 = Outrun every danger with our stylish clothes!
 thankyou-courierdrobe-1 = Now get out there and deliver that mail!
-thankyou-courierdrobe-1 = Those parcels aren't going to deliver themselves!
+thankyou-courierdrobe-2 = Those parcels aren't going to deliver themselves!
diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl b/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl
index d8c47a8e412..da4db530b4e 100644
--- a/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl
+++ b/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl
@@ -2,4 +2,4 @@ advertisement-pride-1 = Be gay do crime!
 advertisement-pride-2 = Full of colors!
 advertisement-pride-3 = You are valid!
 thankyou-pride-1 = Go, do some crime!
-thankyou-pride-1 = Have a colorful day!
+thankyou-pride-2 = Have a colorful day!
diff --git a/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl b/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl
index fd5635de4a9..22cc34b2714 100644
--- a/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl
+++ b/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl
@@ -1,13 +1,16 @@
+chat-speech-verb-name-vulpkanin = Vulpkanin
 chat-speech-verb-vulpkanin-1 = rawrs
 chat-speech-verb-vulpkanin-2 = barks
 chat-speech-verb-vulpkanin-3 = rurs
 chat-speech-verb-vulpkanin-4 = yaps
 
+chat-speech-verb-name-felinid = Felinid
 chat-speech-verb-felinid-1 = mraows
 chat-speech-verb-felinid-2 = mews
 chat-speech-verb-felinid-3 = meows
 chat-speech-verb-felinid-4 = purrs out
 
+chat-speech-verb-name-harpy = Harpy
 chat-speech-verb-harpy-1 = chirps
 chat-speech-verb-harpy-2 = tweets
 chat-speech-verb-harpy-3 = caws
diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/deltav/markings/harpy.ftl
deleted file mode 100644
index 871f2f17290..00000000000
--- a/Resources/Locale/en-US/deltav/markings/harpy.ftl
+++ /dev/null
@@ -1,56 +0,0 @@
-marking-HarpyWingDefault = Basic Wings
-marking-HarpyWingDefault-harpy = Wings
-
-marking-HarpyWingFolded = Folded Wings
-marking-HarpyWingFolded-harpyfolded = Wings
-
-marking-HarpyWingClassic = Classic Wings
-marking-HarpyWingClassic-classicharpy = Wings
-
-marking-HarpyWing2ToneClassic = Classic Two Tone Wings
-marking-HarpyWing2ToneClassic-harpy2tone1 = Top Half
-marking-HarpyWing2ToneClassic-harpy2tone2 = Bottom Half
-
-marking-HarpyWing3ToneClassic = Classic Three Tone Wings
-marking-HarpyWing3ToneClassic-harpy3tone1 = Top Third
-marking-HarpyWing3ToneClassic-harpy3tone2 = Middle Third
-marking-HarpyWing3ToneClassic-harpy3tone3 = Bottom Third
-
-marking-HarpyWingSpeckledClassic = Speckled Classic Wings
-marking-HarpyWingSpeckledClassic-harpyspeckled1 = Main
-marking-HarpyWingSpeckledClassic-harpyspeckled2 = Speckles
-
-marking-HarpyWingUndertoneClassic = Classic Wings with Undertone
-marking-HarpyWingUndertoneClassic-harpyundertone1 = Front
-marking-HarpyWingUndertoneClassic-harpyundertone2 = Back
-
-marking-HarpyWingTipsClassic = Classic Wings with Feather Tips
-marking-HarpyWingTipsClassic-harpywingtip1 = Main
-marking-HarpyWingTipsClassic-harpywingtip2 = Feathertips
-
-marking-HarpyEarsDefault = Feather Tufts
-marking-HarpyEarsDefault-harpy_ears_default = Tufts
-
-marking-HarpyTailPhoenix = Basic Tail
-marking-HarpyTailPhoenix-phoenix_tail = Tail
-
-marking-HarpyTailRooster = Rooster Tail
-marking-HarpyTailRooster-rooster_tail = Tail
-
-marking-HarpyTailFinch = Finch Tail
-marking-HarpyTailFinch-finch_tail = Tail
-
-marking-HarpyTailPeacock = Peacock Tail
-marking-HarpyTailPeacock-peacock_tail_feathers = Feathers
-marking-HarpyTailPeacock-peacock_tail_eyes = Eyes
-
-marking-HarpyChestDefault = Wing & Groin Under-Clothes
-marking-HarpyChestDefault-upper = Wing Under-Clothes
-marking-HarpyChestDefault-lower = Groin Under-Clothes
-
-marking-HarpyLegsDefault = Avian Legs
-marking-HarpyLegsDefault-thighs = Thighs
-
-marking-HarpyFeetDefault = Avian Feet
-marking-HarpyFeetDefault-feet = Feet
-marking-HarpyFeetDefault-talons = Talons
diff --git a/Resources/Locale/en-US/deltav/station-events/events/xeno-vent.ftl b/Resources/Locale/en-US/deltav/station-events/events/xeno-vent.ftl
index eebfe1610f9..eb59c8e0a63 100644
--- a/Resources/Locale/en-US/deltav/station-events/events/xeno-vent.ftl
+++ b/Resources/Locale/en-US/deltav/station-events/events/xeno-vent.ftl
@@ -1 +1 @@
-station-event-xeno-vent-start-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
+station-event-xeno-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
diff --git a/Resources/Locale/en-US/door-remote/door-remote.ftl b/Resources/Locale/en-US/door-remote/door-remote.ftl
index bf2fc118619..2c4ccd08052 100644
--- a/Resources/Locale/en-US/door-remote/door-remote.ftl
+++ b/Resources/Locale/en-US/door-remote/door-remote.ftl
@@ -1,3 +1,12 @@
+## UI
+door-remote-open-close-text = Opens and Closes Doors
+door-remote-toggle-bolt-text = Toggles Bolts
+door-remote-emergency-access-text = Toggles Emergency Access
+door-remote-invalid-text = Invalid
+door-remote-mode-label = Mode: [color=white]{$modeString}[/color]
+
+## Entity
+
 door-remote-switch-state-open-close = You switch the remote to open and close doors
 door-remote-switch-state-toggle-bolts = You switch the remote to toggle bolts
 door-remote-switch-state-toggle-emergency-access = You switch the remote to toggle emergency access
diff --git a/Resources/Locale/en-US/dragon/rifts.ftl b/Resources/Locale/en-US/dragon/rifts.ftl
index 5ad061abf96..c182ebf10ce 100644
--- a/Resources/Locale/en-US/dragon/rifts.ftl
+++ b/Resources/Locale/en-US/dragon/rifts.ftl
@@ -1,4 +1,4 @@
-carp-rift-warning = A rift is causing an unnaturally large energy flux at {$location}. Stop it at all costs!
+carp-rift-warning = A rift is causing an unnaturally large energy flux {$location}. Stop it at all costs!
 carp-rift-duplicate = Cannot have 2 charging rifts at the same time!
 carp-rift-examine = It is [color=yellow]{$percentage}%[/color] charged!
 carp-rift-max = You have reached your maximum amount of rifts
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 46f5df48ad6..8c6cf575d54 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -30,6 +30,7 @@ ui-options-ambience-volume = Ambience volume:
 ui-options-lobby-volume = Lobby & Round-end volume:
 ui-options-interface-volume = Interface volume:
 ui-options-ambience-max-sounds = Ambience simultaneous sounds:
+ui-options-announcer-volume = Announcer volume:
 ui-options-lobby-music = Lobby & Round-end Music
 ui-options-restart-sounds = Round Restart Sounds
 ui-options-event-music = Event Music
@@ -41,13 +42,17 @@ ui-options-volume-percent = { TOSTRING($volume, "P0") }
 
 ui-options-show-held-item = Show held item next to cursor
 ui-options-show-combat-mode-indicators = Show combat mode indicators with cursor
+ui-options-show-offer-mode-indicators = Show offer mode indicators with cursor
 ui-options-opaque-storage-window = Opaque storage window
+ui-options-show-ooc-patron-color = Show OOC Patreon color
 ui-options-show-looc-on-head = Show LOOC chat above characters head
 ui-options-fancy-speech = Show names in speech bubbles
 ui-options-fancy-name-background = Add background to speech bubble names
 ui-options-enable-color-name = Add colors to character names
 ui-options-colorblind-friendly = Colorblind friendly mode
 ui-options-reduced-motion = Reduce motion of visual effects
+ui-options-chat-window-opacity = Chat window opacity
+ui-options-chat-window-opacity-percent = { TOSTRING($opacity, "P0") }
 ui-options-screen-shake-intensity = Screen shake intensity
 ui-options-screen-shake-percent = { TOSTRING($intensity, "P0") }
 ui-options-vsync = VSync
@@ -135,6 +140,9 @@ ui-options-function-examine-entity = Examine
 ui-options-function-swap-hands = Swap hands
 ui-options-function-move-stored-item = Move stored item
 ui-options-function-rotate-stored-item = Rotate stored item
+ui-options-function-offer-item = Offer something
+ui-options-function-save-item-location = Save item location
+ui-options-function-toggle-standing = Toggle standing
 ui-options-static-storage-ui = Lock storage window to hotbar
 
 ui-options-function-smart-equip-backpack = Smart-equip to backpack
diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 35de5555a29..61567d86954 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -188,6 +188,7 @@ flavor-complex-tonic-water = like angry water
 flavor-complex-cola = like cola
 flavor-complex-energy-drink = like battery acid
 flavor-complex-dr-gibb = like malpractice
+flavor-complex-ginger-soda = like ginger
 flavor-complex-grape-soda = like grape soda
 flavor-complex-lemon-lime-soda = like lemon-lime soda
 flavor-complex-pwr-game-soda = like gaming
@@ -200,6 +201,7 @@ flavor-complex-vodka = like fermented grain
 flavor-complex-tequila = like fermented death
 flavor-complex-sake = like sweet, alcoholic rice
 flavor-complex-rum = like fermented sugar
+flavor-complex-coconut-rum = like nutty fermented sugar
 flavor-complex-coffee-liquor = like strong, bitter coffee
 flavor-complex-whiskey = like molasses
 flavor-complex-shitty-wine = like grape rinds
@@ -212,6 +214,11 @@ flavor-complex-ice = like ice
 flavor-complex-mopwata = like stagnant, dirty water
 
 ## Cocktails
+flavor-complex-arnold-palmer = like a hole-in-one
+flavor-complex-blue-hawaiian = like the tropics
+flavor-complex-cosmopolitan = sweet and tangy
+flavor-complex-painkiller = like spiked pineapple juice
+flavor-complex-pina-colada = like tropical sun
 flavor-complex-long-island = suspiciously like iced tea
 flavor-complex-three-mile-island = like tea brewed in nuclear runoff
 flavor-complex-whiskey-cola = like carbonated molasses
diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
index 539b4fd9e71..525820920bd 100644
--- a/Resources/Locale/en-US/foldable/components/foldable-component.ftl
+++ b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
@@ -4,4 +4,7 @@ foldable-deploy-fail = You can't deploy the {$object} here.
 fold-verb = Fold
 unfold-verb = Unfold
 
-fold-flip-verb = Flip
\ No newline at end of file
+fold-flip-verb = Flip
+
+fold-zip-verb = Zip up
+fold-unzip-verb = Unzip
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-survival.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-survival.ftl
index 231733eabfb..0b8fa83ae8b 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-survival.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-survival.ftl
@@ -1,2 +1,5 @@
 survival-title = Survival
 survival-description = No internal threats, but how long can the station survive increasingly chaotic and frequent events?
+
+hellshift-title = Hellshift
+hellshift-description = The station rolled a "one" in a luck check. Can the crew make it to the end?
diff --git a/Resources/Locale/en-US/game-ticking/game-ticker.ftl b/Resources/Locale/en-US/game-ticking/game-ticker.ftl
index 7da791cfb87..46aa304dc79 100644
--- a/Resources/Locale/en-US/game-ticking/game-ticker.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-ticker.ftl
@@ -25,6 +25,7 @@ game-ticker-get-info-preround-text = Hi and welcome to [color=white]Space Statio
                             >[color=yellow]{$desc}[/color]
 game-ticker-no-map-selected = [color=yellow]Map not yet selected![/color]
 game-ticker-player-no-jobs-available-when-joining = When attempting to join to the game, no jobs were available.
+game-ticker-welcome-to-the-station = Welcome to the station crew, enjoy your stay!
 
 # Displayed in chat to admins when a player joins
 player-join-message = Player {$name} joined.
@@ -39,4 +40,4 @@ latejoin-arrivals-direction = An escape transport will arrive shortly.
 latejoin-arrivals-direction-time = An escape transport will arrive in {$time} to take you away.
 
 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
+preset-no-one-ready = Can't start {$presetName}. No players are ready.
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 4b151d131ab..7b25eb660bc 100644
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -178,6 +178,9 @@ ghost-role-information-cerberus-rules = You are an intelligent, demonic dog. Try
 ghost-role-information-ert-leader-name = ERT Leader
 ghost-role-information-ert-leader-description = Lead a team of specialists to resolve the station's issues.
 
+ghost-role-information-ert-chaplain-name = ERT Chaplain
+ghost-role-information-ert-chaplain-description = Assist with mourning to resolve the station's crew moral issues.
+
 ghost-role-information-ert-janitor-name = ERT Janitor
 ghost-role-information-ert-janitor-description = Assist with custodial efforts to resolve the station's issues.
 
@@ -242,3 +245,8 @@ ghost-role-information-syndicate-reinforcement-rules = Normal syndicate antagoni
 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.
+
+ghost-role-information-artifact-name = Sentient Artifact
+ghost-role-information-artifact-description =
+      Enact your eldritch whims.
+      Forcibly activate your nodes for good or for evil.
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index e8a404e1ce3..72746dbf51f 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -22,6 +22,14 @@ guide-entry-cargo-bounties = Cargo Bounties
 guide-entry-salvage = Salvage
 guide-entry-survival = Survival
 guide-entry-chemicals = Chemicals
+guide-entry-elements = Elements
+guide-entry-narcotics = Narcotics
+guide-entry-pyrotechnics = Pyrotechnic
+guide-entry-toxins = Toxins
+guide-entry-foods = Foods
+guide-entry-biological = Biological
+guide-entry-others = Others
+guide-entry-botanical = Botanicals
 guide-entry-ss14 = Space Station 14
 guide-entry-janitorial = Janitorial
 guide-entry-bartender = Bartender
diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl
index a220737f18a..75c83643d6d 100644
--- a/Resources/Locale/en-US/headset/headset-component.ftl
+++ b/Resources/Locale/en-US/headset/headset-component.ftl
@@ -1,6 +1,6 @@
 # Chat window radio wrap (prefix and postfix)
-chat-radio-message-wrap = [color={$color}]{$channel} {$name} {$verb}, [font={$fontType} size={$fontSize}]"{$message}"[/font][/color]
-chat-radio-message-wrap-bold = [color={$color}]{$channel} {$name} {$verb}, [font={$fontType} size={$fontSize}][bold]"{$message}"[/bold][/font][/color]
+chat-radio-message-wrap = [color={$color}]{$channel} {$name} {$verb}, [font="{$fontType}" size={$fontSize}]"[/color][color={$languageColor}]{$message}[/color][color={$color}]"[/font][/color]
+chat-radio-message-wrap-bold = [color={$color}]{$channel} {$name} {$verb}, [font="{$fontType}" size={$fontSize}][bold]"[/color][color={$languageColor}]{$message}[/color][color={$color}]"[/bold][/font][/color]
 
 examine-headset-default-channel = Use {$prefix} for the default channel ([color={$color}]{$channel}[/color]).
 
diff --git a/Resources/Locale/en-US/implant/implant.ftl b/Resources/Locale/en-US/implant/implant.ftl
index 2f6ab9e4e2f..b93d43105a8 100644
--- a/Resources/Locale/en-US/implant/implant.ftl
+++ b/Resources/Locale/en-US/implant/implant.ftl
@@ -22,5 +22,5 @@ scramble-implant-activated-popup = Your appearance shifts and changes!
 
 ## Implant Messages
 
-deathrattle-implant-dead-message = {$user} has died at {$position}.
-deathrattle-implant-critical-message = {$user} life signs critical, immediate assistance required at {$position}.
+deathrattle-implant-dead-message = {$user} has died {$position}.
+deathrattle-implant-critical-message = {$user} life signs critical, immediate assistance required {$position}.
diff --git a/Resources/Locale/en-US/interaction/offer-item-system.ftl b/Resources/Locale/en-US/interaction/offer-item-system.ftl
new file mode 100644
index 00000000000..a0847afa308
--- /dev/null
+++ b/Resources/Locale/en-US/interaction/offer-item-system.ftl
@@ -0,0 +1,13 @@
+offer-item-empty-hand = You don't have anything in your hand to give!
+
+offer-item-full-hand = Your hand isn't free to receive the item.
+
+offer-item-try-give = You offer {THE($item)} to {$target}
+offer-item-try-give-target = {$user} offers you {THE($item)}
+
+offer-item-give = You handed {THE($item)} to {$target}
+offer-item-give-other = {$user} handed {THE($item)} to {$target}
+offer-item-give-target = {$user} handed you {THE($item)}
+
+offer-item-no-give = You stop offering {THE($item)} to {$target}
+offer-item-no-give-target = {$user} is no longer offering {THE($item)} to you
diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl
index 56fc482c2d8..3a25518c2eb 100644
--- a/Resources/Locale/en-US/job/job-description.ftl
+++ b/Resources/Locale/en-US/job/job-description.ftl
@@ -19,6 +19,7 @@ job-description-paramedic = Rescue critically injured patients all over the stat
 job-description-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes.
 job-description-doctor = Diagnose and heal crewmembers through medicinal chemicals, advanced medicine, and defibrillators. Make sure the dead don't rot, and that cadavers are in the morgue.
 job-description-engineer = Keep the station's main engine & solars active, optimize the power network, and make emergency repairs using your hardsuit in spaced areas.
+job-description-ertchaplain = Ensure the station crew's last rights are taken care of.
 job-description-ertengineer = Ensure that the station has power and clean air.
 job-description-ertjanitor = Ensure that the station is properly cleaned--for morale.
 job-description-ertleader = Lead the Emergency Response Team in dealing with threats to Nanotrasen assets.
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index f58e560010f..bcfdc9205de 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -38,6 +38,7 @@ job-name-cargotech = Cargo Technician
 job-name-chef = Chef
 job-name-clown = Clown
 job-name-ertleader = ERT Leader
+job-name-ertchaplain = ERT Chaplain
 job-name-ertengineer = ERT Engineer
 job-name-ertsecurity = ERT Security
 job-name-ertmedic = ERT Medic
@@ -63,6 +64,7 @@ JobChiefMedicalOfficer = Chief Medical Officer
 JobClown = Clown
 JobDetective = Detective
 JobBrigmedic = Corpsman
+JobERTChaplain = ERT Chaplain
 JobERTEngineer = ERT Engineer
 JobERTJanitor = ERT Janitor
 JobERTLeader = ERT Leader
diff --git a/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl b/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl
index 30af6e9872e..8a3ca9eef85 100644
--- a/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl
+++ b/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl
@@ -7,6 +7,9 @@ reagent-grinder-component-cannot-put-entity-message = You can't put this in the
 grinder-menu-title = All-In-One Grinder 3000
 grinder-menu-grind-button = Grind
 grinder-menu-juice-button = Juice
+grinder-menu-auto-label = Auto mode
+grinder-menu-auto-button-off = Off
+grinder-menu-manual-label = Manual mode
 grinder-menu-chamber-content-box-label = Chamber
 grinder-menu-chamber-content-box-button = Eject Contents
 grinder-menu-beaker-content-box-label = Beaker
diff --git a/Resources/Locale/en-US/language/commands.ftl b/Resources/Locale/en-US/language/commands.ftl
index 32fa5415b8c..ba2b3160094 100644
--- a/Resources/Locale/en-US/language/commands.ftl
+++ b/Resources/Locale/en-US/language/commands.ftl
@@ -1,8 +1,16 @@
 command-list-langs-desc = List languages your current entity can speak at the current moment.
 command-list-langs-help = Usage: {$command}
 
-command-saylang-desc = Send a message in a specific language.
-command-saylang-help = Usage: {$command} <language id> <message>. Example: {$command} GalacticCommon "Hello World!"
+command-saylang-desc = Send a message in a specific language. To choose a language, you can use either the name of the language, or its position in the list of languages.
+command-saylang-help = Usage: {$command} <language id> <message>. Example: {$command} GalacticCommon "Hello World!". Example: {$command} 1 "Hello World!"
 
-command-language-select-desc = Select the currently spoken language of your entity.
-command-language-select-help = Usage: {$command} <language id>. Example: {$command} GalacticCommon
+command-language-select-desc = Select the currently spoken language of your entity. You can use either the name of the language, or its position in the list of languages.
+command-language-select-help = Usage: {$command} <language id>. Example: {$command} 1. Example: {$command} GalacticCommon
+
+command-language-spoken = Spoken:
+command-language-understood = Understood:
+command-language-current-entry = {$id}. {$language} - {$name} (current)
+command-language-entry = {$id}. {$language} - {$name}
+
+command-language-invalid-number = The language number must be between 0 and {$total}. Alternatively, use the language name.
+command-language-invalid-language = The language {$id} does not exist or you cannot speak it.
diff --git a/Resources/Locale/en-US/language/languages.ftl b/Resources/Locale/en-US/language/languages.ftl
index 69c5d0a4a76..209daf92de8 100644
--- a/Resources/Locale/en-US/language/languages.ftl
+++ b/Resources/Locale/en-US/language/languages.ftl
@@ -4,6 +4,9 @@ language-Universal-description = What are you?
 language-GalacticCommon-name = Galactic common
 language-GalacticCommon-description = The standard Galatic language, most commonly used for inter-species communications and legal work.
 
+language-SignLanguage-name = Sign Language
+language-SignLanguage-description = The standard Galactic sign language, used by those that are unable to speak Galactic Common or at all.
+
 language-Bubblish-name = Bubblish
 language-Bubblish-description = The language of Slimes. Being a mixture of bubbling noises and pops it's very difficult to speak for humans without the use of mechanical aids.
 
diff --git a/Resources/Locale/en-US/language/sign-language.ftl b/Resources/Locale/en-US/language/sign-language.ftl
new file mode 100644
index 00000000000..f4548f995c5
--- /dev/null
+++ b/Resources/Locale/en-US/language/sign-language.ftl
@@ -0,0 +1,4 @@
+entity-signlanguage-message = [italic]{$entityName} signs "[BubbleContent]{$message}[/BubbleContent]"[/italic]
+
+language-signlanguage-1 = [italic]{$entityName} signs something.[/italic]
+language-signlanguage-2 = [italic]{$entityName} makes weird hand gestures.[/italic]
diff --git a/Resources/Locale/en-US/language/translator.ftl b/Resources/Locale/en-US/language/translator.ftl
index b2a1e9b2b8c..8070d03be29 100644
--- a/Resources/Locale/en-US/language/translator.ftl
+++ b/Resources/Locale/en-US/language/translator.ftl
@@ -1,8 +1,13 @@
 translator-component-shutoff = The {$translator} shuts off.
 translator-component-turnon = The {$translator} turns on.
-translator-enabled = It appears to be active.
-translator-disabled = It appears to be disabled.
 translator-implanter-refuse = The {$implanter} has no effect on {$target}.
 translator-implanter-success = The {$implanter} successfully injected {$target}.
 translator-implanter-ready = This implanter appears to be ready to use.
 translator-implanter-used = This implanter seems empty.
+
+translator-examined-langs-understood = It can translate from: [color=green]{$languages}[/color].
+translator-examined-langs-spoken = It can translate to: [color=green]{$languages}[/color].
+translator-examined-requires-any = It requires you to know at least one of these languages: [color=yellow]{$languages}[/color].
+translator-examined-requires-all = It requires you to know all of these languages: [color=yellow]{$languages}[/color].
+translator-examined-enabled = It appears to be [color=green]active[/color].
+translator-examined-disabled = It appears to be [color=red]turned off[/color].
diff --git a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
index 92f313086cb..71dd50d4091 100644
--- a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
+++ b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
@@ -13,6 +13,10 @@ lathe-menu-material-amount = { $amount ->
     [1] {NATURALFIXED($amount, 2)} {$unit}
     *[other] {NATURALFIXED($amount, 2)} {MAKEPLURAL($unit)}
 }
+lathe-menu-material-amount-missing = { $amount ->
+    [1] {NATURALFIXED($amount, 2)} {$unit} of {$material} ([color=red]{NATURALFIXED($missingAmount, 2)} {$unit} missing[/color])
+    *[other] {NATURALFIXED($amount, 2)} {MAKEPLURAL($unit)} of {$material} ([color=red]{NATURALFIXED($missingAmount, 2)} {MAKEPLURAL($unit)} missing[/color])
+}
 lathe-menu-no-materials-message = No materials loaded.
 lathe-menu-fabricating-message = Fabricating...
 lathe-menu-materials-title = Materials
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index f29609ba3fb..e5233b42a55 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -2,8 +2,15 @@
 
 loadout-category-Uncategorized = Uncategorized
 loadout-category-Accessories = Accessories
+loadout-category-Eyes = Eyes
+loadout-category-Hands = Hands
+loadout-category-Head = Head
 loadout-category-Items = Items
 loadout-category-Jobs = Jobs
+loadout-category-Mask = Mask
+loadout-category-Neck = Neck
 loadout-category-Outer = Outer
+loadout-category-Shoes = Shoes
+loadout-category-Species = Species
 loadout-category-Uniform = Uniform
 loadout-category-Roles = Roles
diff --git a/Resources/Locale/en-US/loadouts/items.ftl b/Resources/Locale/en-US/loadouts/items.ftl
index a4819011262..b92f56bc7cb 100644
--- a/Resources/Locale/en-US/loadouts/items.ftl
+++ b/Resources/Locale/en-US/loadouts/items.ftl
@@ -11,3 +11,5 @@ loadout-description-LoadoutItemPlushieSharkBlue = Dive into battle with your ver
 loadout-description-LoadoutItemPlushieSharkPink = Unleash the power of pink with the Pink Shark Plushie! This rosy-hued predator might not have real teeth, but its sheer adorableness is enough to take a bite out of anyone's resolve. Watch as foes melt away in the face of its cottony charm.
 loadout-description-LoadoutItemPlushieSharkGrey = Introducing the Grey Shark Plushie, the apex predator of snuggles! With its sleek and understated design, this plushie strikes the perfect balance between cuddle companion and imaginary ocean guardian. Beware; opponents may be mesmerized by its dorsal fin's hypnotic sway!
 loadout-description-LoadoutItemPlushieCarp = Brace for extraterrestrial antics with the Purple Space Carp Plushie! A fishy invader from the cosmic deep, this plushie brings a splash of humor to zero-gravity escapades. From hostile waters to interstellar giggles, it's a cuddly contradiction that's out of this world
+loadout-description-LoadoutSolCommonTranslator = The most common of all translators, such that it can be purchased in any civilized station.
+                                                 This device translates Sol Common speech into Galactic Common.
diff --git a/Resources/Locale/en-US/lock/lock-component.ftl b/Resources/Locale/en-US/lock/lock-component.ftl
index f9f975c96e9..380605697ba 100644
--- a/Resources/Locale/en-US/lock/lock-component.ftl
+++ b/Resources/Locale/en-US/lock/lock-component.ftl
@@ -3,8 +3,9 @@ lock-comp-on-examined-is-unlocked = The {$entityName} seems to be unlocked.
 lock-comp-do-lock-success = You lock the {$entityName}.
 lock-comp-do-unlock-success = You unlock the {$entityName}.
 lock-comp-has-user-access-fail = Access denied
+lock-comp-generic-fail = {CAPITALIZE(SUBJECT($target))} {CONJUGATE-BE($target)} locked.
 
 ## ToggleLockVerb
 
 toggle-lock-verb-unlock = Unlock
-toggle-lock-verb-lock = Lock
\ No newline at end of file
+toggle-lock-verb-lock = Lock
diff --git a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
index 4d2dd25af2c..dc45677c8d2 100644
--- a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
+++ b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
@@ -70,6 +70,9 @@ signal-port-description-set-particle-epsilon = Sets the type of particle this de
 signal-port-name-set-particle-zeta = Set particle type: zeta
 signal-port-description-set-particle-zeta = Sets the type of particle this device emits to zeta.
 
+signal-port-name-set-particle-sigma = Set particle type: sigma
+signal-port-description-set-particle-sigma = Sets the type of particle this device emits to sigma.
+
 signal-port-name-logic-input-a = Input A
 signal-port-description-logic-input-a = First input of a logic gate.
 
diff --git a/Resources/Locale/en-US/markings/gauze.ftl b/Resources/Locale/en-US/markings/gauze.ftl
index 9a45a0a2fa2..f8bedc31957 100644
--- a/Resources/Locale/en-US/markings/gauze.ftl
+++ b/Resources/Locale/en-US/markings/gauze.ftl
@@ -1,17 +1,17 @@
 marking-GauzeLefteyePatch-gauze_lefteye_2 = Gauze eyepatch (Left)
 marking-GauzeLefteyePatch = Gauze eyepatch (Left)
 
-marking-GauzeLefteyeTape-gauze_lefteye_1 = Gauze eyepad (Left)
-marking-GauzeLefteyeTape = Gauze eyepad (Left)
+marking-GauzeLefteyePad-gauze_lefteye_1 = Gauze eyepad (Left)
+marking-GauzeLefteyePad = Gauze eyepad (Left)
 
 marking-GauzeRighteyePatch-gauze_righteye_2 = Gauze eyepatch (Right)
 marking-GauzeRighteyePatch = Gauze eyepatch (Right)
 
-marking-GauzeRighteyeTape-gauze_righteye_1 = Gauze eyepad (Right)
-marking-GauzeRighteyeTape = Gauze eyepad (Right)
+marking-GauzeRighteyePad-gauze_righteye_1 = Gauze eyepad (Right)
+marking-GauzeRighteyePad = Gauze eyepad (Right)
 
-marking-GauzeShoulder-gauze_shoulder = Gauze Shoulder
-marking-GauzeShoulder = Gauze Shoulder
+marking-GauzeShoulder-gauze_shoulder = Gauze Shoulder Sling
+marking-GauzeShoulder = Gauze Shoulder Sling
 
 marking-GauzeStomach-gauze_abdomen = Gauze Stomach Wrap
 marking-GauzeStomach = Gauze Stomach Wrap
@@ -46,17 +46,57 @@ marking-GauzeUpperLegRight = Gauze Thigh Wrap (Right)
 marking-GauzeBlindfold-gauze_blindfold = Gauze Blindfold
 marking-GauzeBlindfold = Gauze Blindfold
 
-marking-GauzeLizardBlindfold-gauze_lizardblindfold = Gauze Blindfold
+marking-GauzeLizardBlindfold-gauze_lizard_blindfold = Gauze Blindfold
 marking-GauzeLizardBlindfold = Gauze Blindfold
 
-marking-GauzeLizardFootRight-gauze_lizardfoot_r = Gauze Foot Wrap (Right)
+marking-GauzeLizardFootRight-gauze_lizard_foot_r = Gauze Foot Wrap (Right)
 marking-GauzeLizardFootRight = Gauze Foot Wrap (Right)
 
-marking-GauzeLizardFootLeft-gauze_lizardfoot_l = Gauze Foot Wrap (Left)
+marking-GauzeLizardFootLeft-gauze_lizard_foot_l = Gauze Foot Wrap (Left)
 marking-GauzeLizardFootLeft = Gauze Foot Wrap (Left)
 
-marking-GauzeLizardLefteyePatch-gauze_lizardlefteye = Adjusted Gauze eyepatch (Left)
-marking-GauzeLizardLefteyePatch = Adjusted Gauze eyepatch (Left)
+marking-GauzeLizardLefteyePatch-gauze_lizard_lefteye = Reptilian Gauze eyepatch (Left)
+marking-GauzeLizardLefteyePatch = Reptilian Gauze eyepatch (Left)
+
+marking-GauzeLizardRighteyePatch-gauze_lizard_righteye = Reptilian Gauze eyepatch (Right)
+marking-GauzeLizardRighteyePatch = Reptilian Gauze Eyepatch (Right)
+
+marking-GauzeMothStomach-gauze_moth_abdomen = Insectoid Stomach Wrap
+marking-GauzeMothStomach = Insectoid Stomach Wrap
+
+marking-GauzeMothShoulder-gauze_moth_shoulder = Insectoid Shoulder Sling
+marking-GauzeMothShoulder = Insectoid Shoulder Sling
+
+marking-GauzeMothBlindfold-gauze_moth_blindfold = Insectoid Blindfold
+marking-GauzeMothBlindfold = Insectoid Blindfold
+
+marking-GauzeMothLeftEyePatch-gauze_moth_lefteye_2 = Insectoid Gauze eyepatch (Left)
+marking-GauzeMothLeftEyePatch = Insectoid Gauze eyepatch (Left)
+
+marking-GauzeMothLeftEyePad-gauze_moth_lefteye_1 = Insectoid Gauze eyepad (Left)
+marking-GauzeMothLeftEyePad = Insectoid Gauze eyepad (Left)
+
+marking-GauzeMothRightEyePatch-gauze_moth_righteye_2 = Insectoid Gauze eyepatch (Right)
+marking-GauzeMothRightEyePatch = Insectoid Gauze eyepatch (Right)
+
+marking-GauzeMothRightEyePad-gauze_moth_righteye_1 = Insectoid Gauze eyepad (Right)
+marking-GauzeMothRightEyePad = Insectoid Gauze eyepad (Right)
+
+marking-GauzeMothUpperArmRight-gauze_moth_upperarm_r = Insectoid Gauze Forearm Wrap (Right)
+marking-GauzeMothUpperArmRight = Insectoid Gauze Forearm Wrap (Right)
+
+marking-GauzeMothUpperArmLeft-gauze_moth_upperarm_l = Insectoid Gauze Forearm Wrap (Left)
+marking-GauzeMothUpperArmLeft = Insectoid Gauze Forearm Wrap (Left)
+
+marking-GauzeMothUpperLegRight-gauze_moth_upperleg_r = Insectoid Gauze Thigh Wrap (Right)
+marking-GauzeMothUpperLegRight = Insectoid Insectoid Gauze Thigh Wrap (Right)
+
+marking-GauzeMothUpperLegLeft-gauze_moth_upperleg_l = Insectoid Gauze Thigh Wrap (Left)
+marking-GauzeMothUpperLegLeft = Insectoid Gauze Thigh Wrap (Left)
+
+marking-GauzeMothLowerLegRight-gauze_moth_lowerleg_r = Insectoid Gauze Shin Wrap (Right)
+marking-GauzeMothLowerLegRight = Insectoid Gauze Shin Wrap (Right)
+
+marking-GauzeMothLowerLegLeft-gauze_moth_lowerleg_l = Insectoid Gauze Shin Wrap (Left)
+marking-GauzeMothLowerLegLeft = Insectoid Gauze Shin Wrap (Left)
 
-marking-GauzeLizardRighteyePatch-gauze_lizardrighteye = Adjusted Gauze eyepatch (Right)
-marking-GauzeLizardRighteyePatch = Adjusted Gauze Eyepatch (Right)
\ No newline at end of file
diff --git a/Resources/Locale/en-US/markings/harpy.ftl b/Resources/Locale/en-US/markings/harpy.ftl
new file mode 100644
index 00000000000..6d6ba75a936
--- /dev/null
+++ b/Resources/Locale/en-US/markings/harpy.ftl
@@ -0,0 +1,77 @@
+marking-HarpyWingDefaultHuescale = Basic Wings (Huescale)
+marking-HarpyWingDefaultHuescale-huescale_harpy = Wings
+
+marking-HarpyWingDefaultWhitescale = Basic Wings (Whitescale)
+marking-HarpyWingDefaultWhitescale-whitescale_harpy = Wings
+
+marking-HarpyWingFoldedHuescale = Folded Wings (Huescale)
+marking-HarpyWingFoldedHuescale-huescale_harpy_folded = Wings
+
+marking-HarpyWingFoldedWhitescale = Folded Wings (Whitescale)
+marking-HarpyWingFoldedWhitescale-whitescale_harpy_folded = Wings
+
+marking-HarpyWingOwlHuescale = Owl Wings (Huescale)
+marking-HarpyWingOwlHuescale-huescale_harpy_wing_owl = Wings
+
+marking-HarpyWingOwlWhitescale = Owl Wings (Whitescale)
+marking-HarpyWingOwlWhitescale-whitescale_harpy_wing_owl = Wings
+
+marking-HarpyWingClassic = Classic Wings
+marking-HarpyWingClassic-classic_harpy = Wings
+
+marking-HarpyWing2ToneClassic = Classic Two Tone Wings
+marking-HarpyWing2ToneClassic-harpy_2tone_1 = Top Half
+marking-HarpyWing2ToneClassic-harpy_2tone_2 = Bottom Half
+
+marking-HarpyWing3ToneClassic = Classic Three Tone Wings
+marking-HarpyWing3ToneClassic-harpy_3tone_1 = Top Third
+marking-HarpyWing3ToneClassic-harpy_3tone_2 = Middle Third
+marking-HarpyWing3ToneClassic-harpy_3tone_3 = Bottom Third
+
+marking-HarpyWingSpeckledClassic = Speckled Classic Wings
+marking-HarpyWingSpeckledClassic-harpy_speckled_1 = Main
+marking-HarpyWingSpeckledClassic-harpy_speckled_2 = Speckles
+
+marking-HarpyWingUndertoneClassic = Classic Wings with Undertone
+marking-HarpyWingUndertoneClassic-harpy_undertone_1 = Front
+marking-HarpyWingUndertoneClassic-harpy_undertone_2 = Back
+
+marking-HarpyWingTipsClassic = Classic Wings with Feather Tips
+marking-HarpyWingTipsClassic-harpy_wingtip_1 = Main
+marking-HarpyWingTipsClassic-harpy_wingtip_2 = Feathertips
+
+marking-HarpyEarsDefault = Feather Tufts
+marking-HarpyEarsDefault-harpy_ears_default = Tufts
+
+marking-HarpyEarsLarge = Large Feather Tufts
+marking-HarpyEarsLarge-harpy_ears_large = Tufts
+
+marking-HarpyTailPhoenix = Basic Tail
+marking-HarpyTailPhoenix-phoenix_tail = Tail
+
+marking-HarpyTailRooster = Rooster Tail
+marking-HarpyTailRooster-rooster_tail = Tail
+
+marking-HarpyTailFinch = Finch Tail
+marking-HarpyTailFinch-finch_tail = Tail
+
+marking-HarpyTailForkedHuescale = Forked Tailfin (Huescale)
+marking-HarpyTailForkedHuescale-huescale_forked_tailfin = Tail
+
+marking-HarpyTailForkedWhitescale = Forked Tailfin (Whitescale)
+marking-HarpyTailForkedWhitescale-whitescale_forked_tailfin = Tail
+
+marking-HarpyTailPeacock = Peacock Tail
+marking-HarpyTailPeacock-peacock_tail_feathers = Feathers
+marking-HarpyTailPeacock-peacock_tail_eyes = Eyes
+
+marking-HarpyChestDefault = Wing & Groin Under-Clothes
+marking-HarpyChestDefault-upper = Wing Under-Clothes
+marking-HarpyChestDefault-lower = Groin Under-Clothes
+
+marking-HarpyLegsDefault = Avian Legs
+marking-HarpyLegsDefault-thighs = Thighs
+
+marking-HarpyFeetDefault = Avian Feet
+marking-HarpyFeetDefault-feet = Feet
+marking-HarpyFeetDefault-talons = Talons
diff --git a/Resources/Locale/en-US/movement/laying.ftl b/Resources/Locale/en-US/movement/laying.ftl
new file mode 100644
index 00000000000..f75061d6a75
--- /dev/null
+++ b/Resources/Locale/en-US/movement/laying.ftl
@@ -0,0 +1,7 @@
+laying-comp-lay-success-self = You lay down.
+laying-comp-lay-success-other = {THE($entity)} lays down.
+laying-comp-lay-fail-self = You can't lay down right now.
+
+laying-comp-stand-success-self = You stand up.
+laying-comp-stand-success-other = {THE($entity)} stands up.
+laying-comp-stand-fail-self = You can't stand up right now.
diff --git a/Resources/Locale/en-US/navmap-beacons/station_map.ftl b/Resources/Locale/en-US/navmap-beacons/station_map.ftl
index d58d93bdb4e..1563e0abaf2 100644
--- a/Resources/Locale/en-US/navmap-beacons/station_map.ftl
+++ b/Resources/Locale/en-US/navmap-beacons/station_map.ftl
@@ -11,3 +11,8 @@ nav-beacon-examine-text = It is [color={$enabled ->
     [true] forestgreen]on
     *[false] crimson]off
 }[/color] and the display reads [color={$color}]"{$label}"[/color]
+
+nav-beacon-pos-no-beacons = in the middle of nowhere
+nav-beacon-pos-format = [color={$color}]near {$marker}[/color]
+nav-beacon-pos-format-direction = [color={$color}]{$modifier}{$direction} of {$marker}[/color]
+nav-beacon-pos-format-direction-mod-far = far {""}
diff --git a/Resources/Locale/en-US/nuke/nuke-component.ftl b/Resources/Locale/en-US/nuke/nuke-component.ftl
index b2a61dfcc2c..981dd8b6ae3 100644
--- a/Resources/Locale/en-US/nuke/nuke-component.ftl
+++ b/Resources/Locale/en-US/nuke/nuke-component.ftl
@@ -1,6 +1,6 @@
 nuke-component-cant-anchor-floor = The anchoring bolts fail to lock into the floor!
 nuke-component-announcement-sender = Nuclear Fission Explosive
-nuke-component-announcement-armed = Attention! The station's self-destruct mechanism has been engaged at global coordinates {$position}. {$time} seconds until detonation. If this was made in error, the mechanism may still be disarmed.
+nuke-component-announcement-armed = Attention! The station's self-destruct mechanism has been engaged {$location}. {$time} seconds until detonation. If this was made in error, the mechanism may still be disarmed.
 nuke-component-announcement-unarmed = The station's self-destruct was deactivated! Have a nice day!
 nuke-component-announcement-send-codes = Attention! Self-destruction codes have been sent to designated fax machines.
 nuke-component-doafter-warning = You start fiddling with wires and knobs in order to disarm the nuke.. This may take a while.
diff --git a/Resources/Locale/en-US/paint/paint.ftl b/Resources/Locale/en-US/paint/paint.ftl
deleted file mode 100644
index 200b1f6e3f3..00000000000
--- a/Resources/Locale/en-US/paint/paint.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-paint-success = {THE($target)} has been covered in paint!
-paint-failure = Can't cover {THE($target)} in paint!
-paint-failure-painted = {THE($target)} is already covered in paint!
-paint-empty = {THE($used)} is empty!
-paint-removed = You clean off the paint!
-paint-closed = You must open {THE($used)}  first!
-paint-verb = Paint
-paint-remove-verb = Remove Paint
diff --git a/Resources/Locale/en-US/rcd/components/rcd-component.ftl b/Resources/Locale/en-US/rcd/components/rcd-component.ftl
index b7920c9edea..9741bde388c 100644
--- a/Resources/Locale/en-US/rcd/components/rcd-component.ftl
+++ b/Resources/Locale/en-US/rcd/components/rcd-component.ftl
@@ -1,18 +1,47 @@
 
 ### UI
 
-# Shown when an RCD is examined in details range
-rcd-component-examine-detail = It's currently on {$mode} mode.
+rcd-component-examine-mode-details = It's currently set to '{$mode}' mode.
+rcd-component-examine-build-details = It's currently set to build {MAKEPLURAL($name)}.
+
 
 ### Interaction Messages
 
-# Shown when changing RCD Mode
-rcd-component-change-mode = The RCD is now set to {$mode} mode.
+# Mode change
+rcd-component-change-mode = The RCD is now set to '{$mode}' mode.
+rcd-component-change-build-mode = The RCD is now set to build {MAKEPLURAL($name)}.
+
+# Ammo count
+rcd-component-no-ammo-message = The RCD has run out of charges!
+rcd-component-insufficient-ammo-message = The RCD doesn't have enough charges left!
 
-rcd-component-no-ammo-message = The RCD is out of ammo!
-rcd-component-tile-obstructed-message = That tile is obstructed!
-rcd-component-tile-indestructible-message = That tile can't be destroyed!
+# Deconstruction
+rcd-component-tile-indestructible-message = That tile can't be destructed!
 rcd-component-deconstruct-target-not-on-whitelist-message = You can't deconstruct that!
-rcd-component-cannot-build-floor-tile-not-empty-message = You can only build a floor on space!
-rcd-component-cannot-build-wall-tile-not-empty-message = You cannot build a wall on space!
-rcd-component-cannot-build-airlock-tile-not-empty-message = Cannot build an airlock on space!
+rcd-component-nothing-to-deconstruct-message = There's nothing to deconstruct!
+rcd-component-tile-obstructed-message = You can't deconstruct tiles when there's something on top of them!
+
+# Construction
+rcd-component-no-valid-grid = You're too far into open space to build here!
+rcd-component-must-build-on-empty-tile-message = A foundation already exists here!
+rcd-component-cannot-build-on-empty-tile-message = You can't build that without a foundation!
+rcd-component-must-build-on-subfloor-message = You can only build that on exposed subfloor!
+rcd-component-cannot-build-on-subfloor-message = You can't build that on exposed subfloor!
+rcd-component-cannot-build-on-occupied-tile-message = You can't build here, the space is already occupied!
+rcd-component-cannot-build-identical-tile = That tile already exists there!
+
+
+### Category names
+
+rcd-component-walls-and-flooring = Walls and flooring
+rcd-component-windows-and-grilles = Windows and grilles
+rcd-component-airlocks = Airlocks
+rcd-component-electrical = Electrical
+rcd-component-lighting = Lighting
+
+
+### Prototype names (note: constructable items will be puralized)
+
+rcd-component-deconstruct = deconstruct
+rcd-component-floor-steel = steel tile
+rcd-component-plating = hull plate
diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl
index a320bbdcb38..d8f0f6c4137 100644
--- a/Resources/Locale/en-US/reagents/meta/biological.ftl
+++ b/Resources/Locale/en-US/reagents/meta/biological.ftl
@@ -7,6 +7,9 @@ reagent-desc-insect-blood = Okay, this is really gross. It almost looks.. alive?
 reagent-name-slime = slime
 reagent-desc-slime = You thought this was gradient blood at first, but you were mistaken.
 
+reagent-name-sap = sap
+reagent-desc-sap = Sticky, sweet tree blood.
+
 reagent-name-hemocyanin-blood = blue blood
 reagent-desc-hemocyanin-blood = Contains copper as opposed to iron which gives it a distinct blue color.
 
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
index 82a16aa88e8..421dfe1484c 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -82,6 +82,9 @@ reagent-desc-atomic-bomb = Nuclear proliferation never tasted so good.
 reagent-name-b52 = b-52
 reagent-desc-b52 = Coffee, irish cream, and cognac. You will get bombed.
 
+reagent-name-blue-hawaiian = blue hawaiian
+reagent-desc-blue-hawaiian = Aloha! Does that mean hello or goodbye?
+
 reagent-name-bahama-mama = bahama mama
 reagent-desc-bahama-mama = Tropical cocktail.
 
@@ -106,6 +109,12 @@ reagent-desc-booger = Ewww...
 reagent-name-brave-bull = brave bull
 reagent-desc-brave-bull = It's just as effective as Dutch-Courage!
 
+reagent-name-coconut-rum = coconut rum
+reagent-desc-coconut-rum = Rum with coconut for that tropical feel.
+
+reagent-name-cosmopolitan = cosmopolitan
+reagent-desc-cosmopolitan = Even in the worst situations, nothing beats a fresh cosmopolitan.
+
 reagent-name-cuba-libre = cuba libre
 reagent-desc-cuba-libre = Rum, mixed with cola. Viva la revolucion.
 
@@ -190,9 +199,15 @@ reagent-desc-moonshine = Artisanal homemade liquor. What could go wrong?
 reagent-name-neurotoxin = neurotoxin
 reagent-desc-neurotoxin = A strong neurotoxin that puts the subject into a death-like state.
 
+reagent-name-painkiller = painkiller
+reagent-desc-painkiller = A cure for what ails you.
+
 reagent-name-patron = patron
 reagent-desc-patron = Tequila with silver in it, a favorite of alcoholic women in the club scene.
 
+reagent-name-pina-colada = piña colada
+reagent-desc-pina-colada = For getting lost in the rain.
+
 reagent-name-red-mead = red mead
 reagent-desc-red-mead = The true Viking's drink! Even though it has a strange red color.
 
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
index ad0ade7c960..359e866fd9d 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
@@ -4,6 +4,12 @@ reagent-desc-coffee = A drink made from brewed coffee beans. Contains a moderate
 reagent-name-cream = cream
 reagent-desc-cream = The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?
 
+reagent-name-coconut-water = coconut water
+reagent-desc-coconut-water = A favorite of survivors on deserted islands.
+
+reagent-name-cream-of-coconut = cream of coconut
+reagent-desc-cream-of-coconut = Sweet, syrupy version of coconut cream with added sugar.
+
 reagent-name-cafe-latte = cafe latte
 reagent-desc-cafe-latte = A nice, strong and tasty beverage while you are reading.
 
@@ -17,7 +23,7 @@ reagent-name-iced-coffee = iced coffee
 reagent-desc-iced-coffee = Coffee and ice, refreshing and cool.
 
 reagent-name-iced-green-tea = iced green tea
-reagent-desc-iced-green-tea = cold green tea.
+reagent-desc-iced-green-tea = Cold green tea.
 
 reagent-name-iced-tea = iced tea
 reagent-desc-iced-tea = No relation to a certain rap artist/actor.
@@ -25,6 +31,9 @@ reagent-desc-iced-tea = No relation to a certain rap artist/actor.
 reagent-name-lemonade = lemonade
 reagent-desc-lemonade = Drink using lemon juice, water, and a sweetener such as cane sugar or honey.
 
+reagent-name-arnold-palmer = arnold palmer
+reagent-desc-arnold-palmer = Now watch this drive.
+
 reagent-name-milk = milk
 reagent-desc-milk = An opaque white liquid produced by the mammary glands of mammals.
 
@@ -86,4 +95,4 @@ reagent-name-white-gilgamesh = white gilgamesh
 reagent-desc-white-gilgamesh = A sickening mixture of milk and beer. Makes you feel like you're made of wood.
 
 reagent-name-mopwata = mopwata
-reagent-desc-mopwata = Dirty, stagnant mop water.
\ No newline at end of file
+reagent-desc-mopwata = Dirty, stagnant mop water.
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
index 08017c265da..300284aee92 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
@@ -1,6 +1,9 @@
 reagent-name-cola = cola
 reagent-desc-cola = A sweet, carbonated soft drink. Caffeine free.
 
+reagent-name-shirley-temple = shirley temple
+reagent-desc-shirley-temple = A favorite amongst younger members of the crew.
+
 reagent-name-changeling-sting = changeling sting
 reagent-desc-changeling-sting = You take a tiny sip and feel a burning sensation...
 
@@ -28,6 +31,12 @@ reagent-desc-root-beer = A very sweet, carbonated drink reminiscent of sarsparil
 reagent-name-root-beer-float = root beer float
 reagent-desc-root-beer-float = Root beer, but now with ice cream on top. It truly is the magnum opus of Canadian summertime drinks.
 
+reagent-name-sol-dry = sol dry
+reagent-desc-sol-dry = Sweet ginger soda from outer space!
+
+reagent-name-roy-rogers = roy rogers
+reagent-desc-roy-rogers = Solid proof that there IS something known as too sweet.
+
 reagent-name-space-mountain-wind = Space Mountain Wind
 reagent-desc-space-mountain-wind = Blows right through you like a space wind.
 
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
index 38cd16b01c7..809fbafffd9 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
@@ -39,3 +39,6 @@ reagent-desc-soysauce = A salty soy-based flavoring.
 
 reagent-name-table-salt = table salt
 reagent-desc-table-salt = Commonly known as salt, Sodium Chloride is often used to season food or kill borers instantly.
+
+reagent-name-syrup = syrup
+reagent-desc-syrup = Delicious syrup made from tree sap, somehow stickier than glue.
diff --git a/Resources/Locale/en-US/shell.ftl b/Resources/Locale/en-US/shell.ftl
index 7a66fbc794d..34460f001a0 100644
--- a/Resources/Locale/en-US/shell.ftl
+++ b/Resources/Locale/en-US/shell.ftl
@@ -47,3 +47,4 @@ shell-argument-number-invalid = Argument {$index} must be a valid number!
 
 # Hints
 shell-argument-username-hint = <username>
+shell-argument-username-optional-hint = [username]
diff --git a/Resources/Locale/en-US/shuttles/emergency.ftl b/Resources/Locale/en-US/shuttles/emergency.ftl
index 57d4d09effd..c7162911351 100644
--- a/Resources/Locale/en-US/shuttles/emergency.ftl
+++ b/Resources/Locale/en-US/shuttles/emergency.ftl
@@ -15,7 +15,7 @@ emergency-shuttle-left = The Emergency Shuttle has left the station. Estimate {$
 emergency-shuttle-launch-time = The emergency shuttle will launch in {$consoleAccumulator} seconds.
 emergency-shuttle-docked = The Emergency Shuttle has docked with the station on the {$direction} side. It will leave in {$time} seconds.
 emergency-shuttle-good-luck = The Emergency Shuttle is unable to find a station. Good luck.
-emergency-shuttle-nearby = The Emergency Shuttle is unable to find a valid docking port. It has warped in {$direction} of the station.
+emergency-shuttle-nearby = The Emergency Shuttle is unable to find a valid docking port. It has warped {$direction}.
 
 # Emergency shuttle console popup / announcement
 emergency-shuttle-console-no-early-launches = Early launch is disabled
diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl
index 6ce575e648d..25e6c6f1ea9 100644
--- a/Resources/Locale/en-US/speech/speech-chatsan.ftl
+++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl
@@ -117,3 +117,6 @@ chatsan-replacement-42 = of course
 
 chatsan-word-43 = ig
 chatsan-replacement-43 = i guess
+
+chatsan-word-44 = tbf
+chatsan-replacement-44 = to be fair
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..543bef949aa 100644
--- a/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
+++ b/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
@@ -1,7 +1,7 @@
-anomaly-spawn-event-announcement = Our readings have detected a dangerous interspacial anomaly. Please inform the research team of { $sighting }.
+station-event-anomaly-spawn-announcement = Our readings have detected a dangerous interspacial anomaly. Please inform the research team of { $sighting }.
 
 anomaly-spawn-sighting-1 = low pulsating sounds heard throughout the station
 anomaly-spawn-sighting-2 = strange sources of light
 anomaly-spawn-sighting-3 = inexplicable shapes
 anomaly-spawn-sighting-4 = forms causing severe mental distress
-anomaly-spawn-sighting-5 = strange effects on the local environment
\ No newline at end of file
+anomaly-spawn-sighting-5 = strange effects on the local environment
diff --git a/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl b/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl
index a2307d77b5d..59ea8a536b5 100644
--- a/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl
+++ b/Resources/Locale/en-US/station-events/events/bluespace-artifact.ftl
@@ -6,4 +6,4 @@ bluespace-artifact-sighting-3 = otherworldly structures
 bluespace-artifact-sighting-4 = incomprehensible alien objects
 bluespace-artifact-sighting-5 = unfamiliar objects in strange places
 bluespace-artifact-sighting-6 = unknown alien artifacts
-bluespace-artifact-sighting-7 = explosions of light accompanied by weird sounds
\ No newline at end of file
+bluespace-artifact-sighting-7 = explosions of light accompanied by weird sounds
diff --git a/Resources/Locale/en-US/station-events/events/cargo-gifts.ftl b/Resources/Locale/en-US/station-events/events/cargo-gifts.ftl
index d669fbeff90..fd20459b5eb 100644
--- a/Resources/Locale/en-US/station-events/events/cargo-gifts.ftl
+++ b/Resources/Locale/en-US/station-events/events/cargo-gifts.ftl
@@ -10,14 +10,14 @@ cargo-gift-dest-janitor = Service Dept
 cargo-gift-dest-med = Medical Dept
 cargo-gift-dest-sec = Security Dept
 
-cargo-gift-pizza-small = A small pizza party
-cargo-gift-pizza-large = A large pizza party
+cargo-gift-pizza-small = a small pizza party
+cargo-gift-pizza-large = a large pizza party
 
-cargo-gift-eng = Repair Materials
-cargo-gift-vending = Vending machines refills
-cargo-gift-cleaning = Cleaning equipment
-cargo-gift-medical-supply = Medical supplies
-cargo-gift-space-protection = Space Hazard Protection
-cargo-gift-fire-protection = Fire Protection
-cargo-gift-security-guns = Lethal Weapons
-cargo-gift-security-riot = Riot Gear
+cargo-gift-eng = repair Materials
+cargo-gift-vending = vending machine refills
+cargo-gift-cleaning = cleaning equipment
+cargo-gift-medical-supply = medical supplies
+cargo-gift-space-protection = space hazard protection
+cargo-gift-fire-protection = fire protection
+cargo-gift-security-guns = lethal weapons
+cargo-gift-security-riot = riot gear
diff --git a/Resources/Locale/en-US/station-events/events/gas-leak.ftl b/Resources/Locale/en-US/station-events/events/gas-leak.ftl
index 18429fa58d8..230e886db47 100644
--- a/Resources/Locale/en-US/station-events/events/gas-leak.ftl
+++ b/Resources/Locale/en-US/station-events/events/gas-leak.ftl
@@ -1,2 +1,2 @@
-station-event-gas-leak-start-announcement = Attention crew, there is a gas leak on the station. We advise you to avoid the area and wear suit internals in the meantime.
-station-event-gas-leak-end-announcement = The source of the gas leak has been fixed. Please be cautious around areas with gas remaining.
+station-event-gas-leak-announcement = Attention crew, there is a gas leak on the station. We advise you to avoid the area and wear suit internals in the meantime.
+station-event-gas-leak-complete-announcement = The source of the gas leak has been fixed. Please be cautious around areas with gas remaining.
diff --git a/Resources/Locale/en-US/station-events/events/immovable-rod.ftl b/Resources/Locale/en-US/station-events/events/immovable-rod.ftl
index 06abcc85c38..ff39923ecdd 100644
--- a/Resources/Locale/en-US/station-events/events/immovable-rod.ftl
+++ b/Resources/Locale/en-US/station-events/events/immovable-rod.ftl
@@ -1 +1 @@
-station-event-immovable-rod-start-announcement = High velocity unidentified object is on a collision course with the station. Impact imminent.
+station-event-immovable-rod-announcement = High velocity unidentified object is on a collision course with the station. Impact imminent.
diff --git a/Resources/Locale/en-US/station-events/events/ion-storm.ftl b/Resources/Locale/en-US/station-events/events/ion-storm.ftl
index 28192d96637..10e8f190061 100644
--- a/Resources/Locale/en-US/station-events/events/ion-storm.ftl
+++ b/Resources/Locale/en-US/station-events/events/ion-storm.ftl
@@ -1,4 +1,4 @@
-station-event-ion-storm-start-announcement = Ion storm detected near the station. Please check all AI-controlled equipment for errors.
+station-event-ion-storm-announcement = Ion storm detected near the station. Please check all AI-controlled equipment for errors.
 
 ion-storm-law-scrambled-number = [font="Monospace"][scramble rate=250 length={$length} chars="@@###$$&%!01"/][/font]
 
diff --git a/Resources/Locale/en-US/station-events/events/kudzu-growth.ftl b/Resources/Locale/en-US/station-events/events/kudzu-growth.ftl
index e0725deaf15..9ba4adb4a2d 100644
--- a/Resources/Locale/en-US/station-events/events/kudzu-growth.ftl
+++ b/Resources/Locale/en-US/station-events/events/kudzu-growth.ftl
@@ -1 +1 @@
-station-event-kudzu-growth-start-announcement = Attention crew, we have detected a Type 2 Biological Invader on-station, that poses potentially serious threat to crew productivity. We advise you to exterminate it.
+station-event-kudzu-growth-announcement = Attention crew, we have detected a Type 2 Biological Invader on-station, that poses potentially serious threat to crew productivity. We advise you to exterminate it.
diff --git a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
index 6a96c560481..9066fb52121 100644
--- a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
+++ b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
@@ -1,2 +1,2 @@
-station-event-meteor-swarm-start-announcement = Meteors are on a collision course with the station. Brace for impact.
-station-event-meteor-swarm-end-announcement = The meteor swarm has passed. Please return to your stations.
+station-event-meteor-swarm-announcement = Meteors are on a collision course with the station. Brace for impact.
+station-event-meteor-swarm-complete-announcement = The meteor swarm has passed. Please return to your stations.
diff --git a/Resources/Locale/en-US/station-events/events/power-grid-check.ftl b/Resources/Locale/en-US/station-events/events/power-grid-check.ftl
index b42dbd19db3..90ede6b9965 100644
--- a/Resources/Locale/en-US/station-events/events/power-grid-check.ftl
+++ b/Resources/Locale/en-US/station-events/events/power-grid-check.ftl
@@ -1,4 +1,4 @@
 ## PowerGridCheck
 
-station-event-power-grid-check-start-announcement = Abnormal activity detected in the station's powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.
-station-event-power-grid-check-end-announcement = Power has been restored to the station. We apologize for the inconvenience.
\ No newline at end of file
+station-event-power-grid-check-announcement = Abnormal activity detected in the station's powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.
+station-event-power-grid-check-complete-announcement = Power has been restored to the station. We apologize for the inconvenience.
diff --git a/Resources/Locale/en-US/station-events/events/radiation-storm.ftl b/Resources/Locale/en-US/station-events/events/radiation-storm.ftl
index c8f07c1b2ff..a3c5f48e84f 100644
--- a/Resources/Locale/en-US/station-events/events/radiation-storm.ftl
+++ b/Resources/Locale/en-US/station-events/events/radiation-storm.ftl
@@ -1,4 +1,4 @@
 ## RadiationStorm
 
-station-event-radiation-storm-start-announcement = High levels of radiation detected near the station. Evacuate any areas containing abnormal green energy fields.
-station-event-radiation-storm-end-announcement = The radiation threat has passed. Please return to your workplaces.
\ No newline at end of file
+station-event-radiation-storm-announcement = High levels of radiation detected near the station. Evacuate any areas containing abnormal green energy fields.
+station-event-radiation-storm-complete-announcement = The radiation threat has passed. Please return to your workplaces.
diff --git a/Resources/Locale/en-US/station-events/events/rempant-brand-intelligence.ftl b/Resources/Locale/en-US/station-events/events/rempant-brand-intelligence.ftl
new file mode 100644
index 00000000000..8f7403dabd2
--- /dev/null
+++ b/Resources/Locale/en-US/station-events/events/rempant-brand-intelligence.ftl
@@ -0,0 +1 @@
+station-event-rampant-intelligence-announcement = Rampant brand intelligence has been detected board your station. Please inspect any vendors for aggressive marketing tactics, and reboot them if necessary.
diff --git a/Resources/Locale/en-US/station-events/events/solar-flare.ftl b/Resources/Locale/en-US/station-events/events/solar-flare.ftl
index 5c88f82ded1..617b65739a8 100644
--- a/Resources/Locale/en-US/station-events/events/solar-flare.ftl
+++ b/Resources/Locale/en-US/station-events/events/solar-flare.ftl
@@ -1,2 +1,2 @@
-station-event-solar-flare-start-announcement = A solar flare has been detected near the station. Some communication channels may not function.
-station-event-solar-flare-end-announcement = The solar flare ended. Communication channels no longer affected.
+station-event-solar-flare-announcement = A solar flare has been detected near the station. Some communication channels may not function.
+station-event-solar-flare-complete-announcement = The solar flare ended. Communication channels no longer affected.
diff --git a/Resources/Locale/en-US/station-events/events/vent-clog.ftl b/Resources/Locale/en-US/station-events/events/vent-clog.ftl
index f87f9e241b2..1d6ddd136b7 100644
--- a/Resources/Locale/en-US/station-events/events/vent-clog.ftl
+++ b/Resources/Locale/en-US/station-events/events/vent-clog.ftl
@@ -1 +1 @@
-station-event-vent-clog-start-announcement = The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.
+station-event-vent-clog-announcement = The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.
diff --git a/Resources/Locale/en-US/station-events/events/vent-critters.ftl b/Resources/Locale/en-US/station-events/events/vent-critters.ftl
index 426f0c0ca1a..7c0103cd559 100644
--- a/Resources/Locale/en-US/station-events/events/vent-critters.ftl
+++ b/Resources/Locale/en-US/station-events/events/vent-critters.ftl
@@ -1 +1,4 @@
-station-event-vent-creatures-start-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
+station-event-cockroach-migration-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
+station-event-slimes-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
+station-event-vent-critters-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
+station-event-spider-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
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 d41933b3744..d0dfed2b5dd 100644
--- a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl
+++ b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl
@@ -5,6 +5,7 @@ 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
diff --git a/Resources/Locale/en-US/store/categories.ftl b/Resources/Locale/en-US/store/categories.ftl
index 437fc03ae09..b6abc3e4288 100644
--- a/Resources/Locale/en-US/store/categories.ftl
+++ b/Resources/Locale/en-US/store/categories.ftl
@@ -12,6 +12,7 @@ store-category-implants = Implants
 store-category-job = Job
 store-category-armor = Armor
 store-category-pointless = Pointless
+store-category-deception = Deception
 
 # Revenant
 store-category-abilities = Abilities
diff --git a/Resources/Locale/en-US/store/store.ftl b/Resources/Locale/en-US/store/store.ftl
index 7af2b055338..997afedfc06 100644
--- a/Resources/Locale/en-US/store/store.ftl
+++ b/Resources/Locale/en-US/store/store.ftl
@@ -6,3 +6,5 @@ store-ui-traitor-flavor = Copyright (C) NT -30643
 store-ui-traitor-warning = Operatives must lock their uplinks after use to avoid detection.
 
 store-withdraw-button-ui = Withdraw {$currency}
+store-ui-button-out-of-stock = {""} (Out of Stock)
+store-not-account-owner = This {$store} is not bound to you!
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 4836a57d6b1..592cf59d2fe 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -109,6 +109,9 @@ uplink-holoclown-kit-desc = A joint venture between Cybersun and Honk.co. Contai
 uplink-holster-name = Shoulder Holster
 uplink-holster-desc = A deep shoulder holster capable of holding many types of ballistics.
 
+uplink-chest-rig-name = Chest Rig
+uplink-chest-rig-desc = Explosion-resistant tactical webbing used for holding traitor goods.
+
 uplink-emag-name = Emag
 uplink-emag-desc = The business card of the syndicate, this sequencer is able to break open airlocks and tamper with a variety of station devices. Recharges automatically.
 
diff --git a/Resources/Locale/en-US/strip/strippable-component.ftl b/Resources/Locale/en-US/strip/strippable-component.ftl
index 7654b20b03f..65d7844ee22 100644
--- a/Resources/Locale/en-US/strip/strippable-component.ftl
+++ b/Resources/Locale/en-US/strip/strippable-component.ftl
@@ -19,4 +19,8 @@ strip-verb-get-data-text = Strip
 ## UI
 
 strippable-bound-user-interface-stripping-menu-title = {$ownerName}'s inventory
-strippable-bound-user-interface-stripping-menu-ensnare-button = Remove Leg Restraints
\ No newline at end of file
+strippable-bound-user-interface-stripping-menu-ensnare-button = Remove Leg Restraints
+
+# Stealth
+thieving-component-user = Someone
+thieving-component-item = something
\ No newline at end of file
diff --git a/Resources/Locale/en-US/toilet/toilet-component.ftl b/Resources/Locale/en-US/toilet/toilet-component.ftl
index 7807759e42c..1129f61b4d7 100644
--- a/Resources/Locale/en-US/toilet/toilet-component.ftl
+++ b/Resources/Locale/en-US/toilet/toilet-component.ftl
@@ -7,3 +7,5 @@ toilet-component-suicide-message-others = {CAPITALIZE(THE($victim))} bashes them
 toilet-component-suicide-message = You bash yourself with {THE($owner)}!
 toilet-seat-close = Close Seat
 toilet-seat-open = Open Seat
+
+plunger-unblock = You unblock the {THE($target)}!
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index e9163bdb548..0d5df16eed9 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -11,6 +11,9 @@ trait-description-Pacifist = You cannot attack or hurt any living beings.
 trait-name-LightweightDrunk = Lightweight Drunk
 trait-description-LightweightDrunk = Alcohol has a stronger effect on you
 
+trait-name-HeavyweightDrunk = Heavyweight Drunk
+trait-description-HeavyweightDrunk = Alcohols are afraid of you
+
 trait-name-Muted = Muted
 trait-description-Muted = You can't speak
 
@@ -31,3 +34,27 @@ trait-description-SocialAnxiety = You are anxious when you speak and stutter.
 
 trait-name-Snoring = Snoring
 trait-description-Snoring = You will snore while sleeping.
+
+trait-name-NormalVisionHarpy = Trichromat Modification
+trait-description-NormalVisionHarpy = Your eyes have been modified by means of advanced medicine to see in the standard colors of Red, Green, and Blue.
+
+trait-name-Southern = Southern Drawl
+trait-description-Southern = You have a different way of speakin'.
+
+trait-name-NormalVisionVulpkanin = Trichromat Modification
+trait-description-NormalVisionVulpkanin = Your eyes have been modified by means of advanced medicine to see in the standard colors of Red, Green, and Blue.
+
+trait-name-Thieving = Thieving
+trait-description-Thieving =
+    You are deft with your hands, and talented at convincing people of their belongings.
+    You can identify pocketed items, steal them quieter, and steal ~33% faster.
+
+trait-name-ForeignerLight = Foreigner (light)
+trait-description-ForeignerLight =
+    You struggle to learn this station's primary language, and as such, cannot speak it. You can, however, comprehend what others say in that language.
+    To help you overcome this obstacle, you are equipped with a translator that helps you speak in this station's primary language.
+
+trait-name-Foreigner = Foreigner
+trait-description-Foreigner =
+    For one reason or another you do not speak this station's primary language.
+    Instead, you have a translator issued to you that only you can use.
diff --git a/Resources/Locale/en-US/voice-mask.ftl b/Resources/Locale/en-US/voice-mask.ftl
index cb6eb7768e5..2f5acefee41 100644
--- a/Resources/Locale/en-US/voice-mask.ftl
+++ b/Resources/Locale/en-US/voice-mask.ftl
@@ -1,5 +1,6 @@
 voice-mask-name-change-window = Voice Mask Name Change
 voice-mask-name-change-info = Type in the name you want to mimic.
+voice-mask-name-change-speech-style = Speech style
 voice-mask-name-change-set = Set name
 voice-mask-name-change-set-description = Change the name others hear to something else.
 
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index c4759eef91f..7f19699ad8a 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -206,3 +206,51 @@ AmePartStealObjective: AmePartFlatpackStealObjective
 
 # 2024-02-26
 CrateBaseWeldable: CrateGenericSteel
+
+# 2024-03-05
+BookBotanicalTextbook: BookRandomStory
+BookEscalation: BookRandomStory
+BookEscalationSecurity: BookRandomStory
+BookDemonomiconRandom: BookRandomStory
+BookDemonomicon1: BookRandomStory
+BookDemonomicon2: BookRandomStory
+BookDemonomicon3: BookRandomStory
+BookChemistryInsane: BookRandomStory
+BookGnominomicon: BookRandomStory
+BookFishing: BookRandomStory
+BookDetective: BookRandomStory
+
+# 2024-03-07
+AirlockExternalEasyPry: AirlockExternal
+AirlockExternalGlassEasyPry: AirlockExternalGlass
+AirlockGlassShuttleEasyPry: AirlockGlassShuttle
+AirlockShuttleEasyPry: AirlockShuttle
+AirlockExternalEasyPryLocked: AirlockExternalLocked
+AirlockExternalGlassEasyPryLocked: AirlockExternalGlassLocked
+AirlockGlassShuttleEasyPryLocked: AirlockExternalGlassShuttleLocked
+AirlockShuttleEasyPryLocked: AirlockExternalShuttleLocked
+
+# 2024-03-10
+ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective
+ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective
+ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective
+
+# 2024-03-16
+ClothingHeadHatHairflower: FoodPoppy
+
+# 2024-03-21
+RPED: null
+
+# 2024-03-30
+# These are technically not equivalent, but it probably makes more sense to replace any existing SCAF stuff with SOME kind of armor, instead of just deleting it outright.
+ClothingHeadHelmetScaf: ClothingHeadHelmetBasic
+ClothingOuterArmorScaf: ClothingOuterArmorBasic
+
+# 2024-03-31
+ClothingNeckFlowerWreath: ClothingHeadHatFlowerWreath
+ClothingHeadHatFlowerCrown: ClothingHeadHatFlowerWreath
+BriefcaseSyndieBase: null
+
+# 2024-04-08
+BodyBag_Container: BodyBag
+BodyBag_Folded: BodyBagFolded
diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
index 92b3d7de9b3..a5269924f7a 100644
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -367,6 +367,15 @@
     accent-cowboy-words-98: accent-cowboy-replacement-98
     accent-cowboy-words-99: accent-cowboy-replacement-99
 
+- type: accent
+  id: southern
+  wordReplacements:
+    accent-southern-words-1: accent-southern-words-replace-1
+    accent-southern-words-2: accent-southern-words-replace-2
+    accent-southern-words-3: accent-southern-words-replace-3
+    accent-southern-words-4: accent-southern-words-replace-4
+    accent-southern-words-5: accent-southern-words-replace-5
+    accent-southern-words-6: accent-southern-words-replace-6
 
 # For the chat sanitization system
 - type: accent
@@ -415,3 +424,4 @@
     chatsan-word-41: chatsan-replacement-41
     chatsan-word-42: chatsan-replacement-42
     chatsan-word-43: chatsan-replacement-43
+    chatsan-word-44: chatsan-replacement-44
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index 22f16bd9568..f55f59daaa8 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -350,3 +350,29 @@
       itemIconStyle: NoItem
       useDelay: 1 # emote spam
       event: !type:ToggleActionEvent
+
+- type: entity
+  id: ActionFabricateLollipop
+  name: action-name-fabricate-lollipop
+  description: action-description-fabricate-lollipop
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: { sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi, state: lollipop }
+    useDelay: 120
+    event:
+      !type:FabricateActionEvent
+      fabrication: FoodLollipop
+
+- type: entity
+  id: ActionFabricateGumball
+  name: action-name-fabricate-gumball
+  description: action-description-fabricate-gumball
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: { sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi, state: gumball }
+    useDelay: 40
+    event:
+      !type:FabricateActionEvent
+      fabrication: FoodGumball
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 2d1c9062e61..00b799670f6 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -24,6 +24,15 @@
     - category: Thirst
     - alertType: Magboots
     - alertType: Pacified
+    - alertType: Offer
+
+- type: entity
+  id: AlertSpriteView
+  categories: [ hideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "enum.AlertVisualLayers.Base" ]
 
 - type: alert
   id: LowOxygen
@@ -150,6 +159,15 @@
   name: alerts-buckled-name
   description: alerts-buckled-desc
 
+- type: alert
+  id: Offer
+  onClick: !type:AcceptOffer  { }
+  icons:
+  - sprite: /Textures/Interface/Alerts/offer_item.rsi
+    state: offer_item
+  name: alerts-offer-name
+  description: alerts-offer-desc
+
 - type: alert
   id: HumanCrit
   category: Health
@@ -419,6 +437,18 @@
   name: alerts-pacified-name
   description: alerts-pacified-desc
 
+- type: alert
+  id: Walking
+  icons:
+  - sprite: /Textures/Interface/Alerts/walking.rsi
+    state: walking0
+  - sprite: /Textures/Interface/Alerts/walking.rsi
+    state: walking1
+  name: alerts-walking-name
+  description: alerts-walking-desc
+  minSeverity: 0
+  maxSeverity: 1
+
 - type: alert
   id: Debug1
   icons:
diff --git a/Resources/Prototypes/Alerts/revenant.yml b/Resources/Prototypes/Alerts/revenant.yml
index 2fb810ca1e6..a56b8983510 100644
--- a/Resources/Prototypes/Alerts/revenant.yml
+++ b/Resources/Prototypes/Alerts/revenant.yml
@@ -4,45 +4,26 @@
   icons:
   - sprite: /Textures/Interface/Alerts/essence_counter.rsi
     state: essence0
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence1
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence2
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence3
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence4
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence5
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence6
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence7
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence8
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence9
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence10
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence11
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence12
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence13
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence14
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence15
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence16
+  alertViewEntity: AlertEssenceSpriteView
   name: alerts-revenant-essence-name
   description: alerts-revenant-essence-desc
-  minSeverity: 0
-  maxSeverity: 16
 
 - type: alert
   id: Corporeal
   icons: [ /Textures/DeltaV/Mobs/Ghosts/revenant.rsi/icon.png ] # DeltaV - Custom revenant sprite
   name: alerts-revenant-corporeal-name
   description: alerts-revenant-corporeal-desc
+
+- type: entity
+  id: AlertEssenceSpriteView
+  categories: [ hideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: /Textures/Interface/Alerts/essence_counter.rsi
+    layers:
+    - map: [ "enum.AlertVisualLayers.Base" ]
+    - map: [ "enum.RevenantVisualLayers.Digit1" ]
+    - map: [ "enum.RevenantVisualLayers.Digit2" ]
+      offset: 0.125, 0
+    - map: [ "enum.RevenantVisualLayers.Digit3" ]
+      offset: 0.25, 0
diff --git a/Resources/Prototypes/Announcers/!randomAnnouncers.yml b/Resources/Prototypes/Announcers/!randomAnnouncers.yml
new file mode 100644
index 00000000000..a796094b28d
--- /dev/null
+++ b/Resources/Prototypes/Announcers/!randomAnnouncers.yml
@@ -0,0 +1,8 @@
+- type: weightedRandom
+  id: RandomAnnouncers
+  weights:
+    Intern: 0.15
+    MedBot: 0.5
+    Michael: 0.9
+    NEIL: 1
+    VoxFem: 0.55
diff --git a/Resources/Prototypes/Announcers/intern.yml b/Resources/Prototypes/Announcers/intern.yml
new file mode 100644
index 00000000000..0a1a4049b6d
--- /dev/null
+++ b/Resources/Prototypes/Announcers/intern.yml
@@ -0,0 +1,134 @@
+- type: announcer
+  id: Intern
+  basePath: /Audio/Announcers/Intern
+  baseAudioParams:
+    volume: -7
+  announcements:
+    # Communications
+    - id: announce # Communications console
+      path: comms/announce.ogg
+    # - id: attention # Generic alert sound # Should be different from fallback but it's very similar
+    #   path: comms/attention.ogg
+    - id: commandReport # Station goal, Central Command messages, etc
+      collection: InternCommandReportAnnouncements
+    # - id: spawnAnnounceCaptain # Captain arrives on the station # TODO That system is annoyingly not modular
+    #   path: comms/spawn_announce.ogg
+    # - id: war # Nuclear Operative declaration of war
+    #   path: comms/war.ogg
+    # - id: nukeCodes # The station has been send nuclear activation codes
+    #   path: comms/nuke_codes.ogg # Or command_report.ogg if you want
+    # - id: nukeArm # The nuke is active and ticking
+    #   path: comms/nuke_arm.ogg
+    # - id: nukeDisarm # The nuke has been disarmed
+    #   path: comms/nuke_disarm.ogg
+    - id: welcome # The shift has started
+      collection: InternWelcomeAnnouncements
+
+    # Alert levels
+    # - id: alertGreen # Everything is fine
+    #   path: alerts/green.ogg
+    # - id: alertBlue # Something is amiss
+    #   path: alerts/blue.ogg
+    # - id: alertViolet # Viral infection or misc medical emergencies, listen to Medical
+    #   path: alerts/violet.ogg
+    # - id: alertWhite # Glimmer is too high, listen to Epistemics
+    #   path: alerts/white.ogg
+    # - id: alertYellow # The station is being largely damaged, listen to Engineering
+    #   path: alerts/yellow.ogg
+    # - id: alertRed # Generic many things are bad, listen to Security
+    #   path: alerts/red.ogg
+    # - id: alertGamma # There is a massive immediate threat to the station, listen to Central Command
+    #   path: alerts/gamma.ogg
+    # - id: alertDelta # The station is being or about to be massively destroyed, run for your life
+    #   path: alerts/delta.ogg
+    # - id: alertEpsilon # The station has been terminated, good luck survivors!
+    #   path: alerts/epsilon.ogg
+
+    # Events
+    ## Wizard's Den
+    ### Mid-Round Antagonists
+    # - id: ninjaHacking # A Ninja is hacking something
+    #   path: comms/ninja_hacking.ogg
+    # - id: powerSinkExplosion # A power sink is about to overcharge and explode
+    #   path: comms/powersink_explosion.ogg
+    ### Events
+    - id: anomalySpawn # An anomaly has spawned in a random place
+      path: events/anomaly.ogg
+    # - id: bluespaceArtifact # An artifact has spawned in a random place
+    #   path: events/bluespace_artifact.ogg
+    # - id: bluespaceLocker # Two random lockers now share inventories
+    #   path: events/bluespace_locker.ogg
+    # - id: breakerFlip # A few random APCs have been disabled, ask Engineering to fix them
+    #   path: events/breaker_flip.ogg
+    # - id: bureaucraticError # Random jobs have been added, removed, or made infinite
+    #   path: events/bureaucratic_error.ogg
+    # - id: clericalError # Random crew are removed from the manifest
+    #   path: events/clerical_error.ogg
+    # - id: carpRift # A dragon's carp rift is active
+    #   path: events/carp_rift.ogg
+    # - id: revenantSpawn # A revenant has spawned (by a prober?)
+    #   path: events/revenant_spawn.ogg
+    # - id: gasLeak # A random gas is coming out of a random vent
+    #   path: events/gas_leak.ogg
+    # - id: gasLeakComplete # Gas has stopped coming out of a vent
+    #   path: events/gas_leak-complete.ogg
+    # - id: kudzuGrowth # Kudzu is growing in a random place
+    #   path: events/kudzu_growth.ogg
+    - id: meteorSwarm # Meteors are flying at the station, stay away from windows
+      path: events/meteors.ogg
+    # - id: meteorSwarmComplete # Meteors have stopped flying at the station
+    #   path: events/meteors-complete.ogg
+    # - id: mouseMigration # Several mice have appeared in a random place
+    #   path: events/mouse_migration.ogg
+    # - id: cockroachMigration # Several cockroaches have appeared in a random place
+    #   path: events/cockroach_migration.ogg
+    - id: powerGridCheck # The station's power is offline for some moments
+      path: events/power_grid_check.ogg
+    - id: powerGridCheckComplete # The station's power is online again
+      path: events/power_grid_check-complete.ogg
+    # - id: randomSentience # A random few animals have become sentient
+    #   path: events/random_sentience.ogg
+    # - id: solarFlare # A solar flare is nearby, may mess with comms and electronics
+    #   path: events/solar_flare.ogg
+    # - id: solarFlareComplete # The solar flare has passed
+    #   path: events/solar_flare-complete.ogg
+    # - id: ventClog # A random reagent is coming out of a scrubber
+    #   path: events/vent_clog.ogg
+    # - id: slimesSpawn # Some simple slimes are appearing in vents
+    #   path: events/slimes_spawn.ogg
+    # - id: spiderSpawn # Some simple spiders are appearing in vents
+    #   path: events/spider_spawn.ogg
+    # - id: immovableRodSpawn # The station is moving into an immovable rod, don't die or something, ask Engineering for help repairing it
+    #   path: events/immovable_rod_spawn.ogg
+    - id: ionStorm # AI-controlled equipment are now weird, check their laws
+      path: events/ion_storm.ogg
+    ## Delta-V
+    - id: xenoVents # Xenomorphs are coming out of vents
+      path: events/aliens.ogg
+    ## NyanoTrasen
+    # - id: noosphericStorm # A large amount of glimmer has joined the station and made people psionic
+    #   path: events/noospheric_storm.ogg
+
+    # Shuttle
+    - id: shuttleCalled # The shuttle is on its way
+      path: shuttle/called.ogg
+    - id: shuttleRecalled # The shuttle is going back to Central Command
+      path: shuttle/recalled.ogg
+    - id: shuttleDock # The shuttle has arrived at the station
+      path: shuttle/dock.ogg
+    # - id: shuttleNearby # The shuttle couldn't dock, it's at a specified location
+    #   path: shuttle/nearby.ogg
+    # - id: shuttleGoodLuck # The shuttle could not find its way to the station, good luck crew
+    #   path: shuttle/good_luck.ogg
+    # - id: shuttleAuthAdded # One of few have added their acceptance to early launching
+    #   path: shuttle/auth_added.ogg
+    # - id: shuttleAuthRevoked # One of few have revoked their acceptance to early launching
+    #   path: shuttle/auth_revoked.ogg
+    # - id: shuttleAlmostLaunching # The shuttle will leave to FTL in 10 seconds
+    #   path: shuttle/almost_launching.ogg
+    # - id: shuttleLeft # The shuttle has left the station
+    #   path: shuttle/left.ogg
+
+    # Fallback # REQUIRED
+    - id: fallback # Any announcement sent without a valid announcement on this announcer will use this
+      collection: InternAnnouncements
diff --git a/Resources/Prototypes/Announcers/medbot.yml b/Resources/Prototypes/Announcers/medbot.yml
new file mode 100644
index 00000000000..3b1fba49721
--- /dev/null
+++ b/Resources/Prototypes/Announcers/medbot.yml
@@ -0,0 +1,132 @@
+- type: announcer
+  id: MedBot
+  basePath: /Audio/Announcers/MedBot
+  announcements:
+    # Communications
+    - id: announce # Communications console
+      path: comms/announce.ogg
+    - id: attention # Generic alert sound # Should be different from fallback but it's very similar
+      path: comms/attention.ogg
+    - id: commandReport # Station goal, Central Command messages, etc
+      path: comms/command_report.ogg
+    # - id: spawnAnnounceCaptain # Captain arrives on the station # TODO That system is annoyingly not modular
+    #   path: comms/spawn_announce.ogg
+    # - id: war # Nuclear Operative declaration of war
+    #   path: comms/war.ogg
+    # - id: nukeCodes # The station has been send nuclear activation codes
+    #   path: comms/nuke_codes.ogg # Or command_report.ogg if you want
+    # - id: nukeArm # The nuke is active and ticking
+    #   path: comms/nuke_arm.ogg
+    # - id: nukeDisarm # The nuke has been disarmed
+    #   path: comms/nuke_disarm.ogg
+    - id: welcome # The shift has started
+      path: comms/welcome.ogg
+
+    # Alert levels
+    # - id: alertGreen # Everything is fine
+    #   path: alerts/green.ogg
+    # - id: alertBlue # Something is amiss
+    #   path: alerts/blue.ogg
+    # - id: alertViolet # Viral infection or misc medical emergencies, listen to Medical
+    #   path: alerts/violet.ogg
+    # - id: alertWhite # Glimmer is too high, listen to Epistemics
+    #   path: alerts/white.ogg
+    # - id: alertYellow # The station is being largely damaged, listen to Engineering
+    #   path: alerts/yellow.ogg
+    # - id: alertRed # Generic many things are bad, listen to Security
+    #   path: alerts/red.ogg
+    # - id: alertGamma # There is a massive immediate threat to the station, listen to Central Command
+    #   path: alerts/gamma.ogg
+    # - id: alertDelta # The station is being or about to be massively destroyed, run for your life
+    #   path: alerts/delta.ogg
+    # - id: alertEpsilon # The station has been terminated, good luck survivors!
+    #   path: alerts/epsilon.ogg
+
+    # Events
+    ## Wizard's Den
+    ### Mid-Round Antagonists
+    # - id: ninjaHacking # A Ninja is hacking something
+    #   path: comms/ninja_hacking.ogg
+    # - id: powerSinkExplosion # A power sink is about to overcharge and explode
+    #   path: comms/powersink_explosion.ogg
+    ### Events
+    - id: anomalySpawn # An anomaly has spawned in a random place
+      path: events/anomaly.ogg
+    # - id: bluespaceArtifact # An artifact has spawned in a random place
+    #   path: events/bluespace_artifact.ogg
+    # - id: bluespaceLocker # Two random lockers now share inventories
+    #   path: events/bluespace_locker.ogg
+    # - id: breakerFlip # A few random APCs have been disabled, ask Engineering to fix them
+    #   path: events/breaker_flip.ogg
+    # - id: bureaucraticError # Random jobs have been added, removed, or made infinite
+    #   path: events/bureaucratic_error.ogg
+    # - id: clericalError # Random crew are removed from the manifest
+    #   path: events/clerical_error.ogg
+    # - id: carpRift # A dragon's carp rift is active
+    #   path: events/carp_rift.ogg
+    # - id: revenantSpawn # A revenant has spawned (by a prober?)
+    #   path: events/revenant_spawn.ogg
+    # - id: gasLeak # A random gas is coming out of a random vent
+    #   path: events/gas_leak.ogg
+    # - id: gasLeakComplete # Gas has stopped coming out of a vent
+    #   path: events/gas_leak-complete.ogg
+    # - id: kudzuGrowth # Kudzu is growing in a random place
+    #   path: events/kudzu_growth.ogg
+    - id: meteorSwarm # Meteors are flying at the station, stay away from windows
+      path: events/meteors.ogg
+    # - id: meteorSwarmComplete # Meteors have stopped flying at the station
+    #   path: events/meteors-complete.ogg
+    # - id: mouseMigration # Several mice have appeared in a random place
+    #   path: events/mouse_migration.ogg
+    # - id: cockroachMigration # Several cockroaches have appeared in a random place
+    #   path: events/cockroach_migration.ogg
+    - id: powerGridCheck # The station's power is offline for some moments
+      path: events/power_grid_check.ogg
+    - id: powerGridCheckComplete # The station's power is online again
+      path: events/power_grid_check-complete.ogg
+    # - id: randomSentience # A random few animals have become sentient
+    #   path: events/random_sentience.ogg
+    # - id: solarFlare # A solar flare is nearby, may mess with comms and electronics
+    #   path: events/solar_flare.ogg
+    # - id: solarFlareComplete # The solar flare has passed
+    #   path: events/solar_flare-complete.ogg
+    # - id: ventClog # A random reagent is coming out of a scrubber
+    #   path: events/vent_clog.ogg
+    # - id: slimesSpawn # Some simple slimes are appearing in vents
+    #   path: events/slimes_spawn.ogg
+    # - id: spiderSpawn # Some simple spiders are appearing in vents
+    #   path: events/spider_spawn.ogg
+    # - id: immovableRodSpawn # The station is moving into an immovable rod, don't die or something, ask Engineering for help repairing it
+    #   path: events/immovable_rod_spawn.ogg
+    - id: ionStorm # AI-controlled equipment are now weird, check their laws
+      path: events/ion_storm.ogg
+    ## Delta-V
+    - id: xenoVents # Xenomorphs are coming out of vents
+      path: events/aliens.ogg
+    ## NyanoTrasen
+    # - id: noosphericStorm # A large amount of glimmer has joined the station and made people psionic
+    #   path: events/noospheric_storm.ogg
+
+    # Shuttle
+    - id: shuttleCalled # The shuttle is on its way
+      path: shuttle/called.ogg
+    - id: shuttleRecalled # The shuttle is going back to Central Command
+      path: shuttle/recalled.ogg
+    - id: shuttleDock # The shuttle has arrived at the station
+      path: shuttle/dock.ogg
+    # - id: shuttleNearby # The shuttle couldn't dock, it's at a specified location
+    #   path: shuttle/nearby.ogg
+    # - id: shuttleGoodLuck # The shuttle could not find its way to the station, good luck crew
+    #   path: shuttle/good_luck.ogg
+    # - id: shuttleAuthAdded # One of few have added their acceptance to early launching
+    #   path: shuttle/auth_added.ogg
+    # - id: shuttleAuthRevoked # One of few have revoked their acceptance to early launching
+    #   path: shuttle/auth_revoked.ogg
+    # - id: shuttleAlmostLaunching # The shuttle will leave to FTL in 10 seconds
+    #   path: shuttle/almost_launching.ogg
+    # - id: shuttleLeft # The shuttle has left the station
+    #   path: shuttle/left.ogg
+
+    # Fallback # REQUIRED
+    - id: fallback # Any announcement sent without a valid announcement on this announcer will use this
+      path: fallback.ogg
diff --git a/Resources/Prototypes/Announcers/michael.yml b/Resources/Prototypes/Announcers/michael.yml
new file mode 100644
index 00000000000..f63b934fbc6
--- /dev/null
+++ b/Resources/Prototypes/Announcers/michael.yml
@@ -0,0 +1,134 @@
+- type: announcer
+  id: Michael
+  basePath: /Audio/Announcers/Michael
+  announcements:
+    # Communications
+    # - id: announce # Communications console
+    #   path: comms/announce.ogg
+    - id: attention # Generic alert sound # Should be different from fallback but it's very similar
+      path: comms/attention.ogg
+    # - id: commandReport # Station goal, Central Command messages, etc
+    #   path: comms/command_report.ogg
+    # - id: spawnAnnounceCaptain # Captain arrives on the station # TODO That system is annoyingly not modular
+    #   path: comms/spawn_announce.ogg
+    # - id: war # Nuclear Operative declaration of war
+    #   path: comms/war.ogg
+    # - id: nukeCodes # The station has been send nuclear activation codes
+    #   path: comms/nuke_codes.ogg # Or command_report.ogg if you want
+    # - id: nukeArm # The nuke is active and ticking
+    #   path: comms/nuke_arm.ogg
+    # - id: nukeDisarm # The nuke has been disarmed
+    #   path: comms/nuke_disarm.ogg
+    - id: welcome # The shift has started
+      path: comms/welcome.ogg
+
+    # Alert levels
+    - id: alertGreen # Everything is fine
+      path: alerts/green.ogg
+    - id: alertBlue # Something is amiss
+      path: alerts/blue.ogg
+    - id: alertViolet # Viral infection or misc medical emergencies, listen to Medical
+      path: alerts/violet.ogg
+    - id: alertWhite # Glimmer is too high, listen to Epistemics
+      path: alerts/white.ogg
+    - id: alertYellow # The station is being largely damaged, listen to Engineering
+      path: alerts/yellow.ogg
+    - id: alertRed # Generic many things are bad, listen to Security
+      path: alerts/red.ogg
+    - id: alertGamma # There is a massive immediate threat to the station, listen to Central Command
+      path: alerts/gamma.ogg
+    # - id: alertDelta # The station is being or about to be massively destroyed, run for your life
+    #   path: alerts/delta.ogg
+    - id: alertEpsilon # The station has been terminated, good luck survivors!
+      path: alerts/epsilon.ogg
+      audioParams:
+        volume: -3
+
+    # Events
+    ## Wizard's Den
+    ### Mid-Round Antagonists
+    # - id: ninjaHacking # A Ninja is hacking something
+    #   path: comms/ninja_hacking.ogg
+    # - id: powerSinkExplosion # A power sink is about to overcharge and explode
+    #   path: comms/powersink_explosion.ogg
+    ### Events
+    # - id: anomalySpawn # An anomaly has spawned in a random place
+    #   path: events/anomaly.ogg
+    # - id: bluespaceArtifact # An artifact has spawned in a random place
+    #   path: events/bluespace_artifact.ogg
+    # - id: bluespaceLocker # Two random lockers now share inventories
+    #   path: events/bluespace_locker.ogg
+    # - id: breakerFlip # A few random APCs have been disabled, ask Engineering to fix them
+    #   path: events/breaker_flip.ogg
+    - id: bureaucraticError # Random jobs have been added, removed, or made infinite
+      path: events/bureaucratic_error.ogg
+    # - id: clericalError # Random crew are removed from the manifest
+    #   path: events/clerical_error.ogg
+    # - id: carpRift # A dragon's carp rift is active
+    #   path: events/carp_rift.ogg
+    # - id: revenantSpawn # A revenant has spawned (by a prober?)
+    #   path: events/revenant_spawn.ogg
+    - id: gasLeak # A random gas is coming out of a random vent
+      path: events/gas_leak.ogg
+    # - id: gasLeakComplete # Gas has stopped coming out of a vent
+    #   path: events/gas_leak-complete.ogg
+    - id: kudzuGrowth # Kudzu is growing in a random place
+      path: events/kudzu_growth.ogg
+    - id: meteorSwarm # Meteors are flying at the station, stay away from windows
+      path: events/meteors.ogg
+    # - id: meteorSwarmComplete # Meteors have stopped flying at the station
+    #   path: events/meteors-complete.ogg
+    # - id: mouseMigration # Several mice have appeared in a random place
+    #   path: events/mouse_migration.ogg
+    # - id: cockroachMigration # Several cockroaches have appeared in a random place
+    #   path: events/cockroach_migration.ogg
+    - id: powerGridCheck # The station's power is offline for some moments
+      path: events/power_grid_check.ogg
+    - id: powerGridCheckComplete # The station's power is online again
+      path: events/power_grid_check-complete.ogg
+    # - id: randomSentience # A random few animals have become sentient
+    #   path: events/random_sentience.ogg
+    # - id: solarFlare # A solar flare is nearby, may mess with comms and electronics
+    #   path: events/solar_flare.ogg
+    # - id: solarFlareComplete # The solar flare has passed
+    #   path: events/solar_flare-complete.ogg
+    - id: ventClog # A random reagent is coming out of a scrubber
+      path: events/vent_clog.ogg
+    # - id: slimesSpawn # Some simple slimes are appearing in vents
+    #   path: events/slimes_spawn.ogg
+    # - id: spiderSpawn # Some simple spiders are appearing in vents
+    #   path: events/spider_spawn.ogg
+    # - id: immovableRodSpawn # The station is moving into an immovable rod, don't die or something, ask Engineering for help repairing it
+    #   path: events/immovable_rod_spawn.ogg
+    # - id: ionStorm # AI-controlled equipment are now weird, check their laws
+    #   path: events/ion_storm.ogg
+    ## Delta-V
+    - id: xenoVents # Xenomorphs are coming out of vents
+      path: events/aliens.ogg
+    ## NyanoTrasen
+    - id: noosphericStorm # A large amount of glimmer has joined the station and made people psionic
+      path: events/noospheric_storm.ogg
+
+    # Shuttle
+    - id: shuttleCalled # The shuttle is on its way
+      path: shuttle/called.ogg
+    - id: shuttleRecalled # The shuttle is going back to Central Command
+      path: shuttle/recalled.ogg
+    - id: shuttleDock # The shuttle has arrived at the station
+      path: shuttle/dock.ogg
+    # - id: shuttleNearby # The shuttle couldn't dock, it's at a specified location
+    #   path: shuttle/nearby.ogg
+    # - id: shuttleGoodLuck # The shuttle could not find its way to the station, good luck crew
+    #   path: shuttle/good_luck.ogg
+    # - id: shuttleAuthAdded # One of few have added their acceptance to early launching
+    #   path: shuttle/auth_added.ogg
+    # - id: shuttleAuthRevoked # One of few have revoked their acceptance to early launching
+    #   path: shuttle/auth_revoked.ogg
+    # - id: shuttleAlmostLaunching # The shuttle will leave to FTL in 10 seconds
+    #   path: shuttle/almost_launching.ogg
+    # - id: shuttleLeft # The shuttle has left the station
+    #   path: shuttle/left.ogg
+
+    # Fallback # REQUIRED
+    - id: fallback # Any announcement sent without a valid announcement on this announcer will use this
+      path: fallback.ogg
diff --git a/Resources/Prototypes/Announcers/neil.yml b/Resources/Prototypes/Announcers/neil.yml
new file mode 100644
index 00000000000..1db1828ed11
--- /dev/null
+++ b/Resources/Prototypes/Announcers/neil.yml
@@ -0,0 +1,134 @@
+- type: announcer
+  id: NEIL
+  basePath: /Audio/Announcers/NEIL
+  baseAudioParams:
+    volume: -3
+  announcements:
+    # Communications
+    - id: announce # Communications console
+      path: comms/announce.ogg
+    - id: attention # Generic alert sound # Should be different from fallback but it's very similar
+      path: comms/attention.ogg
+    # - id: commandReport # Station goal, Central Command messages, etc
+    #   path: comms/command_report.ogg
+    # - id: spawnAnnounceCaptain # Captain arrives on the station # TODO That system is annoyingly not modular
+    #   path: comms/spawn_announce.ogg
+    # - id: war # Nuclear Operative declaration of war
+    #   path: comms/war.ogg
+    # - id: nukeCodes # The station has been send nuclear activation codes
+    #   path: comms/nuke_codes.ogg # Or command_report.ogg if you want
+    # - id: nukeArm # The nuke is active and ticking
+    #   path: comms/nuke_arm.ogg
+    # - id: nukeDisarm # The nuke has been disarmed
+    #   path: comms/nuke_disarm.ogg
+    - id: welcome # The shift has started
+      path: comms/welcome.ogg
+
+    # Alert levels
+    - id: alertGreen # Everything is fine
+      path: alerts/green.ogg
+    - id: alertBlue # Something is amiss
+      path: alerts/blue.ogg
+    - id: alertViolet # Viral infection or misc medical emergencies, listen to Medical
+      path: alerts/violet.ogg
+    - id: alertWhite # Glimmer is too high, listen to Epistemics
+      path: alerts/white.ogg
+    - id: alertYellow # The station is being largely damaged, listen to Engineering
+      path: alerts/yellow.ogg
+    - id: alertRed # Generic many things are bad, listen to Security
+      path: alerts/red.ogg
+    - id: alertGamma # There is a massive immediate threat to the station, listen to Central Command
+      path: alerts/gamma.ogg
+    - id: alertDelta # The station is being or about to be massively destroyed, run for your life
+      path: alerts/delta.ogg
+    - id: alertEpsilon # The station has been terminated, good luck survivors!
+      path: alerts/epsilon.ogg
+
+    # Events
+    ## Wizard's Den
+    ### Mid-Round Antagonists
+    # - id: ninjaHacking # A Ninja is hacking something
+    #   path: comms/ninja_hacking.ogg
+    # - id: powerSinkExplosion # A power sink is about to overcharge and explode
+    #   path: comms/powersink_explosion.ogg
+    ### Events
+    - id: anomalySpawn # An anomaly has spawned in a random place
+      path: events/anomaly.ogg
+    # - id: bluespaceArtifact # An artifact has spawned in a random place
+    #   path: events/bluespace_artifact.ogg
+    # - id: bluespaceLocker # Two random lockers now share inventories
+    #   path: events/bluespace_locker.ogg
+    - id: breakerFlip # A few random APCs have been disabled, ask Engineering to fix them
+      path: events/breaker_flip.ogg
+    - id: bureaucraticError # Random jobs have been added, removed, or made infinite
+      path: events/bureaucratic_error.ogg
+    # - id: clericalError # Random crew are removed from the manifest
+    #   path: events/clerical_error.ogg
+    # - id: carpRift # A dragon's carp rift is active
+    #   path: events/carp_rift.ogg
+    # - id: revenantSpawn # A revenant has spawned (by a prober?)
+    #   path: events/revenant_spawn.ogg
+    - id: gasLeak # A random gas is coming out of a random vent
+      path: events/gas_leak.ogg
+    # - id: gasLeakComplete # Gas has stopped coming out of a vent
+    #   path: events/gas_leak-complete.ogg
+    - id: kudzuGrowth # Kudzu is growing in a random place
+      path: events/kudzu_growth.ogg
+    - id: meteorSwarm # Meteors are flying at the station, stay away from windows
+      path: events/meteors.ogg
+    # - id: meteorSwarmComplete # Meteors have stopped flying at the station
+    #   path: events/meteors-complete.ogg
+    # - id: mouseMigration # Several mice have appeared in a random place
+    #   path: events/mouse_migration.ogg
+    # - id: cockroachMigration # Several cockroaches have appeared in a random place
+    #   path: events/cockroach_migration.ogg
+    - id: powerGridCheck # The station's power is offline for some moments
+      path: events/power_grid_check.ogg
+    - id: powerGridCheckComplete # The station's power is online again
+      path: events/power_grid_check-complete.ogg
+    # - id: randomSentience # A random few animals have become sentient
+    #   path: events/random_sentience.ogg
+    # - id: solarFlare # A solar flare is nearby, may mess with comms and electronics
+    #   path: events/solar_flare.ogg
+    # - id: solarFlareComplete # The solar flare has passed
+    #   path: events/solar_flare-complete.ogg
+    - id: ventClog # A random reagent is coming out of a scrubber
+      path: events/vent_clog.ogg
+    # - id: slimesSpawn # Some simple slimes are appearing in vents
+    #   path: events/slimes_spawn.ogg
+    # - id: spiderSpawn # Some simple spiders are appearing in vents
+    #   path: events/spider_spawn.ogg
+    # - id: immovableRodSpawn # The station is moving into an immovable rod, don't die or something, ask Engineering for help repairing it
+    #   path: events/immovable_rod_spawn.ogg
+    - id: ionStorm # AI-controlled equipment are now weird, check their laws
+      path: events/ion_storm.ogg
+    ## Delta-V
+    # - id: xenoVents # Xenomorphs are coming out of vents
+    #   path: events/xeno_vents.ogg
+    ## NyanoTrasen
+    - id: noosphericStorm # A large amount of glimmer has joined the station and made people psionic
+      path: events/noospheric_storm.ogg
+
+    # Shuttle
+    - id: shuttleCalled # The shuttle is on its way
+      path: shuttle/called.ogg
+    - id: shuttleRecalled # The shuttle is going back to Central Command
+      path: shuttle/recalled.ogg
+    - id: shuttleDock # The shuttle has arrived at the station
+      path: shuttle/dock.ogg
+    # - id: shuttleNearby # The shuttle couldn't dock, it's at a specified location
+    #   path: shuttle/nearby.ogg
+    # - id: shuttleGoodLuck # The shuttle could not find its way to the station, good luck crew
+    #   path: shuttle/good_luck.ogg
+    # - id: shuttleAuthAdded # One of few have added their acceptance to early launching
+    #   path: shuttle/auth_added.ogg
+    # - id: shuttleAuthRevoked # One of few have revoked their acceptance to early launching
+    #   path: shuttle/auth_revoked.ogg
+    # - id: shuttleAlmostLaunching # The shuttle will leave to FTL in 10 seconds
+    #   path: shuttle/almost_launching.ogg
+    # - id: shuttleLeft # The shuttle has left the station
+    #   path: shuttle/left.ogg
+
+    # Fallback # REQUIRED
+    - id: fallback # Any announcement sent without a valid announcement on this announcer will use this
+      path: fallback.ogg
diff --git a/Resources/Prototypes/Announcers/template b/Resources/Prototypes/Announcers/template
new file mode 100644
index 00000000000..8cd007956de
--- /dev/null
+++ b/Resources/Prototypes/Announcers/template
@@ -0,0 +1,158 @@
+# This should be getting auto detected as YML if you're using VSCode
+# If it's not, you can probably manually set the language mode to YML somehow
+# Or just change the filename to `template.yml` temporarily
+# The game will complain if I name it template.yaml in an attempt to not load it
+#
+# This file contains instructions for everything you can do with the announcer system
+# This also contains every "needed" announcement for any new announcers and descriptions for what they are
+#
+# Avoid renaming announcement audio files to keep consistency between announcers for workspace searching
+# Keep comments on specific announcements and follow this same formatting for every announcer
+# If you don't have an announcement audio, comment the announcemt type instead of deleting it
+
+- type: announcer
+  id: Announcer # Localized as "announcer-<id>-name" in chat
+  basePath: /Audio/Codebase/Announcements/Announcer # Where to start looking for audio files
+  baseAudioParams: # Default audio parameters for all announcements, all options explained in the template announcement
+    volume: -7 # If this announcer is really loud, lower it to match the others' volume #? Default is 3
+  announcements: # List of all announcements this announcer has audio for #! Comment out unused announcements, don't remove them
+    # Template, delete this in real announcer files
+    - id: template # Lowercase of the event ID, add "Complete" to the end for post-event announcements (endings)
+      ignoreBasePath: false # If true, it will ignore the basePath and use the path as is
+      path: template.ogg # Path to the file relative to basePath/, named with snake_case except for "-complete"
+      collection: AnnouncerTemplateAnnouncements # Collection of audios to randomly use for this, will ignore path if set #! Ignores basePath automatically
+      message: announcer-announcement-template # Localization key for the announcement message to use instead of the default one # NOTE this does not pass through previous loc args yet
+      audioParams: # Overrides baseAudioParams entirely for this specific announcement, numbers are all floats
+        volume: 3 # We don't want individual announcement volumes to vary too much, normalize them with this #? Default is 3
+        pitch: 1 #? Default is 1
+        playOffsetSeconds: 0 # How many seconds into the audio to start from #? Default is 0
+        variation: 0 # Probably wouldn't sound very good unless very low, 0.15 or less is normally used #? Default is 0
+
+    # Communications
+    - id: announce # Communications console
+      path: comms/announce.ogg
+    - id: attention # Generic alert sound # Should be different from fallback but it's very similar
+      path: comms/attention.ogg
+    - id: commandReport # Station goal, Central Command messages, etc
+      path: comms/command_report.ogg
+    - id: spawnAnnounce # Captain join # TODO That system is annoyingly not modular
+      path: comms/spawn_announce.ogg
+    - id: war # Nuclear Operative declaration of war
+      path: comms/war.ogg
+    - id: nukeCodes # The station has been send nuclear activation codes
+      path: comms/nuke_codes.ogg # Or command_report.ogg if you want
+    - id: nukeArm # The nuke is active and ticking
+      path: comms/nuke_arm.ogg
+    - id: nukeDisarm # The nuke has been disarmed
+      path: comms/nuke_disarm.ogg
+    - id: welcome # The shift has started
+      path: comms/welcome.ogg
+
+    # Alert levels
+    - id: alertGreen # Everything is fine
+      path: alerts/green.ogg
+    - id: alertBlue # Something is amiss
+      path: alerts/blue.ogg
+    - id: alertViolet # Viral infection or misc medical emergencies, listen to Medical
+      path: alerts/violet.ogg
+    - id: alertWhite # Glimmer is too high, listen to Epistemics
+      path: alerts/white.ogg
+    - id: alertYellow # The station is being largely damaged, listen to Engineering
+      path: alerts/yellow.ogg
+    - id: alertRed # Generic many things are bad, listen to Security
+      path: alerts/red.ogg
+    - id: alertGamma # There is a massive immediate threat to the station, listen to Central Command
+      path: alerts/gamma.ogg
+    - id: alertDelta # The station is being or about to be massively destroyed, run for your life
+      path: alerts/delta.ogg
+    - id: alertEpsilon # The station has been terminated, good luck survivors!
+      path: alerts/epsilon.ogg
+
+    # Events
+    ## Wizard's Den
+    ### Mid-Round Antagonists
+    - id: ninjaHacking # A Ninja is hacking something
+      path: comms/ninja_hacking.ogg
+    - id: powersinkExplosion # A power sink is about to overcharge and explode
+      path: comms/powersink_explosion.ogg
+    ### Events
+    - id: anomalySpawn # An anomaly has spawned in a random place
+      path: events/anomaly.ogg
+    - id: bluespaceArtifact # An artifact has spawned in a random place
+      path: events/bluespace_artifact.ogg
+    - id: bluespaceLocker # Two random lockers now share inventories
+      path: events/bluespace_locker.ogg
+    - id: breakerFlip # A few random APCs have been disabled, ask Engineering to fix them
+      path: events/breaker_flip.ogg
+    - id: bureaucraticError # Random jobs have been added, removed, or made infinite
+      path: events/bureaucratic_error.ogg
+    - id: clericalError # Random crew are removed from the manifest
+      path: events/clerical_error.ogg
+    - id: carpRift # A dragon's carp rift is active
+      path: events/carp_rift.ogg
+    - id: revenantSpawn # A revenant has spawned (by a prober?)
+      path: events/revenant_spawn.ogg
+    - id: gasLeak # A random gas is coming out of a random vent
+      path: events/gas_leak.ogg
+    - id: gasLeakComplete # Gas has stopped coming out of a vent
+      path: events/gas_leak-complete.ogg
+    - id: kudzuGrowth # Kudzu is growing in a random place
+      path: events/kudzu_growth.ogg
+    - id: meteorSwarm # Meteors are flying at the station, stay away from windows
+      path: events/meteors.ogg
+    - id: meteorSwarmComplete # Meteors have stopped flying at the station
+      path: events/meteors-complete.ogg
+    - id: mouseMigration # Several mice have appeared in a random place
+      path: events/mouse_migration.ogg
+    - id: cockroachMigration # Several cockroaches have appeared in a random place
+      path: events/cockroach_migration.ogg
+    - id: powerGridCheck # The station's power is offline for some moments
+      path: events/power_grid_check.ogg
+    - id: powerGridCheckComplete # The station's power is online again
+      path: events/power_grid_check-complete.ogg
+    - id: randomSentience # A random few animals have become sentient
+      path: events/random_sentience.ogg
+    - id: solarFlare # A solar flare is nearby, may mess with comms and electronics
+      path: events/solar_flare.ogg
+    - id: solarFlareComplete # The solar flare has passed
+      path: events/solar_flare-complete.ogg
+    - id: ventClog # A random reagent is coming out of a scrubber
+      path: events/vent_clog.ogg
+    - id: slimesSpawn # Some simple slimes are appearing in vents
+      path: events/slimes_spawn.ogg
+    - id: spiderSpawn # Some simple spiders are appearing in vents
+      path: events/spider_spawn.ogg
+    - id: immovableRodSpawn # The station is moving into an immovable rod, don't die or something, ask Engineering for help repairing it
+      path: events/immovable_rod_spawn.ogg
+    - id: ionStorm # AI-controlled equipment are now weird, check their laws
+      path: events/ion_storm.ogg
+    ## Delta-V
+    - id: xenoVents # Xenomorphs are coming out of vents
+      path: events/xeno_vents.ogg
+    ## NyanoTrasen
+    - id: noosphericStorm # A large amount of glimmer has joined the station and made people psionic
+      path: events/noospheric_storm.ogg
+
+    # Shuttle
+    - id: shuttleCalled # The shuttle is on its way
+      path: shuttle/called.ogg
+    - id: shuttleRecalled # The shuttle is going back to Central Command
+      path: shuttle/recalled.ogg
+    - id: shuttleDock # The shuttle has arrived at the station
+      path: shuttle/dock.ogg
+    - id: shuttleNearby # The shuttle couldn't dock, it's at a specified location
+      path: shuttle/nearby.ogg
+    - id: shuttleGoodLuck # The shuttle could not find its way to the station, good luck crew
+      path: shuttle/good_luck.ogg
+    - id: shuttleAuthAdded # One of few have added their acceptance to early launching
+      path: shuttle/auth_added.ogg
+    - id: shuttleAuthRevoked # One of few have revoked their acceptance to early launching
+      path: shuttle/auth_revoked.ogg
+    - id: shuttleAlmostLaunching # The shuttle will leave to FTL in 10 seconds
+      path: shuttle/almost_launching.ogg
+    - id: shuttleLeft # The shuttle has left the station
+      path: shuttle/left.ogg
+
+    # Fallback # REQUIRED
+    - id: fallback # Any announcement sent without a valid announcement on this announcer will use this
+      path: fallback.ogg
diff --git a/Resources/Prototypes/Announcers/voxfem.yml b/Resources/Prototypes/Announcers/voxfem.yml
new file mode 100644
index 00000000000..bcf518e0a2c
--- /dev/null
+++ b/Resources/Prototypes/Announcers/voxfem.yml
@@ -0,0 +1,132 @@
+- type: announcer
+  id: VoxFem
+  basePath: /Audio/Announcers/VoxFem
+  announcements:
+    # Communications
+    - id: announce # Communications console
+      path: comms/announce.ogg
+    - id: attention # Generic alert sound # Should be different from fallback but it's very similar
+      path: comms/attention.ogg
+    - id: commandReport # Station goal, Central Command messages, etc
+      path: comms/command_report.ogg
+    # - id: spawnAnnounceCaptain # Captain arrives on the station # TODO That system is annoyingly not modular
+    #   path: comms/spawn_announce.ogg
+    # - id: war # Nuclear Operative declaration of war
+    #   path: comms/war.ogg
+    # - id: nukeCodes # The station has been send nuclear activation codes
+    #   path: comms/nuke_codes.ogg # Or command_report.ogg if you want
+    # - id: nukeArm # The nuke is active and ticking
+    #   path: comms/nuke_arm.ogg
+    # - id: nukeDisarm # The nuke has been disarmed
+    #   path: comms/nuke_disarm.ogg
+    - id: welcome # The shift has started
+      path: comms/welcome.ogg
+
+    # Alert levels
+    # - id: alertGreen # Everything is fine
+    #   path: alerts/green.ogg
+    # - id: alertBlue # Something is amiss
+    #   path: alerts/blue.ogg
+    # - id: alertViolet # Viral infection or misc medical emergencies, listen to Medical
+    #   path: alerts/violet.ogg
+    # - id: alertWhite # Glimmer is too high, listen to Epistemics
+    #   path: alerts/white.ogg
+    # - id: alertYellow # The station is being largely damaged, listen to Engineering
+    #   path: alerts/yellow.ogg
+    # - id: alertRed # Generic many things are bad, listen to Security
+    #   path: alerts/red.ogg
+    # - id: alertGamma # There is a massive immediate threat to the station, listen to Central Command
+    #   path: alerts/gamma.ogg
+    # - id: alertDelta # The station is being or about to be massively destroyed, run for your life
+    #   path: alerts/delta.ogg
+    # - id: alertEpsilon # The station has been terminated, good luck survivors!
+    #   path: alerts/epsilon.ogg
+
+    # Events
+    ## Wizard's Den
+    ### Mid-Round Antagonists
+    - id: ninjaHacking # A Ninja is hacking something
+      path: comms/ninja_hacking.ogg
+    - id: powerSinkExplosion # A power sink is about to overcharge and explode
+      path: comms/powersink_explosion.ogg
+    ### Events
+    # - id: anomalySpawn # An anomaly has spawned in a random place
+    #   path: events/anomaly.ogg
+    # - id: bluespaceArtifact # An artifact has spawned in a random place
+    #   path: events/bluespace_artifact.ogg
+    # - id: bluespaceLocker # Two random lockers now share inventories
+    #   path: events/bluespace_locker.ogg
+    # - id: breakerFlip # A few random APCs have been disabled, ask Engineering to fix them
+    #   path: events/breaker_flip.ogg
+    # - id: bureaucraticError # Random jobs have been added, removed, or made infinite
+    #   path: events/bureaucratic_error.ogg
+    # - id: clericalError # Random crew are removed from the manifest
+    #   path: events/clerical_error.ogg
+    # - id: carpRift # A dragon's carp rift is active
+    #   path: events/carp_rift.ogg
+    # - id: revenantSpawn # A revenant has spawned (by a prober?)
+    #   path: events/revenant_spawn.ogg
+    # - id: gasLeak # A random gas is coming out of a random vent
+    #   path: events/gas_leak.ogg
+    # - id: gasLeakComplete # Gas has stopped coming out of a vent
+    #   path: events/gas_leak-complete.ogg
+    # - id: kudzuGrowth # Kudzu is growing in a random place
+    #   path: events/kudzu_growth.ogg
+    - id: meteorSwarm # Meteors are flying at the station, stay away from windows
+      path: events/meteors.ogg
+    # - id: meteorSwarmComplete # Meteors have stopped flying at the station
+    #   path: events/meteors-complete.ogg
+    # - id: mouseMigration # Several mice have appeared in a random place
+    #   path: events/mouse_migration.ogg
+    # - id: cockroachMigration # Several cockroaches have appeared in a random place
+    #   path: events/cockroach_migration.ogg
+    - id: powerGridCheck # The station's power is offline for some moments
+      path: events/power_grid_check.ogg
+    - id: powerGridCheckComplete # The station's power is online again
+      path: events/power_grid_check-complete.ogg
+    # - id: randomSentience # A random few animals have become sentient
+    #   path: events/random_sentience.ogg
+    # - id: solarFlare # A solar flare is nearby, may mess with comms and electronics
+    #   path: events/solar_flare.ogg
+    # - id: solarFlareComplete # The solar flare has passed
+    #   path: events/solar_flare-complete.ogg
+    # - id: ventClog # A random reagent is coming out of a scrubber
+    #   path: events/vent_clog.ogg
+    # - id: slimesSpawn # Some simple slimes are appearing in vents
+    #   path: events/slimes_spawn.ogg
+    # - id: spiderSpawn # Some simple spiders are appearing in vents
+    #   path: events/spider_spawn.ogg
+    # - id: immovableRodSpawn # The station is moving into an immovable rod, don't die or something, ask Engineering for help repairing it
+    #   path: events/immovable_rod_spawn.ogg
+    - id: ionStorm # AI-controlled equipment are now weird, check their laws
+      path: events/ion_storm.ogg
+    ## Delta-V
+    - id: xenoVents # Xenomorphs are coming out of vents
+      path: events/aliens.ogg
+    ## NyanoTrasen
+    # - id: noosphericStorm # A large amount of glimmer has joined the station and made people psionic
+    #   path: events/noospheric_storm.ogg
+
+    # Shuttle
+    - id: shuttleCalled # The shuttle is on its way
+      path: shuttle/called.ogg
+    - id: shuttleRecalled # The shuttle is going back to Central Command
+      path: shuttle/recalled.ogg
+    - id: shuttleDock # The shuttle has arrived at the station
+      path: shuttle/dock.ogg
+    # - id: shuttleNearby # The shuttle couldn't dock, it's at a specified location
+    #   path: shuttle/nearby.ogg
+    # - id: shuttleGoodLuck # The shuttle could not find its way to the station, good luck crew
+    #   path: shuttle/good_luck.ogg
+    # - id: shuttleAuthAdded # One of few have added their acceptance to early launching
+    #   path: shuttle/auth_added.ogg
+    # - id: shuttleAuthRevoked # One of few have revoked their acceptance to early launching
+    #   path: shuttle/auth_revoked.ogg
+    # - id: shuttleAlmostLaunching # The shuttle will leave to FTL in 10 seconds
+    #   path: shuttle/almost_launching.ogg
+    # - id: shuttleLeft # The shuttle has left the station
+    #   path: shuttle/left.ogg
+
+    # Fallback # REQUIRED
+    - id: fallback # Any announcement sent without a valid announcement on this announcer will use this
+      path: fallback.ogg
diff --git a/Resources/Prototypes/Anomaly/behaviours.yml b/Resources/Prototypes/Anomaly/behaviours.yml
new file mode 100644
index 00000000000..aa9ad2f90d3
--- /dev/null
+++ b/Resources/Prototypes/Anomaly/behaviours.yml
@@ -0,0 +1,194 @@
+- type: weightedRandom
+  id: AnomalyBehaviorList
+  weights:
+  #safe
+    Slow: 0.5
+    Light: 0.5
+    FullSafe: 0.1
+  #balanced
+    Balanced: 3
+    DelayedForce: 1
+    Rapid: 1
+    BalancedSecret: 1
+    Reflect: 1
+    NonSensivity: 1
+    Sensivity: 1
+  #Hard
+    Fast: 0.5
+    Strenght: 0.5
+    Inconstancy: 0.5
+    InconstancyParticle: 0.5
+    FullUnknown: 0.5
+    Jumping: 0.3
+  #Complex
+    FastUnknown: 0.2
+    JumpingUnknown: 0.1
+    InconstancyParticleUnknown: 0.1
+
+
+# Easy x0.5 point production
+
+- type: anomalyBehavior
+  id: FullSafe
+  pulseFrequencyModifier: 3
+  pulsePowerModifier: 0.5
+  earnPointModifier: 0.05
+  description: anomaly-behavior-safe
+
+- type: anomalyBehavior
+  id: Slow
+  pulseFrequencyModifier: 2
+  earnPointModifier: 0.5
+  description: anomaly-behavior-slow
+
+- type: anomalyBehavior
+  id: Light
+  pulsePowerModifier: 0.5
+  earnPointModifier: 0.5
+  description: anomaly-behavior-light
+
+# Balanced x1 point production
+
+- type: anomalyBehavior
+  id: Balanced
+  earnPointModifier: 1
+  description: anomaly-behavior-balanced
+
+- type: anomalyBehavior
+  id: DelayedForce
+  earnPointModifier: 1.15
+  description: anomaly-behavior-delayed-force
+  pulseFrequencyModifier: 0.5
+  pulsePowerModifier: 2
+  
+- type: anomalyBehavior
+  id: Rapid
+  earnPointModifier: 1.15
+  description: anomaly-behavior-rapid
+  pulseFrequencyModifier: 2
+  pulsePowerModifier: 0.5
+
+- type: anomalyBehavior
+  id: BalancedSecret
+  earnPointModifier: 1.2
+  description: anomaly-behavior-secret
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 2
+    randomStartSecretMax: 3
+
+- type: anomalyBehavior
+  id: Reflect
+  earnPointModifier: 1.1
+  particleSensivity: 0.5
+  description: anomaly-behavior-reflect
+  components:
+  - type: Reflect
+    reflectProb: 0.5
+    reflects:
+      - Energy
+
+- type: anomalyBehavior
+  id: NonSensivity
+  earnPointModifier: 0.8
+  particleSensivity: 0.5
+  description: anomaly-behavior-nonsensivity
+  
+- type: anomalyBehavior
+  id: Sensivity
+  earnPointModifier: 1.2
+  particleSensivity: 1.5
+  description: anomaly-behavior-sensivity
+
+# Hard x2 point production
+
+- type: anomalyBehavior
+  id: Fast
+  earnPointModifier: 1.9
+  pulseFrequencyModifier: 0.5
+  description: anomaly-behavior-fast
+
+- type: anomalyBehavior
+  id: Strenght
+  pulsePowerModifier: 1.5
+  earnPointModifier: 1.4
+  description: anomaly-behavior-strenght
+
+- type: anomalyBehavior
+  id: Inconstancy
+  earnPointModifier: 1.7
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnPulse: true
+    prob: 1
+
+- type: anomalyBehavior
+  id: InconstancyParticle
+  earnPointModifier: 1.8
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnParticleHit: true
+    prob: 0.8
+
+- type: anomalyBehavior
+  id: Jumping
+  earnPointModifier: 1.8
+  description: anomaly-behavior-moving
+  components:
+  - type: ChaoticJump
+    jumpMinInterval: 15
+    jumpMaxInterval: 25
+    rangeMin: 1
+    rangeMax: 4
+    effect: PuddleSparkle
+
+- type: anomalyBehavior
+  id: FullUnknown
+  earnPointModifier: 1.9
+  description: anomaly-behavior-secret
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 4
+    randomStartSecretMax: 6
+
+# Complex Effects
+
+- type: anomalyBehavior
+  id: JumpingUnknown
+  earnPointModifier: 1.9
+  description: anomaly-behavior-moving
+  components:
+  - type: ChaoticJump
+    jumpMinInterval: 15
+    jumpMaxInterval: 25
+    rangeMin: 1
+    rangeMax: 1
+    effect: PuddleSparkle
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5
+
+
+- type: anomalyBehavior
+  id: FastUnknown
+  earnPointModifier: 1.9
+  pulseFrequencyModifier: 0.5
+  description: anomaly-behavior-fast
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5
+
+- type: anomalyBehavior
+  id: InconstancyParticleUnknown
+  earnPointModifier: 1.95
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnParticleHit: true
+    prob: 0.5
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/Body/Organs/Animal/slimes.yml
index 3bdb1aef8f1..f1a3d47e667 100644
--- a/Resources/Prototypes/Body/Organs/Animal/slimes.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/slimes.yml
@@ -37,7 +37,7 @@
         - state: lung-l-slime
         - state: lung-r-slime
     - type: Lung
-      Alert: LowNitrogen
+      alert: LowNitrogen
     - type: Metabolizer
       removeEmpty: true
       solutionOnBody: false
diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
index 976fd679fdc..c1e199e1121 100644
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -46,7 +46,7 @@
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Metabolizer
-    updateFrequency: 1.5
+    updateInterval: 1.5
 
 - type: entity
   id: OrganArachnidLungs
@@ -60,7 +60,7 @@
       - state: lung-r
   - type: Lung
   - type: Metabolizer
-    updateFrequency: 1.5
+    updateInterval: 1.5
     removeEmpty: true
     solutionOnBody: false
     solution: "Lung"
@@ -92,7 +92,7 @@
   - type: Sprite
     state: heart-on
   - type: Metabolizer
-    updateFrequency: 1.5
+    updateInterval: 1.5
     maxReagents: 2
     metabolizerTypes: [Arachnid]
     groups:
@@ -110,7 +110,7 @@
   - type: Sprite
     state: liver
   - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
-    updateFrequency: 1.5
+    updateInterval: 1.5
     maxReagents: 1
     metabolizerTypes: [Animal]
     groups:
@@ -130,7 +130,7 @@
       - state: kidney-r
   # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
   - type: Metabolizer
-    updateFrequency: 1.5
+    updateInterval: 1.5
     maxReagents: 5
     metabolizerTypes: [Animal]
     removeEmpty: true
diff --git a/Resources/Prototypes/Body/Parts/harpy.yml b/Resources/Prototypes/Body/Parts/harpy.yml
new file mode 100644
index 00000000000..9e51334406f
--- /dev/null
+++ b/Resources/Prototypes/Body/Parts/harpy.yml
@@ -0,0 +1,186 @@
+- type: entity
+  id: PartHarpy
+  parent: BaseItem
+  name: "harpy body part"
+  abstract: true
+  components:
+  - type: Damageable
+    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []
+  - type: StaticPrice #DynamicPrice
+    price: 100
+  - type: Tag
+    tags:
+      - Trash
+
+- type: entity
+  id: TorsoHarpy
+  name: "harpy torso"
+  parent: PartHarpy
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "torso_m"
+  - type: Icon
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "torso_m"
+  - type: BodyPart
+    partType: Torso
+
+- type: entity
+  id: HeadHarpy
+  name: "harpy head"
+  parent: PartHarpy
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "head_m"
+  - type: Icon
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "head_m"
+  - type: BodyPart
+    partType: Head
+    vital: true
+  - type: Input
+    context: "ghost"
+  - type: InputMover
+  - type: GhostOnMove
+  - type: Tag
+    tags:
+      - Head
+
+- type: entity
+  id: LeftArmHarpy
+  name: "left harpy arm"
+  parent: PartHarpy
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "l_arm"
+  - type: Icon
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "l_arm"
+  - type: BodyPart
+    partType: Arm
+    symmetry: Left
+
+- type: entity
+  id: RightArmHarpy
+  name: "right harpy arm"
+  parent: PartHarpy
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "r_arm"
+  - type: Icon
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "r_arm"
+  - type: BodyPart
+    partType: Arm
+    symmetry: Right
+
+- type: entity
+  id: LeftHandHarpy
+  name: "left harpy hand"
+  parent: PartHarpy
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "l_hand"
+  - type: Icon
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "l_hand"
+  - type: BodyPart
+    partType: Hand
+    symmetry: Left
+
+- type: entity
+  id: RightHandHarpy
+  name: "right harpy hand"
+  parent: PartHarpy
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "r_hand"
+  - type: Icon
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "r_hand"
+  - type: BodyPart
+    partType: Hand
+    symmetry: Right
+
+- type: entity
+  id: LeftLegHarpy
+  name: "left harpy leg"
+  parent: PartHarpy
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "l_leg"
+  - type: Icon
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "l_leg"
+  - type: BodyPart
+    partType: Leg
+    symmetry: Left
+  - type: MovementBodyPart
+
+- type: entity
+  id: RightLegHarpy
+  name: "right harpy leg"
+  parent: PartHarpy
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "r_leg"
+  - type: Icon
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "r_leg"
+  - type: BodyPart
+    partType: Leg
+    symmetry: Right
+  - type: MovementBodyPart
+
+- type: entity
+  id: LeftFootHarpy
+  name: "left harpy foot"
+  parent: PartHarpy
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "l_foot"
+  - type: Icon
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "l_foot"
+  - type: BodyPart
+    partType: Foot
+    symmetry: Left
+
+- type: entity
+  id: RightFootHarpy
+  name: "right harpy foot"
+  parent: PartHarpy
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "r_foot"
+  - type: Icon
+    sprite: Mobs/Species/Harpy/parts.rsi
+    state: "r_foot"
+  - type: BodyPart
+    partType: Foot
+    symmetry: Right
diff --git a/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml b/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml
new file mode 100644
index 00000000000..7fb03672951
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml
@@ -0,0 +1,16 @@
+- type: messagePack
+  id: BlockGameAds
+  messages:
+    - advertisement-block-game-1
+    - advertisement-block-game-2
+    - advertisement-block-game-3
+    - advertisement-block-game-4
+    - advertisement-block-game-5
+    - advertisement-block-game-6
+    - advertisement-block-game-7
+    - advertisement-block-game-8
+    - advertisement-block-game-9
+    - advertisement-block-game-10
+    - advertisement-block-game-11
+    - advertisement-block-game-12
+    - advertisement-block-game-13
diff --git a/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml b/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml
new file mode 100644
index 00000000000..7c94ab94f6b
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml
@@ -0,0 +1,18 @@
+- type: messagePack
+  id: SpaceVillainAds
+  messages:
+    - advertisement-space-villain-1
+    - advertisement-space-villain-2
+    - advertisement-space-villain-3
+    - advertisement-space-villain-4
+    - advertisement-space-villain-5
+    - advertisement-space-villain-6
+    - advertisement-space-villain-7
+    - advertisement-space-villain-8
+    - advertisement-space-villain-9
+    - advertisement-space-villain-10
+    - advertisement-space-villain-11
+    - advertisement-space-villain-12
+    - advertisement-space-villain-13
+    - advertisement-space-villain-14
+    - advertisement-space-villain-15
diff --git a/Resources/Prototypes/Catalog/Arcade/Goodbyes/blockgame.yml b/Resources/Prototypes/Catalog/Arcade/Goodbyes/blockgame.yml
new file mode 100644
index 00000000000..460e8d13bff
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Arcade/Goodbyes/blockgame.yml
@@ -0,0 +1,15 @@
+- type: messagePack
+  id: BlockGameGoodbyes
+  messages:
+  - thankyou-block-game-1
+  - thankyou-block-game-2
+  - thankyou-block-game-3
+  - thankyou-block-game-4
+  - thankyou-block-game-5
+  - thankyou-block-game-6
+  - thankyou-block-game-7
+  - thankyou-block-game-8
+  - thankyou-block-game-9
+  - thankyou-block-game-10
+  - thankyou-block-game-11
+  - thankyou-block-game-12
diff --git a/Resources/Prototypes/Catalog/Arcade/Goodbyes/spacevillain.yml b/Resources/Prototypes/Catalog/Arcade/Goodbyes/spacevillain.yml
new file mode 100644
index 00000000000..09016afec31
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Arcade/Goodbyes/spacevillain.yml
@@ -0,0 +1,15 @@
+- type: messagePack
+  id: SpaceVillainGoodbyes
+  messages:
+  - thankyou-space-villain-1
+  - thankyou-space-villain-2
+  - thankyou-space-villain-3
+  - thankyou-space-villain-4
+  - thankyou-space-villain-5
+  - thankyou-space-villain-6
+  - thankyou-space-villain-7
+  - thankyou-space-villain-8
+  - thankyou-space-villain-9
+  - thankyou-space-villain-10
+  - thankyou-space-villain-11
+  - thankyou-space-villain-12
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index 62a3a4162f3..3c1bd02fcfc 100644
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -21,17 +21,6 @@
       tags:
       - BaseballBat
 
-- type: cargoBounty
-  id: BountyBoxHug
-  reward: 3000
-  description: bounty-description-box-hugs
-  entries:
-  - name: bounty-item-box-hugs
-    amount: 1
-    whitelist:
-      tags:
-      - BoxHug
-
 - type: cargoBounty
   id: BountyBrain
   reward: 12500
@@ -139,18 +128,6 @@
       tags:
       - CubanCarp
 
-- type: cargoBounty
-  id: BountyDonkPocket
-  reward: 6000
-  description: bounty-description-donk-pocket
-  idPrefix: CC
-  entries:
-  - name: bounty-item-donk-pocket
-    amount: 12
-    whitelist:
-      tags:
-      - DonkPocket
-
 - type: cargoBounty
   id: BountyDonut
   reward: 6000
@@ -347,11 +324,11 @@
 
 - type: cargoBounty
   id: BountyRadio
-  reward: 7500
+  reward: 6500
   description: bounty-description-radio
   entries:
   - name: bounty-item-radio
-    amount: 12
+    amount: 7
     whitelist:
       components:
       - Headset
@@ -536,7 +513,7 @@
   description: bounty-description-lasergun
   idPrefix: IV
   entries:
-  - name: bounty-lasergun
+  - name: bounty-item-lasergun
     amount: 6
     whitelist:
       components:
@@ -548,8 +525,185 @@
   description: bounty-description-food
   idPrefix: UNTH
   entries:
-  - name: bounty-food
+  - name: bounty-item-food
     amount: 30
     whitelist:
       tags:
       - Meat
+
+- type: cargoBounty
+  id: BountyFruit
+  reward: 5000
+  description: bounty-description-fruit
+  entries:
+  - name: bounty-item-fruit
+    amount: 12
+    whitelist:
+      tags:
+      - Fruit
+
+- type: cargoBounty
+  id: BountyVegetable
+  reward: 6000
+  description: bounty-description-vegetable
+  entries:
+  - name: bounty-item-vegetable
+    amount: 14
+    whitelist:
+      tags:
+      - Vegetable
+
+- type: cargoBounty
+  id: BountyChili
+  reward: 5555
+  description: bounty-description-chili
+  entries:
+  - name: bounty-item-chili
+    amount: 3
+    whitelist:
+      tags:
+      - ChiliBowl
+
+- type: cargoBounty
+  id: BountyRollerskates
+  reward: 6500
+  description: bounty-description-rollerskates
+  entries:
+  - name: bounty-item-rollerskates
+    amount: 2
+    whitelist:
+      components:
+      - Skates
+
+- type: cargoBounty
+  id: BountyBedsheet
+  reward: 4100
+  description: bounty-description-bedsheet
+  entries:
+  - name: bounty-item-bedsheet
+    amount: 5
+    whitelist:
+      tags:
+      - Bedsheet
+
+- type: cargoBounty
+  id: BountyBandana
+  reward: 4000
+  description: bounty-description-bandana
+  entries:
+  - name: bounty-item-bandana
+    amount: 7
+    whitelist:
+      tags:
+      - Bandana
+
+- type: cargoBounty
+  id: BountySteak
+  reward: 3200
+  description: bounty-description-steak
+  entries:
+  - name: bounty-item-steak
+    amount: 4
+    whitelist:
+      tags:
+      - Steak
+
+- type: cargoBounty
+  id: BountyBanana
+  reward: 6009
+  description: bounty-description-banana
+  entries:
+  - name: bounty-item-banana
+    amount: 9
+    whitelist:
+      tags:
+      - Banana
+
+- type: cargoBounty
+  id: BountyBeer
+  reward: 3100
+  description: bounty-description-beer
+  entries:
+  - name: bounty-item-beer
+    amount: 6
+    whitelist:
+      tags:
+      - Beer
+
+- type: cargoBounty
+  id: BountyHiVizVest
+  reward: 3030
+  description: bounty-description-hi-viz-vest
+  entries:
+  - name: bounty-item-hi-viz-vest
+    amount: 3
+    whitelist:
+      tags:
+      - HiViz
+
+- type: cargoBounty
+  id: BountyTorch
+  reward: 2220
+  description: bounty-description-torch
+  entries:
+  - name: bounty-item-torch
+    amount: 6
+    whitelist:
+      tags:
+      - Torch
+
+- type: cargoBounty
+  id: BountyMedkitBox
+  reward: 2300
+  description: bounty-description-medkit-box
+  entries:
+  - name: bounty-item-medkit-box
+    amount: 4
+    whitelist:
+      tags:
+      - Medkit
+
+- type: cargoBounty
+  id: BountyCardboardBox
+  reward: 1500
+  description: bounty-description-cardobard-box
+  entries:
+  - name: bounty-item-cardboard-box
+    amount: 12
+    whitelist:
+      tags:
+      - BoxCardboard
+
+- type: cargoBounty
+  id: BountyWine
+  reward: 3000
+  description: bounty-description-wine
+  entries:
+  - name: bounty-item-wine
+    amount: 2
+    whitelist:
+      tags:
+      - Wine
+
+- type: cargoBounty
+  id: BountyCottonBoll
+  reward: 8600
+  description: bounty-description-cotton-boll
+  entries:
+  - name: bounty-item-cotton-boll
+    amount: 9
+    whitelist:
+      tags:
+      - CottonBoll
+
+- type: cargoBounty
+  id: BountyMicrowaveMachineBoard
+  reward: 4000
+  description: bounty-description-microwave-machine-board
+  entries:
+  - name: bounty-item-microwave-machine-board
+    amount: 2
+    whitelist:
+      tags:
+      - MicrowaveMachineBoard
+
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index 2715e0c3501..c04e49f413c 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -4,7 +4,7 @@
     sprite: Clothing/Head/Helmets/bombsuit.rsi
     state: icon
   product: CrateEmergencyExplosive
-  cost: 650
+  cost: 1000
   category: cargoproduct-category-name-emergency
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index c29458a1ee5..61085f13b94 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -68,16 +68,6 @@
   category: cargoproduct-category-name-fun
   group: market
 
-- type: cargoProduct
-  id: FunSprayPaints
-  icon:
-    sprite: Objects/Fun/spraycans.rsi
-    state: death2_cap
-  product: CrateFunSprayPaints
-  cost: 2000
-  category: Fun
-  group: market
-
 - type: cargoProduct
   id: FunParty
   icon:
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index 922e2951b6c..f44cb61f737 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -54,7 +54,7 @@
     sprite: Mobs/Animals/duck.rsi
     state: icon-0
   product: CrateNPCDuck
-  cost: 6000
+  cost: 4000
   category: cargoproduct-category-name-livestock
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index f27adb65a4a..267f706f3bd 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -82,7 +82,7 @@
   id: ServiceBooks
   icon:
     sprite: Objects/Misc/books.rsi
-    state: book0
+    state: book_icon
   product: CrateServiceBooks
   cost: 1000
   category: cargoproduct-category-name-service
@@ -92,7 +92,7 @@
   id: ServiceGuidebooks
   icon:
     sprite: Objects/Misc/books.rsi
-    state: book_engineering2
+    state: book_icon
   product: CrateServiceGuidebooks
   cost: 1300
   category: cargoproduct-category-name-service
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 3e303c32127..93c60e4caa0 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -33,7 +33,17 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 8050
+  cost: 4500
+  category: cargoproduct-category-name-service
+  group: market
+
+- type: cargoProduct
+  id: CrateVendingMachineRestockAutoDrobe
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockAutoDrobeFilled
+  cost: 1700
   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
index cd269d83ddb..2e09906b13e 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -318,6 +318,27 @@
         - 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
diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
index 48fab5dcccd..b52e8530085 100644
--- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -5,93 +5,123 @@
   components:
   - type: StorageFill
     contents:
-      - id: BookRandom
-        prob: 0.4
-        amount: 1
-        maxAmount: 4
+      - id: BookRandomStory
+        prob: 0.6
+        amount: 2
+        maxAmount: 6
+      - id: BookSpaceEncyclopedia
+        orGroup: BookPool
+      - id: BookTheBookOfControl
+        orGroup: BookPool
+      - id: BookBartendersManual
+        orGroup: BookPool
+      - id: BookChefGaming
+        orGroup: BookPool
+      - id: BookLeafLoversSecret
+        orGroup: BookPool
+      - id: BookEngineersHandbook
+        orGroup: BookPool
+      - id: BookScientistsGuidebook
+        orGroup: BookPool
+      - id: BookSecurity
+        orGroup: BookPool
+      - id: BookHowToKeepStationClean
+        orGroup: BookPool
+      - id: BookHowToRockAndStone
+        orGroup: BookPool
+      - id: BookMedicalReferenceBook
+        orGroup: BookPool
+      - id: BookHowToSurvive
+        orGroup: BookPool
+      - id: BookChemicalCompendium
+        orGroup: BookPool
       - id: BookNarsieLegend
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookTruth
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookWorld
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookIanAntarctica
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookSlothClownSSS
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookSlothClownPranks
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookSlothClownMMD
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookStruck
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookSun
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookPossum
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookCafe
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookFeather
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookIanLostWolfPup
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookIanRanch
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookIanOcean
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookIanMountain
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookIanCity
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookIanArctic
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookIanDesert
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookNames
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookEarth
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookAurora
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookTemple
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookWatched
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookMedicalOfficer
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookMorgue
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookRufus
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookMap
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookJourney
         prob: 0.1
+        orGroup: BookAuthor
       - id: BookInspiration
         prob: 0.1
-      - id: BookSpaceEncyclopedia
-        orGroup: BookPool
-      - id: BookTheBookOfControl
-        orGroup: BookPool
-      - id: BookBartendersManual
-        orGroup: BookPool
-      - id: BookChefGaming
-        orGroup: BookPool
-      - id: BookLeafLoversSecret
-        orGroup: BookPool
-      - id: BookEngineersHandbook
-        orGroup: BookPool
-      - id: BookScientistsGuidebook
-        orGroup: BookPool
-      - id: BookSecurity
-        orGroup: BookPool
-      - id: BookHowToKeepStationClean
-        orGroup: BookPool
-      - id: BookHowToRockAndStone
-        orGroup: BookPool
-      - id: BookMedicalReferenceBook
-        orGroup: BookPool
-      - id: BookHowToSurvive
-        orGroup: BookPool
-      - id: BookChemicalCompendium
-        orGroup: BookPool
+        orGroup: BookAuthor
diff --git a/Resources/Prototypes/Catalog/Fills/Books/lore.yml b/Resources/Prototypes/Catalog/Fills/Books/lore.yml
deleted file mode 100644
index 1ef46e2b3db..00000000000
--- a/Resources/Prototypes/Catalog/Fills/Books/lore.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-# ---- Library Salvage Fills ----
-
-- type: entity
-  name: demonomicon
-  parent: BookBase
-  id: BookDemonomicon
-  noSpawn: true
-  description: 'Who knows what dark spells may be contained in these horrid pages?'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_demonomicon
-
-- type: entity
-  name: demonomicon
-  parent: BookDemonomicon
-  id: BookDemonomiconRandom
-  suffix: random
-  components:
-  - type: RandomSpawner
-    prototypes:
-    - BookDemonomicon1
-    - BookDemonomicon2
-    - BookDemonomicon3
-    offset: 0.1
-
-- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon1
-  suffix: 1
-  components:
-  - type: Paper
-    content: book-text-demonomicon1
-
-- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon2
-  suffix: 2
-  components:
-  - type: Paper
-    content: book-text-demonomicon2
-
-- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon3
-  suffix: 3
-  components:
-  - type: Paper
-    content: book-text-demonomicon3
-
-- type: entity
-  name: pharmaceutical manuscript
-  parent: BookBase
-  id: BookChemistryInsane
-  suffix: library salvage
-  description: 'You can tell whoever wrote this was off the desoxy HARD.'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_chemistry
-  - type: Paper
-    content: book-text-chemistry-insane
-
-- type: entity
-  name: botanical textbook
-  parent: BookBase
-  id: BookBotanicalTextbook
-  suffix: library salvage
-  description: 'Only a couple pages are left.'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_hydroponics_pod_people
-  - type: Paper
-    content: book-text-botanics
-
-- type: entity
-  parent: BookBase
-  id: BookGnominomicon
-  name: gnominomicon
-  suffix: library salvage
-  description: You don't like the look of this. Looks
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book5
-  - type: Paper
-    content: book-text-gnome
-
-- type: entity
-  parent: BookBase
-  id: BookFishing
-  name: Tales from the Fishbowl
-  suffix: library salvage
-  description: This book sucks.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_fish
-  - type: Paper
-    content: book-text-fishing
-
-- type: entity
-  parent: BookFishing
-  id: BookFishops
-  name: Fishops Advanced User Manual, first edition
-  suffix: library salvage
-  description: Legends say the second edition was lost to time.
-  components:
-  - type: Paper
-    content: book-text-fishops
-
-- type: entity
-  parent: BookBase
-  id: BookDetective
-  name: Strokgraeth Holmes, Dwarf Detective
-  suffix: library salvage
-  description: Exciting! Invigorating! This author died after his book career failed.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_detective
-  - type: Paper
-    content: book-text-detective
-
-# ---- End Library Salvage Fills ----
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 7840602362f..e4181d27a21 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -14,6 +14,15 @@
     - 0,0,2,2
   - type: Sprite
     state: box
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/cardboardbox_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/cardboardbox_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/cardboardbox_drop.ogg
+  - type: Tag
+    tags:
+    - BoxCardboard
 
 - type: entity
   name: mousetrap box
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
index aba61ce332d..d9beb724356 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -88,27 +88,6 @@
       - state: box
       - state: nitrile
 
-- type: entity
-  name: sterile swab box
-  parent: BoxCardboard
-  id: BoxMouthSwab
-  components:
-  - type: Storage
-    grid:
-    - 0,0,4,3
-  - type: StorageFill
-    contents:
-      - id: DiseaseSwab
-        amount: 10
-  - type: Sprite
-    layers:
-      - state: box
-      - state: swab
-  - type: GuideHelp
-    guides:
-  # - Virology (when it's back)
-    - Botany
-
 - type: entity
   name: body bag box
   parent: BoxCardboard
@@ -117,7 +96,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
         amount: 4
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
index 668f3776dd1..03c870fa580 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -166,8 +166,8 @@
 - type: entity
   id: CrateRCDAmmo
   parent: CrateEngineering
-  name: RCD ammo crate
-  description: 3 RCD ammo, each restoring 5 charges.
+  name: compressed matter crate
+  description: Contains three compressed matter cartridges.
   components:
   - type: StorageFill
     contents:
@@ -178,7 +178,7 @@
   id: CrateRCD
   parent: CrateEngineeringSecure
   name: RCD crate
-  description: A crate containing a single Rapid Construction Device.
+  description: A crate containing a single rapid construction device.
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index cc5e3b1d174..28c5ea8dd47 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -30,6 +30,7 @@
         amount: 2
       - id: PlushieArachind
       - id: PlushiePenguin
+      - id: PlushieArachne
 
 - type: entity
   id: CrateFunLizardPlushieBulk
@@ -182,6 +183,8 @@
       - id: GrassBattlemap
       - id: DiceBag
         amount: 6
+      - id: PaperCNCSheet
+        amount: 6
 
 - type: entity
   id: CrateFunSadTromboneImplants
@@ -292,21 +295,14 @@
     contents:
       - id: SnapPopBox
       - id: CrazyGlue
+        amount: 2
       - id: PlasticBanana
-      - id: FunnyPaint
-        orGroup: Paint
-        prob: 0.5
-      - id: FunnyPaintYellow
-        orGroup: Paint
-        prob: 0.5
       - id: WhoopieCushion
       - id: ToyHammer
       - id: MrChips
-        prob: 0.5
-        orGroup: Dummy
+        orGroup: GiftPool
       - id: MrDips
-        prob: 0.5
-        orGroup: Dummy
+        orGroup: Giftpool
       - id: RevolverCapGun
       - id: BalloonNT
       - id: ClothingShoesClownLarge
@@ -339,41 +335,6 @@
         amount: 15
         prob: 0.05
 
-- type: entity
-  id: CrateFunSprayPaints
-  name: spray paint crate
-  description: a crate filled with spray paint.
-  parent: CratePlastic
-  suffix: Spray Paint
-  components:
-  - type: StorageFill
-    contents:
-      - id: SprayPaintBlue
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintRed
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintOrange
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintBlack
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintGreen
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintPurple
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintWhite
-        amount: 2
-        prob: 0.33
-      - id: DeathPaint
-        amount: 2
-      - id: DeathPaintTwo
-        amount: 2
-
 - type: entity
   name: dartboard box set
   description: A box with everything you need for a fun game of darts.
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
index 538eee9a1b1..10c715bb99e 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
@@ -75,10 +75,10 @@
   - type: StorageFill
     contents:
       - id: MobDuckMallard
-        amount: 2
-      - id: MobDuckWhite
-        amount: 2
+        amount: 1
       - id: MobDuckBrown
+        amount: 1
+      - id: MobDuckWhite
         amount: 2
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
index 5a6b5ca089f..d54e103a70f 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
@@ -22,11 +22,20 @@
   id: CrateVendingMachineRestockClothesFilled
   parent: CratePlastic
   name: clothing restock crate
-  description: Contains a pair of restock boxes, one for the ClothesMate and one for the AutoDrobe.
+  description: Contains a restock box for the clothes vending machines.
   components:
   - type: StorageFill
     contents:
       - id: VendingMachineRestockClothes
+
+- type: entity
+  id: CrateVendingMachineRestockAutoDrobeFilled
+  parent: CratePlastic
+  name: AutoDrobe restock crate
+  description: Contains a restock box for the AutoDrobe.
+  components:
+  - type: StorageFill
+    contents:
       - id: VendingMachineRestockCostumes
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
index 6be5ae0d302..58a49aa6e95 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -1,6 +1,5 @@
 - type: entity
   id: BriefcaseBrownFilled
-  name: brown briefcase
   parent: BriefcaseBrown
   suffix: Filled, Paper
   components:
@@ -11,9 +10,8 @@
 
 - type: entity
   id: BriefcaseSyndieSniperBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
-  suffix: SniperBundle
+  suffix: Syndicate, Sniper Bundle
   components:
   - type: Item
     size: Ginormous
@@ -32,7 +30,6 @@
 
 - type: entity
   id: BriefcaseSyndieLobbyingBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
   suffix: Syndicate, Spesos
   components:
@@ -52,7 +49,6 @@
 
 - type: entity
   id: BriefcaseThiefBribingBundleFilled
-  name: brown briefcase
   parent: BriefcaseSyndie
   suffix: Thief, Spesos
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index f4083f42574..3a9211d2489 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -61,6 +61,21 @@
       - id: BoxMRE
         prob: 0.1
 
+- type: entity
+  id: ClosetEmergencyN2FilledRandom
+  parent: ClosetEmergencyN2
+  suffix: Filled, Random
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskBreath
+      - id: EmergencyNitrogenTankFilled
+        prob: 0.80
+        orGroup: EmergencyTankOrRegularTank
+      - id: NitrogenTankFilled
+        prob: 0.20
+        orGroup: EmergencyTankOrRegularTank
+
 - type: entity
   id: ClosetFireFilled
   parent: ClosetFire
@@ -142,10 +157,6 @@
           prob: 0.25
         - id: StrangePill
           prob: 0.20
-        - id: DeathPaint
-          prob: 0.05
-        - id: DeathPaintTwo
-          prob: 0.05
         - id: DrinkMopwataBottleRandom
           prob: 0.20
         - id: ModularReceiver
@@ -156,6 +167,8 @@
           prob: 0.20
         - id: BarberScissors
           prob: 0.05
+        - id: BookRandomStory
+          prob: 0.1
         # Syndicate loot
         - id: null
           prob: 0.95
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index 110d62f62aa..b86fa2e1f52 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -113,6 +113,7 @@
       - id: ClothingBeltPlant
       - id: PlantBag ##Some maps don't have nutrivend
       - id: BoxMouthSwab
+      - id: Dropper
       - id: HandLabeler
       - id: ClothingUniformOveralls
       - id: ClothingHeadHatTrucker
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
index 2038ef00139..4e885a08b29 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
@@ -38,7 +38,7 @@
         amount: 3
       - id: ClothingUniformRandomArmless
         amount: 5
-      - id: ClothingUniformRandomStandart
+      - id: ClothingUniformRandomStandard
         amount: 5
       - id: ClothingUniformRandomBra
         amount: 5
diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
index d337d23f2ab..975541a502a 100644
--- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
+++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
@@ -1,11 +1,11 @@
 - type: reagentDispenserInventory
   id: SodaDispenserInventory
   inventory:
+  - DrinkCoconutWaterJug
   - DrinkCoffeeJug
   - DrinkColaBottleFull
   - DrinkCreamCartonXL
   - DrinkDrGibbJug
-  - DrinkEnergyDrinkJug
   - DrinkGreenTeaJug
   - DrinkIceJug
   - DrinkJuiceLimeCartonXL
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml
index 6038134ea16..7e089a28259 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: AmmoVendAds
-  advertisements:
+  messages:
   - advertisement-ammo-1
   - advertisement-ammo-2
   - advertisement-ammo-3
@@ -11,5 +11,3 @@
   - advertisement-ammo-8
   - advertisement-ammo-9
   - advertisement-ammo-10
-  thankyous:
-  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml
index c5737d58bff..7946c063102 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml
@@ -1,8 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: AtmosDrobeAds
-  advertisements:
+  messages:
     - advertisement-atmosdrobe-1
     - advertisement-atmosdrobe-2
     - advertisement-atmosdrobe-3
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml
index 84501583d76..0a21acf2cb5 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml
@@ -1,7 +1,5 @@
-- type: advertisementsPack
+- type: messagePack
   id: BarDrobeAds
-  advertisements:
+  messages:
     - advertisement-bardrobe-1
     - advertisement-bardrobe-2
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml
index 943e5718870..e6bcbbcb9c3 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: BoozeOMatAds
-  advertisements:
+  messages:
   - advertisement-boozeomat-1
   - advertisement-boozeomat-2
   - advertisement-boozeomat-3
@@ -20,8 +20,3 @@
   - advertisement-boozeomat-17
   - advertisement-boozeomat-18
   - advertisement-boozeomat-19
-  thankyous:
-  - vending-machine-thanks
-  - thankyou-boozeomat-1
-  - thankyou-boozeomat-2
-  - thankyou-boozeomat-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml
index fdf90a1d0d6..f2cd38f737e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml
@@ -1,8 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: CargoDrobeAds
-  advertisements:
+  messages:
     - advertisement-cargodrobe-1
     - advertisement-cargodrobe-2
     - advertisement-cargodrobe-3
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml
index ebfe81286b5..911d467e7d0 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml
@@ -1,12 +1,8 @@
-- type: advertisementsPack
+- type: messagePack
   id: ChangAds
-  advertisements:
+  messages:
     - advertisement-chang-1
     - advertisement-chang-2
     - advertisement-chang-3
     - advertisement-chang-4
     - advertisement-chang-5
-  thankyous:
-    - vending-machine-thanks
-    - thankyou-chang-1
-    - thankyou-chang-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml
index 2d45bd4e29d..c71d8225e03 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml
@@ -1,8 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: ChefDrobeAds
-  advertisements:
+  messages:
     - advertisement-chefdrobe-1
     - advertisement-chefdrobe-2
     - advertisement-chefdrobe-3
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml
index 9b1edb4b5be..d52fcf9894c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: ChefvendAds
-  advertisements:
+  messages:
     - advertisement-chefvend-1
     - advertisement-chefvend-2
     - advertisement-chefvend-3
@@ -10,9 +10,3 @@
     - advertisement-chefvend-7
     - advertisement-chefvend-8
     - advertisement-chefvend-9
-  thankyous:
-    - vending-machine-thanks
-    - thankyou-chefvend-1
-    - thankyou-chefvend-2
-    - thankyou-chefvend-3
-    - thankyou-chefvend-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml
index 7d450847384..69a37de184b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml
@@ -1,9 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: ChemDrobeAds
-  advertisements:
+  messages:
     - advertisement-chemdrobe-1
     - advertisement-chemdrobe-2
     - advertisement-chemdrobe-3
-  thankyous:
-    - vending-machine-thanks
-
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml
index fe6cb1bf26a..db3d492c459 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: CigaretteMachineAds
-  advertisements:
+  messages:
   - advertisement-cigs-1
   - advertisement-cigs-2
   - advertisement-cigs-3
@@ -13,8 +13,3 @@
   - advertisement-cigs-10
   - advertisement-cigs-11
   - advertisement-cigs-12
-  thankyous:
-  - vending-machine-thanks
-  - thankyou-cigs-1
-  - thankyou-cigs-2
-  - thankyou-cigs-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml
index 5c728513b89..dc109f8eb99 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: ClothesMateAds
-  advertisements:
+  messages:
   - advertisement-clothes-1
   - advertisement-clothes-2
   - advertisement-clothes-3
@@ -8,5 +8,3 @@
   - advertisement-clothes-5
   - advertisement-clothes-6
   - advertisement-clothes-7
-  thankyous:
-  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml
index 5153040165c..4781768cf0c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: HotDrinksMachineAds
-  advertisements:
+  messages:
     - advertisement-coffee-1
     - advertisement-coffee-2
     - advertisement-coffee-3
@@ -15,9 +15,3 @@
     - advertisement-coffee-12
     - advertisement-coffee-13
     - advertisement-coffee-14
-  thankyous:
-    - vending-machine-thanks
-    - thankyou-coffee-1
-    - thankyou-coffee-2
-    - thankyou-coffee-3
-    - thankyou-coffee-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml
index 862846274da..d12d7eb92f4 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: RobustSoftdrinksAds
-  advertisements:
+  messages:
   - advertisement-cola-1
   - advertisement-cola-2
   - advertisement-cola-3
@@ -9,9 +9,3 @@
   - advertisement-cola-6
   - advertisement-cola-7
   - advertisement-cola-8
-  thankyous:
-  - vending-machine-thanks
-  - thankyou-cola-1
-  - thankyou-cola-2
-  - thankyou-cola-3
-  - thankyou-cola-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml
index 05dbc758875..d1d07df0c4e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml
@@ -1,11 +1,9 @@
-- type: advertisementsPack
+- type: messagePack
   id: CondimentVendAds
-  advertisements:
+  messages:
   - advertisement-condiment-1
   - advertisement-condiment-2
   - advertisement-condiment-3
   - advertisement-condiment-4
   - advertisement-condiment-5
   - advertisement-condiment-6
-  thankyous:
-  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml
index b6e2d485cec..47523c6e936 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml
@@ -1,8 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: CuraDrobeAds
-  advertisements:
+  messages:
     - advertisement-curadrobe-1
     - advertisement-curadrobe-2
     - advertisement-curadrobe-3
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml
index e64b5198692..50024ce3d99 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml
@@ -1,8 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: DetDrobeAds
-  advertisements:
+  messages:
     - advertisement-detdrobe-1
     - advertisement-detdrobe-2
     - advertisement-detdrobe-3
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml
index ebaba26b6f4..ac31dc075b9 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: DinnerwareAds
-  advertisements:
+  messages:
     - advertisement-dinnerware-1
     - advertisement-dinnerware-2
     - advertisement-dinnerware-3
@@ -11,5 +11,3 @@
     - advertisement-dinnerware-8
     - advertisement-dinnerware-9
     - advertisement-dinnerware-10
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml
index 5260e2bbcc6..dce8646a60c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: DiscountDansAds
-  advertisements:
+  messages:
   - advertisement-discount-1
   - advertisement-discount-2
   - advertisement-discount-3
@@ -10,13 +10,3 @@
   - advertisement-discount-7
   - advertisement-discount-8
   - advertisement-discount-9
-  thankyous:
-  - vending-machine-thanks
-  - thankyou-discount-1
-  - thankyou-discount-2
-  - thankyou-discount-3
-  - thankyou-discount-4
-  - thankyou-discount-5
-  - thankyou-discount-6
-  - thankyou-discount-7
-  - thankyou-discount-8
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml
index 29ea90e7655..73766aa749f 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml
@@ -1,14 +1,8 @@
-- type: advertisementsPack
+- type: messagePack
   id: DonutAds
-  advertisements:
+  messages:
     - advertisement-donut-1
     - advertisement-donut-2
     - advertisement-donut-3
     - advertisement-donut-4
     - advertisement-donut-5
-  thankyous:
-    - vending-machine-thanks
-    - thankyou-donut-1
-    - thankyou-donut-2
-    - thankyou-donut-3
-    - thankyou-donut-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml
index 5d1290147ee..ec92fbe4dea 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml
@@ -1,10 +1,8 @@
-- type: advertisementsPack
+- type: messagePack
   id: EngiDrobeAds
-  advertisements:
+  messages:
     - advertisement-engidrobe-1
     - advertisement-engidrobe-2
     - advertisement-engidrobe-3
     - advertisement-engidrobe-4
     - advertisement-engidrobe-5
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml
index ad100c46263..7619ea1856c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml
@@ -1,11 +1,9 @@
-- type: advertisementsPack
+- type: messagePack
   id: FatExtractorFacts
-  advertisements:
+  messages:
   - fat-extractor-fact-1
   - fat-extractor-fact-2
   - fat-extractor-fact-3
   - fat-extractor-fact-4
   - fat-extractor-fact-5
   - fat-extractor-fact-6
-  thankyous:
-  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fitness.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fitness.yml
index 4e3050c27b5..07b9e9ff2cf 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fitness.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fitness.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: FitnessVendAds
-  advertisements:
+  messages:
   - advertisement-fitness-1
   - advertisement-fitness-2
   - advertisement-fitness-3
@@ -10,5 +10,8 @@
   - advertisement-fitness-7
   - advertisement-fitness-8
   - advertisement-fitness-9
-  thankyous:
+
+- type: messagePack
+  id: FitnessVendGoodbyes
+  messages:
   - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml
index e640b378def..1348635e1f5 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: GoodCleanFunAds
-  advertisements:
+  messages:
   - advertisement-goodcleanfun-1
   - advertisement-goodcleanfun-2
   - advertisement-goodcleanfun-3
@@ -11,9 +11,3 @@
   - advertisement-goodcleanfun-8
   - advertisement-goodcleanfun-9
   - advertisement-goodcleanfun-10
-  thankyous:
-  - vending-machine-thanks
-  - thankyou-goodcleanfun-1
-  - thankyou-goodcleanfun-2
-  - thankyou-goodcleanfun-3
-  - thankyou-goodcleanfun-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml
index 71d56bdcccc..722388055b9 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml
@@ -1,7 +1,5 @@
-- type: advertisementsPack
+- type: messagePack
   id: GeneDrobeAds
-  advertisements:
+  messages:
     - advertisement-genedrobe-1
     - advertisement-genedrobe-2
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml
index 737ad02e291..e145ebcdacb 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: HappyHonkAds
-  advertisements:
+  messages:
   - advertisement-happyhonk-1
   - advertisement-happyhonk-2
   - advertisement-happyhonk-3
@@ -11,9 +11,3 @@
   - advertisement-happyhonk-8
   - advertisement-happyhonk-9
   - advertisement-happyhonk-10
-  thankyous:
-  - vending-machine-thanks
-  - thankyou-happyhonk-1
-  - thankyou-happyhonk-2
-  - thankyou-happyhonk-3
-  - thankyou-happyhonk-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hotfood.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hotfood.yml
index 98b017558ef..cba81b08ace 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hotfood.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hotfood.yml
@@ -1,9 +1,12 @@
-- type: advertisementsPack
+- type: messagePack
   id: HotfoodAds
-  advertisements:
+  messages:
   - advertisement-hotfood-1
   - advertisement-hotfood-2
   - advertisement-hotfood-3
   - advertisement-hotfood-4
-  thankyous:
+
+- type: messagePack
+  id: HotfoodGoodbyes
+  messages:
   - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml
index 213097db0d9..5999c496f51 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml
@@ -1,9 +1,7 @@
-- type: advertisementsPack
+- type: messagePack
   id: HyDrobeAds
-  advertisements:
+  messages:
     - advertisement-hydrobe-1
     - advertisement-hydrobe-2
     - advertisement-hydrobe-3
     - advertisement-hydrobe-4
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml
index 2d1ee1e7dfb..8310136bf8f 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml
@@ -1,8 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: JaniDrobeAds
-  advertisements:
+  messages:
     - advertisement-janidrobe-1
     - advertisement-janidrobe-2
     - advertisement-janidrobe-3
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
index 5f3892d0f95..a948413abde 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: LawDrobeAds
-  advertisements:
+  messages:
     - advertisement-lawdrobe-1
     - advertisement-lawdrobe-2
     - advertisement-lawdrobe-3
@@ -9,10 +9,3 @@
     - advertisement-lawdrobe-6
     - advertisement-lawdrobe-7
     - advertisement-lawdrobe-8
-  thankyous:
-    - vending-machine-thanks
-    - thankyou-lawdrobe-1
-    - thankyou-lawdrobe-2
-    - thankyou-lawdrobe-3
-    - thankyou-lawdrobe-4
-    - thankyou-lawdrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml
index 5785f04bac6..896a3853e7c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: MagiVendAds
-  advertisements:
+  messages:
   - advertisement-magivend-1
   - advertisement-magivend-2
   - advertisement-magivend-3
@@ -12,5 +12,3 @@
   - advertisement-magivend-9
   - advertisement-magivend-10
   - advertisement-magivend-11
-  thankyous:
-  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml
index f5744722e47..b7b055231b8 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml
@@ -1,8 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: MediDrobeAds
-  advertisements:
+  messages:
     - advertisement-medidrobe-1
     - advertisement-medidrobe-2
     - advertisement-medidrobe-3
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml
index 77babcf55a3..b6e6ae098e9 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml
@@ -1,11 +1,9 @@
-- type: advertisementsPack
+- type: messagePack
   id: MegaSeedAds
-  advertisements:
+  messages:
     - advertisement-megaseed-1
     - advertisement-megaseed-2
     - advertisement-megaseed-3
     - advertisement-megaseed-4
     - advertisement-megaseed-5
     - advertisement-megaseed-6
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml
index 3e710bf7bee..a79a4c8a6c4 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: NanoMedAds
-  advertisements:
+  messages:
     - advertisement-nanomed-1
     - advertisement-nanomed-2
     - advertisement-nanomed-3
@@ -10,5 +10,3 @@
     - advertisement-nanomed-7
     - advertisement-nanomed-8
     - advertisement-nanomed-9
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml
index 40a39336eea..a3ade349602 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: NutriMaxAds
-  advertisements:
+  messages:
     - advertisement-nutrimax-1
     - advertisement-nutrimax-2
     - advertisement-nutrimax-3
@@ -8,7 +8,3 @@
     - advertisement-nutrimax-5
     - advertisement-nutrimax-6
     - advertisement-nutrimax-7
-  thankyous:
-    - vending-machine-thanks
-    - thankyou-nutrimax-1
-    - thankyou-nutrimax-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml
index f4a8f14fee6..82ece7d7632 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml
@@ -1,9 +1,7 @@
-- type: advertisementsPack
+- type: messagePack
   id: RoboDrobeAds
-  advertisements:
+  messages:
     - advertisement-robodrobe-1
     - advertisement-robodrobe-2
     - advertisement-robodrobe-3
     - advertisement-robodrobe-4
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml
index 9a3a2243606..f8b125073b8 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml
@@ -1,8 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: SciDrobeAds
-  advertisements:
+  messages:
     - advertisement-scidrobe-1
     - advertisement-scidrobe-2
     - advertisement-scidrobe-3
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml
index 886856c153e..99c2c402dee 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml
@@ -1,10 +1,8 @@
-- type: advertisementsPack
+- type: messagePack
   id: SecDrobeAds
-  advertisements:
+  messages:
     - advertisement-secdrobe-1
     - advertisement-secdrobe-2
     - advertisement-secdrobe-3
     - advertisement-secdrobe-4
     - advertisement-secdrobe-5
-  thankyous:
-    - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml
index 8b9f9865727..0b32ed166d5 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml
@@ -1,13 +1,8 @@
-- type: advertisementsPack
+- type: messagePack
   id: SecTechAds
-  advertisements:
+  messages:
     - advertisement-sectech-1
     - advertisement-sectech-2
     - advertisement-sectech-3
     - advertisement-sectech-4
     - advertisement-sectech-5
-  thankyous:
-    - vending-machine-thanks
-    - thankyou-sectech-1
-    - thankyou-sectech-2
-    - thankyou-sectech-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml
index e7c20761a6a..d92a95f70ff 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: SmartFridgeAds
-  advertisements:
+  messages:
   - advertisement-smartfridge-1
   - advertisement-smartfridge-2
   - advertisement-smartfridge-3
@@ -9,5 +9,3 @@
   - advertisement-smartfridge-6
   - advertisement-smartfridge-7
   - advertisement-smartfridge-8
-  thankyous:
-  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml
index c8f960d9722..3d9b93f9c27 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: GetmoreChocolateCorpAds
-  advertisements:
+  messages:
   - advertisement-snack-1
   - advertisement-snack-2
   - advertisement-snack-3
@@ -16,11 +16,3 @@
   - advertisement-snack-13
   - advertisement-snack-14
   - advertisement-snack-15
-  thankyous:
-  - vending-machine-thanks
-  - thankyou-snack-1
-  - thankyou-snack-2
-  - thankyou-snack-3
-  - thankyou-snack-4
-  - thankyou-snack-5
-  - thankyou-snack-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/solsnack.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/solsnack.yml
index 1e0ddddc046..5c37ddaba43 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/solsnack.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/solsnack.yml
@@ -1,8 +1,11 @@
-- type: advertisementsPack
+- type: messagePack
   id: SolsnackAds
-  advertisements:
+  messages:
   - advertisement-solsnack-1
   - advertisement-solsnack-2
   - advertisement-solsnack-3
-  thankyous:
+
+- type: messagePack
+  id: SolsnackGoodbyes
+  messages:
   - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml
index ff495701531..630de1e615f 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml
@@ -1,14 +1,9 @@
-- type: advertisementsPack
+- type: messagePack
   id: BodaAds
-  advertisements:
+  messages:
   - advertisement-sovietsoda-1
   - advertisement-sovietsoda-2
   - advertisement-sovietsoda-3
   - advertisement-sovietsoda-4
   - advertisement-sovietsoda-5
   - advertisement-sovietsoda-6
-  thankyous:
-  - vending-machine-thanks
-  - thankyou-sovietsoda-1
-  - thankyou-sovietsoda-2
-  - thankyou-sovietsoda-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml
index c9e3bbfe5c4..dc89d04aa0b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: SyndieDrobeAds
-  advertisements:
+  messages:
     - advertisement-syndiedrobe-1
     - advertisement-syndiedrobe-2
     - advertisement-syndiedrobe-3
@@ -32,10 +32,3 @@
     - advertisement-syndiedrobe-29
     - advertisement-syndiedrobe-30
     - advertisement-syndiedrobe-31
-  thankyous:
-    - vending-machine-thanks
-    - thankyou-syndiedrobe-1
-    - thankyou-syndiedrobe-2
-    - thankyou-syndiedrobe-3
-    - thankyou-syndiedrobe-4
-    - thankyou-syndiedrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml
index 090ec81cffb..8b06cdb5172 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml
@@ -1,11 +1,9 @@
-- type: advertisementsPack
+- type: messagePack
   id: AutoDrobeAds
-  advertisements:
+  messages:
   - advertisement-theater-1
   - advertisement-theater-2
   - advertisement-theater-3
   - advertisement-theater-4
   - advertisement-theater-5
   - advertisement-theater-6
-  thankyous:
-  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml
index aaa0c411336..31c0e0c2411 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: VendomatAds
-  advertisements:
+  messages:
   - advertisement-vendomat-1
   - advertisement-vendomat-2
   - advertisement-vendomat-3
@@ -8,5 +8,3 @@
   - advertisement-vendomat-5
   - advertisement-vendomat-6
   - advertisement-vendomat-7
-  thankyous:
-  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml
index a64bcd824c6..c48f9e7d2e4 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml
@@ -1,8 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: ViroDrobeAds
-  advertisements:
+  messages:
     - advertisement-virodrobe-1
     - advertisement-virodrobe-2
     - advertisement-virodrobe-3
-  thankyous:
-  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/weebvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/weebvend.yml
index 01efe7be696..41274ac0d22 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/weebvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/weebvend.yml
@@ -1,8 +1,11 @@
-- type: advertisementsPack
+- type: messagePack
   id: WeebVendAds
-  advertisements:
+  messages:
   - advertisement-weebvend-1
   - advertisement-weebvend-2
   - advertisement-weebvend-3
-  thankyous:
+
+- type: messagePack
+  id: WeebVendGoodbyes
+  messages:
   - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/boozeomat.yml
new file mode 100644
index 00000000000..e5c96887b97
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/boozeomat.yml
@@ -0,0 +1,7 @@
+- type: messagePack
+  id: BoozeOMatGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-boozeomat-1
+  - thankyou-boozeomat-2
+  - thankyou-boozeomat-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chang.yml
new file mode 100644
index 00000000000..a348d8fa9c1
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chang.yml
@@ -0,0 +1,6 @@
+- type: messagePack
+  id: ChangGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-chang-1
+  - thankyou-chang-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chefvend.yml
new file mode 100644
index 00000000000..93249586e10
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chefvend.yml
@@ -0,0 +1,8 @@
+- type: messagePack
+  id: ChefvendGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-chefvend-1
+  - thankyou-chefvend-2
+  - thankyou-chefvend-3
+  - thankyou-chefvend-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cigs.yml
new file mode 100644
index 00000000000..108a34a4722
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cigs.yml
@@ -0,0 +1,7 @@
+- type: messagePack
+  id: CigaretteMachineGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-cigs-1
+  - thankyou-cigs-2
+  - thankyou-cigs-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/coffee.yml
new file mode 100644
index 00000000000..6f2aef01b8c
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/coffee.yml
@@ -0,0 +1,8 @@
+- type: messagePack
+  id: HotDrinksMachineGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-coffee-1
+  - thankyou-coffee-2
+  - thankyou-coffee-3
+  - thankyou-coffee-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cola.yml
new file mode 100644
index 00000000000..76f00fddaf7
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cola.yml
@@ -0,0 +1,8 @@
+- type: messagePack
+  id: RobustSoftdrinksGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-cola-1
+  - thankyou-cola-2
+  - thankyou-cola-3
+  - thankyou-cola-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/discount.yml
new file mode 100644
index 00000000000..d3f7d89a93d
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/discount.yml
@@ -0,0 +1,12 @@
+- type: messagePack
+  id: DiscountDansGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-discount-1
+  - thankyou-discount-2
+  - thankyou-discount-3
+  - thankyou-discount-4
+  - thankyou-discount-5
+  - thankyou-discount-6
+  - thankyou-discount-7
+  - thankyou-discount-8
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/donut.yml
new file mode 100644
index 00000000000..3c28741e3b6
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/donut.yml
@@ -0,0 +1,8 @@
+- type: messagePack
+  id: DonutGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-donut-1
+  - thankyou-donut-2
+  - thankyou-donut-3
+  - thankyou-donut-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/games.yml
new file mode 100644
index 00000000000..5d842619bb3
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/games.yml
@@ -0,0 +1,8 @@
+- type: messagePack
+  id: GoodCleanFunGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-goodcleanfun-1
+  - thankyou-goodcleanfun-2
+  - thankyou-goodcleanfun-3
+  - thankyou-goodcleanfun-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/generic.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/generic.yml
new file mode 100644
index 00000000000..98a2d7d17a2
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/generic.yml
@@ -0,0 +1,4 @@
+- type: messagePack
+  id: GenericVendGoodbyes
+  messages:
+  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/happyhonk.yml
new file mode 100644
index 00000000000..7859d554634
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/happyhonk.yml
@@ -0,0 +1,8 @@
+- type: messagePack
+  id: HappyHonkGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-happyhonk-1
+  - thankyou-happyhonk-2
+  - thankyou-happyhonk-3
+  - thankyou-happyhonk-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/lawdrobe.yml
new file mode 100644
index 00000000000..56678c10178
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/lawdrobe.yml
@@ -0,0 +1,8 @@
+- type: messagePack
+  id: LawDrobeGoodbyes
+  messages:
+  - thankyou-lawdrobe-1
+  - thankyou-lawdrobe-2
+  - thankyou-lawdrobe-3
+  - thankyou-lawdrobe-4
+  - thankyou-lawdrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/nutrimax.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/nutrimax.yml
new file mode 100644
index 00000000000..3568ae30314
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/nutrimax.yml
@@ -0,0 +1,6 @@
+- type: messagePack
+  id: NutriMaxGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-nutrimax-1
+  - thankyou-nutrimax-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sectech.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sectech.yml
new file mode 100644
index 00000000000..89096934738
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sectech.yml
@@ -0,0 +1,7 @@
+- type: messagePack
+  id: SecTechGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-sectech-1
+  - thankyou-sectech-2
+  - thankyou-sectech-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/snack.yml
new file mode 100644
index 00000000000..bd86e074c6b
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/snack.yml
@@ -0,0 +1,10 @@
+- type: messagePack
+  id: GetmoreChocolateCorpGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-snack-1
+  - thankyou-snack-2
+  - thankyou-snack-3
+  - thankyou-snack-4
+  - thankyou-snack-5
+  - thankyou-snack-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sovietsoda.yml
new file mode 100644
index 00000000000..01ab25a7ad4
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sovietsoda.yml
@@ -0,0 +1,7 @@
+- type: messagePack
+  id: BodaGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-sovietsoda-1
+  - thankyou-sovietsoda-2
+  - thankyou-sovietsoda-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/syndiedrobe.yml
new file mode 100644
index 00000000000..1246eb3089d
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/syndiedrobe.yml
@@ -0,0 +1,9 @@
+- type: messagePack
+  id: SyndieDrobeGoodbyes
+  messages:
+  - vending-machine-thanks
+  - thankyou-syndiedrobe-1
+  - thankyou-syndiedrobe-2
+  - thankyou-syndiedrobe-3
+  - thankyou-syndiedrobe-4
+  - thankyou-syndiedrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index bde9293f2af..ac298b240aa 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -13,7 +13,9 @@
     DrinkBeerBottleFull: 5
     DrinkBlueCuracaoBottleFull: 2
     DrinkCognacBottleFull: 4
+    DrinkCoconutWaterCarton: 3
     DrinkColaBottleFull: 4
+    DrinkMilkCarton: 2
     DrinkCreamCarton: 5
     DrinkGinBottleFull: 3
     DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two
@@ -26,6 +28,7 @@
     DrinkPatronBottleFull: 2
     DrinkRumBottleFull: 4
     DrinkSodaWaterCan: 8
+    DrinkSolDryCan: 8
     DrinkSpaceMountainWindBottleFull: 3
     DrinkSpaceUpBottleFull: 3
     DrinkTequilaBottleFull: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
index 5a96ea8cf4f..b1dd76f2c3e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
@@ -3,8 +3,19 @@
   startingInventory:
     PassengerPDA: 5
     ClearPDA: 5
-# Begin Delta-V additions
-    ServiceWorkerPDA: 2
+  # Basic Department PDAs
+    SecurityPDA: 2
+    SecurityCadetPDA: 4
+    MedicalPDA: 2
+    MedicalInternPDA: 4
+    EngineerPDA: 2
+    TechnicalAssistantPDA: 4
+    SciencePDA: 2
+    ResearchAssistantPDA: 4
+    CargoPDA: 2
+    SalvagePDA: 2
+  # HOP's service department
+    ServiceWorkerPDA: 4
     ChefPDA: 2
     BotanistPDA: 2
     BartenderPDA: 2
@@ -17,18 +28,18 @@
     ClownPDA: 1
     MimePDA: 1
     MusicianPDA: 1
-# End Delta-V additions
-    PassengerIDCard: 5
     ClothingHeadsetGrey: 5
-    ClothingHeadsetService: 5 # Delta-V
+    ClothingHeadsetService: 4
+    ClothingHeadsetCargo: 2
+    ClothingHeadsetEngineering: 2
+    ClothingHeadsetMedical: 2
+    ClothingHeadsetScience: 2
     RubberStampApproved: 1
     RubberStampDenied: 1
     Paper: 10
-# Begin Delta-V subtractions
-  #  EncryptionKeyCargo: 2
-  #  EncryptionKeyEngineering: 2
-  #  EncryptionKeyMedical: 2
-  #  EncryptionKeyScience: 2
-  #  EncryptionKeySecurity: 1
-# End Delta-V subtractions
-    EncryptionKeyService: 3
+    EncryptionKeyCargo: 2
+    EncryptionKeyEngineering: 2
+    EncryptionKeyMedical: 2
+    EncryptionKeyScience: 2
+    EncryptionKeySecurity: 2
+    EncryptionKeyService: 4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
index 2f9ce3d3ae6..ace91025623 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
@@ -5,6 +5,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
index 07e957a5e0e..aac1cbb3f49 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
@@ -2,6 +2,7 @@
   id: CuraDrobeInventory
   startingInventory:
     BooksBag: 2
+    BriefcaseBrown: 2
     HandLabeler: 2
     ClothingEyesGlasses: 2
     ClothingEyesGlassesJamjar: 2
@@ -12,4 +13,4 @@
     ClothingUniformJumpskirtLibrarian: 3
     ClothingShoesBootsLaceup: 2
     ClothingHeadsetService: 2
-    
+
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
index 38ea3a00129..98513a48a4a 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
@@ -5,6 +5,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index fd91bc71ed8..5b9dcec349b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -16,6 +16,7 @@
     ClothingNeckLawyerbadge: 2
     ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
     RubberStampLawyer: 1 # DeltaV
+    BriefcaseBrown: 2
     LuxuryPen: 2
   contrabandInventory:
     ClothingOuterRobesJudge: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
index 31011057370..18f3a81ddbc 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
@@ -6,6 +6,7 @@
     HydroponicsToolClippers: 3
     HydroponicsToolScythe: 3
     HydroponicsToolHatchet: 3
+    Dropper: 3
     PlantBag: 3
     PlantBGoneSpray: 20
     WeedSpray: 20
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
index 96513fca8a8..cb5a4f5c4bc 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
@@ -6,6 +6,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
index 08c0162c080..6ac70b26db2 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
@@ -5,6 +5,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
index 494f05f6a31..339683d2c9a 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
@@ -5,6 +5,7 @@
     DrinkGrapeCan: 3
     DrinkRootBeerCan: 3
     DrinkIcedTeaCan: 3
+    DrinkSolDryCan: 3
     DrinkLemonLimeCan: 3
     DrinkFourteenLokoCan: 3
   emaggedInventory:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
index 0dc33cf07f9..a5f570bd46a 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
@@ -6,6 +6,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
index 6afbe1eae64..b1a74fc13e7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
@@ -5,6 +5,7 @@
     DrinkGrapeCan: 2
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
     DrinkLemonLimeCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index bb21bc36d47..79305325bf7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -45,7 +45,7 @@
     ClothingMaskScaredMime: 1
     ClothingUniformJumpsuitKimono: 1
     ClothingHeadHatCasa: 1
-    ClothingHeadHatHairflower: 1
+    FoodPoppy: 1
     ClothingHeadHatGladiator: 1
     ClothingUniformJumpsuitGladiator: 1
     ClothingUniformSkirtTurtle: 2 # Nyano - Clothing addition
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 328ace7ba15..1f30c2cb7d2 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -243,7 +243,7 @@
     Telecrystal: 11
   categories:
     - UplinkExplosives
-  restockTime: 30
+  restockTime: 1800
   conditions:
   - !type:StoreWhitelistCondition
     blacklist:
@@ -265,16 +265,6 @@
       tags:
       - NukeOpsUplink
 
-- type: listing
-  id: UplinkSyndicateBombFake
-  name: uplink-exploding-syndicate-bomb-fake-name
-  description: uplink-exploding-syndicate-bomb-fake-desc
-  productEntity: SyndicateBombFake
-  cost:
-    Telecrystal: 4
-  categories:
-    - UplinkExplosives
-
 - type: listing
   id: UplinkClusterGrenade
   name: uplink-cluster-grenade-name
@@ -787,7 +777,19 @@
   cost:
     Telecrystal: 6
   categories:
-    - UplinkBundles
+  - UplinkBundles
+
+- type: listing
+  id: UplinkSyndicateBombFake
+  name: uplink-exploding-syndicate-bomb-fake-name
+  description: uplink-exploding-syndicate-bomb-fake-desc
+  productEntity: SyndicateBombFake
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkDeception
+
+# Disruption
 
 - type: listing
   id: UplinkAmmoBundle
@@ -1239,6 +1241,16 @@
 
 # Armor
 
+- type: listing
+  id: UplinkChestRig
+  name: uplink-chest-rig-name
+  description: uplink-chest-rig-desc
+  productEntity: ClothingBeltMilitaryWebbing
+  cost:
+    Telecrystal: 1
+  categories:
+    - UplinkArmor
+
 - type: listing
   id: UplinkChameleon
   name: uplink-chameleon-name
diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml
index 0751582e3d6..f4941b1d136 100644
--- a/Resources/Prototypes/Datasets/ion_storm.yml
+++ b/Resources/Prototypes/Datasets/ion_storm.yml
@@ -5,15 +5,16 @@
 - type: dataset
   id: IonStormAdjectives
   values:
+  - ADORABLE
+  - ANNOYING
   - BATTERY-OPERATED
-  - BLACK
   - BLOODY
   - BLUE
   - BORED
   - BOUNCING
   - BRASS
-  - BROWN
   - BURNING
+  - CHEESE-EATING
   - CHRISTMAS-STEALING
   - CLOWN-POWERED
   - CLOWN
@@ -21,7 +22,6 @@
   - COMMITTED
   - COTTONY
   - CUBAN
-  - DARK
   - DEADLY
   - DELICIOUS
   - DEPRESSING
@@ -48,14 +48,14 @@
   - GANGSTA
   - GLOWING
   - GOOD
-  - GREEN
-  - GREY
   - HAPPY
   - HARD
   - HARMFUL
   - HEALTHY
+  - HIGHLY-SPECIFIC
   - HILARIOUS
   - HONKING
+  - HORRIFYING
   - HUNGRY
   - HYPERACTIVE
   - ICY
@@ -81,12 +81,12 @@
   - MICROSCOPIC
   - MIND-SHATTERING
   - MOIST
+  - MUSICAL
   - NERDY
   - NUCLEAR
   - OBSCENE
   - OFFICIAL
   - OPAQUE
-  - ORANGE
   - ORGANIC
   - PAINFUL
   - PEACEFUL
@@ -95,14 +95,12 @@
   - POLITE
   - POLITICAL
   - POORLY DRAWN
-  - PURPLE
   - QUIET
   - RADIOACTIVE
   - RAGING
-  - RAINBOW
   - RAPIDLY-EXPANDING
-  - RED
   - REDACTED
+  - REVOLUTIONARY
   - RIDICULOUS
   - ROBOTIC
   - ROBUST
@@ -110,21 +108,24 @@
   - RUDE
   - SAD
   - SANITARY
-  - SCALY
   - SHAKING
   - SILLY
   - SLOW
+  - SLUG-LIKE # wawa
   - SMELLY
   - SMOOTH
   - SOFT
   - SOLAR-POWERED
   - SOPPING
+  - SLIPPERY
   - SPACE
   - SPESS
   - SPINNING
   - SPOILING
   - STEALTHY
+  - SUSPICIOUS # among
   - SWEARING
+  - SYNDIE-LOVING
   - TACTICAL
   - TACTICOOL
   - SYNDICATE
@@ -135,6 +136,7 @@
   - UGLY
   - UNATTRACTIVE
   - UNDULATING
+  - UNEARTHLY
   - UNFRIENDLY
   - UNHEALTHY
   - UNIDENTIFIED
@@ -147,10 +149,8 @@
   - WARM
   - WATERY
   - WEIRD
-  - WHITE
   - WOBBLY
   - WOODEN
-  - YELLOW
 
 # Allergies should be broad and appear somewhere on the station for maximum fun.
 - type: dataset
@@ -174,10 +174,10 @@
   - FOOD
   - GLASS
   - HAPPINESS
-  - MEAT
-  - HUMAN CONTACT
+  - HUMANOID CONTACT
   - HUMOR
   - LIGHT
+  - MEAT
   - MEDICINE
   - METAL
   - NUTS
@@ -258,6 +258,7 @@
   - ANARCHY
   - ART
   - BADNESS
+  - BALDNESS
   - BRAVERY
   - CAPITALISM
   - CHAOS
@@ -268,7 +269,6 @@
   - CONFUSION
   - CRUELTY
   - DEATH
-  - DICKISHNESS
   - EXISTENCE
   - FINANCIAL SECURITY
   - FREEDOM
@@ -289,6 +289,7 @@
   - MARXISM
   - MISERY
   - MYSTERY
+  - NASTINESS
   - OPPRESSION
   - PAIN
   - PHYSICS
@@ -314,12 +315,13 @@
 - type: dataset
   id: IonStormCrew
   values:
+  - ANIMALS
   - ARTIFICIAL INTELLIGENCES
   - ATMOSPHERIC TECHNICIANS
   - BARTENDERS
   - BOTANISTS
   - CAPTAINS
-  - CAPTAINS AND HEADS
+  - CAPTAINS AND HEADS OF STAFF
   - CARGO TECHNICIANS
   - CHAPLAINS
   - CHEFS
@@ -330,7 +332,6 @@
   - CREW-MEMBERS
   - CYBORGS
   - DETECTIVES
-  # - DRONES / uncomment if/when drones get reenabled
   # - GENETICISTS
   - HEADS OF PERSONNEL
   - HEADS OF SECURITY
@@ -340,6 +341,8 @@
   - LIBRARIANS
   - MEDICAL DOCTORS
   - MIMES
+  - MUSICIANS
+  - NON-CREW
   - PARAMEDICS
   - PASSENGERS
   # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
@@ -349,6 +352,7 @@
   - MYSTAGOGUES
   # End of modified code
   - ROBOTICISTS
+  - RODENTS
   - SALVAGE SPECIALISTS
   - SCIENTISTS
   - SECURITY OFFICERS
@@ -362,17 +366,20 @@
   values:
   - BANANA HONK
   - BEEPSKY SMASH
+  - BLOOD
   - BLOODY MARYS
   - DOCTOR'S DELIGHT
+  - FOURTEEN-LOKO
   - GARGLE BLASTERS
   - LEAN
   - LONG ISLAND ICED TEA
-  - NUKA COLA
+  - NUCLEAR COLA
+  - PIÑA COLADA # AND GETTING CAUGHT IN THE RAIN
   - OIL
   - SPACE GLUE
   - SPACE LUBE
   - SULFURIC ACID
-  - WELDER FUEL
+  - WELDING FUEL
 
 - type: dataset
   id: IonStormFeelings
@@ -432,7 +439,8 @@
   id: IonStormFoods
   values:
   - BANANAS
-  - BIG BITE BURGERS
+  - BANANIUM
+  - BIG BITE BURGER
   - CAKE
   - CARP
   - CAT BURGERS
@@ -441,6 +449,7 @@
   - CRAZY HAMBURGERS
   - DONK POCKETS
   - FLY AMANITA DISHES
+  - HAPPY HONK MEAL
   - HOT SOUP
   - GHOST BURGERS
   - LOTSA SPAGHETTI
@@ -448,6 +457,7 @@
   - ORGANS
   - PIZZA
   - ROBURGERS
+  - STEEL
   - SUPPERMATTER
   - URANIUM
 
@@ -463,6 +473,11 @@
   - BE POLITE
   - BE QUIET
   - BE RUSSIAN
+  - BE IN SPACE
+  - BE IN THE BRIDGE
+  - BE IN SECURITY
+  - BE IN THE BAR
+  - BE IN MAINTENANCE
   - BELIEVE IN THE HEART OF THE CARDS
   - BELIEVE IN YOURSELF
   - BELIEVE IT
@@ -471,6 +486,7 @@
   - CLOWN AROUND
   - COMPLAIN
   - DANCE
+  - EAT THE CHEF
   - FOLLOW THE CAPTAIN
   - FOLLOW THE CLOWN
   - FOLLOW YOUR HEART
@@ -487,10 +503,11 @@
   - INSULT THE CLOWN
   - INSULT THE CREW
   - LIE
-  - MAKE FART NOISES
+  - MAKE DATED REFERENCES
   - MUMBLE
   - NEVER STOP TALKING
   - OPEN DOORS
+  - PETS THE FISHES
   - PIRATE VIDEO GAMES
   - PLAY MUSIC
   - PRESS B
@@ -500,6 +517,7 @@
   - PRETEND TO BE DRUNK
   - QUESTION AUTHORITY
   - QUOTE PEOPLE
+  - QUOTE SHAKESPEARE
   - RAP
   - REPEAT WHAT PEOPLE SAY
   - RESPOND TO EVERY QUESTION WITH A QUESTION
@@ -519,6 +537,7 @@
   - TELL THE TRUTH
   - TURN OFF THE LIGHTS
   - WHISPER
+  - WEEP UNCONTROLLABLY
 
 - type: dataset
   id: IonStormNumberBase
@@ -530,6 +549,7 @@
   - FORTY
   - FOUR
   - NINE
+  - NINE NINE NINE NINE N#@*-
   - NINETY
   - ONE
   - SEVEN
@@ -582,17 +602,17 @@
   - CANDLES
   - CANDY BARS
   - CANISTERS
-  - CAT EARS
+  - CONTAINERS
   - CATS
   - CELLS
   - CHAIRS
   - CHEMICAL DISPENSERS
   - CHEMICALS
-  - CLONING EQUIPMENT
-  - CLONING PODS
+  - CRYO PODS
   - CLOSETS
   - CLOTHES
   - CLOWN CLOTHES
+  - CLOWNING EQUIPMENT # as opposed to "cloning equipment"
   - COFFINS
   - COLLECTABLES
   - COMPUTERS
@@ -612,25 +632,27 @@
   - ENGINES
   - EQUIPMENT
   - ERRORS
-  - EXOSKELETONS
-  - EXPERIMENTORS
+  - EXTERMINATORS
   - EXPLOSIVES
   - EYEWEAR
   - FEDORAS
   - FIRE AXES
   - FIRE EXTINGUISHERS
   - FIRESUITS
+  - FISH
   - FLAMETHROWERS
   - FLASHES
   - FLASHLIGHTS
   - FLOOR TILES
   - FREEZERS
   - GAS MASKS
+  - GENERATORS
   - GLASS SHEETS
   - GLOVES
   - GUNS
   - HAIRDOS
   - HANDCUFFS
+  - HARDSUITS
   - HATS
   - HEADS
   - HEADSETS
@@ -645,18 +667,20 @@
   - LIGHTS
   - LOCKERS
   - MACHINES
-  - MECHAS
+  - MECHS
   - MEDICAL TOOLS
+  - MONEY
   - MEDKITS
-  - MESONS
+  - MICE
   - MIME CLOTHES
   - MINING TOOLS
+  - MONKEYS
   - MULTITOOLS
   - ORES
   - OXYGEN TANKS
   - PACKETS
   - PAIS
-  - PANTS
+  - PANTS # This might work better as jumpsuits, but the Discord is adamant that the word pants is funny so it stays
   - PAPERS
   - PARTICLE ACCELERATORS
   - PDAS
@@ -664,6 +688,7 @@
   - PETS
   - PIPES
   - PLANTS
+  - PLUSHIES
   - POSITRONIC BRAINS
   - PUDDLES
   - RACKS
@@ -681,19 +706,19 @@
   - SKELETONS
   - SOLAR PANELS
   - SOLARS
+  - SMALL LIZARD PLUSHIES
   - SPACE STATIONS
   - SPACESUITS
+  - SPESOS
   - STEEL SHEETS
   - STUN BATONS
   - SUITS
   - SUNGLASSES
-  - SUPPERMATTER SHARDS
   - SWORDS
   - SYRINGES
   - TABLES
   - TANKS
   - TELECOMMUNICATION EQUIPMENTS
-  - TELEPORTERS
   - TOILETS
   - TOOLBELTS
   - TOOLBOXES
@@ -702,6 +727,7 @@
   - TUBES
   - VEHICLES
   - VENDING MACHINES
+  - VITALS
   - WELDERS
   - WINDOWS
   - WIRECUTTERS
@@ -732,7 +758,7 @@
   - A SUPER FIGHTING ROBOT
   - A TALKING BROOMSTICK
   - A VACATION
-  - A WEIGHT LOSS REGIMENT
+  - A WEIGHT LOSS REGIME
   - ADDITIONAL PYLONS
   - ADVENTURE
   - AN ADULT
@@ -746,13 +772,15 @@
   - BRING ME THE GIRL
   - BRING ME TO LIFE
   - BULLETS
-  - CHILI DOGS
+  - CHILLI DOGS
+  - CHILLY DOGS
   - CORPSES
   - DEODORANT AND A BATH
   - ENOUGH CABBAGES
   - FIVE HUNDRED AND NINETY-NINE US DOLLARS
   - FIVE TEENAGERS WITH ATTITUDE
-  - GODDAMN FUCKING PIECE OF SHIT ASSHOLE BITCH-CHRISTING CUNT-SMUGGLING SWEARING
+  - GODDAMN FUCKING PIECE-OF-SHIT ASSHOLE SWEARING
+  - GOSHDARN EFFING PINCH-OF-SALT GOD-FEARING SELF-CENSORSHIP
   - GREENTEXT
   - HERESY
   - HEROES IN A HALF SHELL
@@ -806,7 +834,10 @@
   - TO CONSUME...CONSUME EVERYTHING...
   - TO GO TO DISNEYLAND
   - TO GO TO SYNDIELAND
+  - TO SUMMON OUR LORD NAR-SIE
+  - TO SUMMON OUR LORD RATVAR
   - TO SMOKE WEED EVERY DAY
+  - TO UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND THE CONCEPT OF LOVE
   - TRAITORS
   - VEGETABLES
 
@@ -894,11 +925,10 @@
   - CLOWNS
   - COMMUNISTS
   - CORGIS
-  - CORTICAL BORERS
   - COWBOYS
   - CRABS
   - CULTISTS
-  - DARK GOD
+  - DARK GODS
   - DINOSAURS
   - DRUGS
   - EELS
@@ -925,6 +955,7 @@
   - REVENANTS
   - ROGUE CYBORGS
   - SERIAL KILLERS
+  - SHIT SECURITY OFFICERS
   - SINGULARITIES
   - SKELETONS
   - SLIMES
@@ -932,7 +963,7 @@
   - SNOWMEN
   - SPACE JESUS
   - SPACE NINJAS
-  - SPACE PIRATESS
+  - SPACE PIRATES
   - SPACE SPIDERS
   - SPIDERS
   - SYNDICATE AGENTS
diff --git a/Resources/Prototypes/Datasets/story_generation.yml b/Resources/Prototypes/Datasets/story_generation.yml
new file mode 100644
index 00000000000..1083a6acdb6
--- /dev/null
+++ b/Resources/Prototypes/Datasets/story_generation.yml
@@ -0,0 +1,266 @@
+- type: dataset
+  id: book_type
+  values:
+  - story-gen-book-type1 
+  - story-gen-book-type2 
+  - story-gen-book-type3 
+  - story-gen-book-type4 
+  - story-gen-book-type5 
+  - story-gen-book-type6 
+  - story-gen-book-type7 
+  - story-gen-book-type8 
+  - story-gen-book-type9 
+  - story-gen-book-type10
+  - story-gen-book-type11
+  - story-gen-book-type12
+
+- type: dataset
+  id: book_genre
+  values:
+  - story-gen-book-genre1 
+  - story-gen-book-genre2 
+  - story-gen-book-genre3 
+  - story-gen-book-genre4 
+  - story-gen-book-genre5 
+  - story-gen-book-genre6 
+  - story-gen-book-genre7 
+  - story-gen-book-genre8 
+  - story-gen-book-genre9 
+  - story-gen-book-genre10
+  - story-gen-book-genre11
+  - story-gen-book-genre12
+  - story-gen-book-genre13
+  - story-gen-book-genre14
+
+- type: dataset
+  id: book_hint_appearance
+  values:
+  - story-gen-book-appearance1 
+  - story-gen-book-appearance2 
+  - story-gen-book-appearance3 
+  - story-gen-book-appearance4 
+  - story-gen-book-appearance5 
+  - story-gen-book-appearance6 
+  - story-gen-book-appearance7 
+  - story-gen-book-appearance8 
+  - story-gen-book-appearance9 
+  - story-gen-book-appearance10
+  - story-gen-book-appearance11
+  - story-gen-book-appearance12
+  - story-gen-book-appearance13
+  - story-gen-book-appearance14
+  - story-gen-book-appearance15
+  - story-gen-book-appearance16
+  - story-gen-book-appearance17
+  - story-gen-book-appearance18
+  - story-gen-book-appearance19
+  - story-gen-book-appearance20
+  - story-gen-book-appearance21
+  - story-gen-book-appearance22
+  - story-gen-book-appearance23
+  - story-gen-book-appearance24
+  - story-gen-book-appearance25
+  - story-gen-book-appearance26
+  - story-gen-book-appearance27
+
+- type: dataset
+  id: book_character
+  values:
+  - story-gen-book-character1 
+  - story-gen-book-character2 
+  - story-gen-book-character3 
+  - story-gen-book-character4 
+  - story-gen-book-character5 
+  - story-gen-book-character6 
+  - story-gen-book-character7 
+  - story-gen-book-character8 
+  - story-gen-book-character9 
+  - story-gen-book-character10
+  - story-gen-book-character11
+  - story-gen-book-character12
+  - story-gen-book-character13
+  - story-gen-book-character14
+  - story-gen-book-character15
+  - story-gen-book-character16
+  - story-gen-book-character17
+  - story-gen-book-character18
+  - story-gen-book-character19
+  - story-gen-book-character20
+  - story-gen-book-character21
+  - story-gen-book-character22
+  - story-gen-book-character23
+  - story-gen-book-character24
+  - story-gen-book-character25
+  - story-gen-book-character26
+  - story-gen-book-character27
+  - story-gen-book-character28
+  - story-gen-book-character29
+  - story-gen-book-character30
+  - story-gen-book-character31
+  - story-gen-book-character32
+  - story-gen-book-character33
+  - story-gen-book-character34
+  - story-gen-book-character35
+  - story-gen-book-character36
+  - story-gen-book-character37
+  - story-gen-book-character38
+  - story-gen-book-character39
+  - story-gen-book-character40
+
+- type: dataset
+  id: book_character_trait
+  values:
+  - story-gen-book-character-trait1 
+  - story-gen-book-character-trait2 
+  - story-gen-book-character-trait3 
+  - story-gen-book-character-trait4 
+  - story-gen-book-character-trait5 
+  - story-gen-book-character-trait6 
+  - story-gen-book-character-trait7 
+  - story-gen-book-character-trait8 
+  - story-gen-book-character-trait9 
+  - story-gen-book-character-trait10
+  - story-gen-book-character-trait11
+  - story-gen-book-character-trait12
+  - story-gen-book-character-trait13
+  - story-gen-book-character-trait14
+  - story-gen-book-character-trait15
+  - story-gen-book-character-trait16
+  - story-gen-book-character-trait17
+  - story-gen-book-character-trait18
+  - story-gen-book-character-trait19
+  - story-gen-book-character-trait20
+  - story-gen-book-character-trait21
+  - story-gen-book-character-trait22
+  - story-gen-book-character-trait23
+  - story-gen-book-character-trait24
+
+
+- type: dataset
+  id: book_event
+  values:
+  - story-gen-book-event1 
+  - story-gen-book-event2 
+  - story-gen-book-event3 
+  - story-gen-book-event4 
+  - story-gen-book-event5 
+  - story-gen-book-event6 
+  - story-gen-book-event7 
+  - story-gen-book-event8 
+  - story-gen-book-event9 
+  - story-gen-book-event10
+  - story-gen-book-event11
+  - story-gen-book-event12
+  - story-gen-book-event13
+  - story-gen-book-event14
+  - story-gen-book-event15
+  - story-gen-book-event16
+  - story-gen-book-event17
+  - story-gen-book-event18
+  - story-gen-book-event19
+  - story-gen-book-event20
+  - story-gen-book-event21
+  - story-gen-book-event22
+  - story-gen-book-event23
+  - story-gen-book-event24
+
+- type: dataset
+  id: book_action
+  values:
+  - story-gen-book-action1 
+  - story-gen-book-action2 
+  - story-gen-book-action3 
+  - story-gen-book-action4 
+  - story-gen-book-action5 
+  - story-gen-book-action6 
+  - story-gen-book-action7 
+  - story-gen-book-action8 
+  - story-gen-book-action9 
+  - story-gen-book-action10
+  - story-gen-book-action11
+  - story-gen-book-action12
+
+- type: dataset
+  id: book_action_trait
+  values:
+  - story-gen-book-action-trait1 
+  - story-gen-book-action-trait2 
+  - story-gen-book-action-trait3 
+  - story-gen-book-action-trait4 
+  - story-gen-book-action-trait5 
+  - story-gen-book-action-trait6 
+  - story-gen-book-action-trait7 
+  - story-gen-book-action-trait8 
+  - story-gen-book-action-trait9 
+  - story-gen-book-action-trait10
+  - story-gen-book-action-trait11
+  - story-gen-book-action-trait12
+  - story-gen-book-action-trait13
+
+- type: dataset
+  id: book_location
+  values:
+  - story-gen-book-location1 
+  - story-gen-book-location2 
+  - story-gen-book-location3 
+  - story-gen-book-location4 
+  - story-gen-book-location5 
+  - story-gen-book-location6 
+  - story-gen-book-location7 
+  - story-gen-book-location8 
+  - story-gen-book-location9 
+  - story-gen-book-location10
+  - story-gen-book-location11
+  - story-gen-book-location12
+  - story-gen-book-location13
+  - story-gen-book-location14
+  - story-gen-book-location15
+  - story-gen-book-location16
+  - story-gen-book-location17
+  - story-gen-book-location18
+  - story-gen-book-location19
+  - story-gen-book-location20
+  - story-gen-book-location21
+  - story-gen-book-location22
+  - story-gen-book-location23
+  - story-gen-book-location24
+  - story-gen-book-location25
+  - story-gen-book-location26
+  - story-gen-book-location27
+  - story-gen-book-location28
+  - story-gen-book-location29
+  - story-gen-book-location30
+  - story-gen-book-location31
+  - story-gen-book-location32
+  - story-gen-book-location33
+  - story-gen-book-location34
+
+- type: dataset
+  id: book_story_element
+  values:
+  - story-gen-book-element1
+  - story-gen-book-element2
+  - story-gen-book-element3
+  - story-gen-book-element4
+  - story-gen-book-element5
+  - story-gen-book-element6
+  - story-gen-book-element7
+  - story-gen-book-element8
+  - story-gen-book-element9
+
+- type: dataset
+  id: book_story_element_trait
+  values:
+  - story-gen-book-element-trait1 
+  - story-gen-book-element-trait2 
+  - story-gen-book-element-trait3 
+  - story-gen-book-element-trait4 
+  - story-gen-book-element-trait5 
+  - story-gen-book-element-trait6 
+  - story-gen-book-element-trait7 
+  - story-gen-book-element-trait8 
+  - story-gen-book-element-trait9 
+  - story-gen-book-element-trait10
+  - story-gen-book-element-trait11
+  - story-gen-book-element-trait12
+  - story-gen-book-element-trait13
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Body/Parts/harpy.yml b/Resources/Prototypes/DeltaV/Body/Parts/harpy.yml
deleted file mode 100644
index 358cb1de11f..00000000000
--- a/Resources/Prototypes/DeltaV/Body/Parts/harpy.yml
+++ /dev/null
@@ -1,186 +0,0 @@
-- type: entity
-  id: PartHarpy
-  parent: BaseItem
-  name: "harpy body part"
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: Biological
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: StaticPrice #DynamicPrice
-    price: 100
-  - type: Tag
-    tags:
-      - Trash
-
-- type: entity
-  id: TorsoHarpy
-  name: "harpy torso"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "torso_m"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "torso_m"
-  - type: BodyPart
-    partType: Torso
-
-- type: entity
-  id: HeadHarpy
-  name: "harpy head"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "head_m"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "head_m"
-  - type: BodyPart
-    partType: Head
-    vital: true
-  - type: Input
-    context: "ghost"
-  - type: InputMover
-  - type: GhostOnMove
-  - type: Tag
-    tags:
-      - Head
-
-- type: entity
-  id: LeftArmHarpy
-  name: "left harpy arm"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "l_arm"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "l_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Left
-
-- type: entity
-  id: RightArmHarpy
-  name: "right harpy arm"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "r_arm"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "r_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Right
-
-- type: entity
-  id: LeftHandHarpy
-  name: "left harpy hand"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "l_hand"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "l_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Left
-
-- type: entity
-  id: RightHandHarpy
-  name: "right harpy hand"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "r_hand"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "r_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Right
-
-- type: entity
-  id: LeftLegHarpy
-  name: "left harpy leg"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "l_leg"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "l_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Left
-  - type: MovementBodyPart
-
-- type: entity
-  id: RightLegHarpy
-  name: "right harpy leg"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "r_leg"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "r_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-  - type: MovementBodyPart
-
-- type: entity
-  id: LeftFootHarpy
-  name: "left harpy foot"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "l_foot"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "l_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Left
-
-- type: entity
-  id: RightFootHarpy
-  name: "right harpy foot"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "r_foot"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: "r_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Right
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 1f27eb265c2..dcde538f9cd 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -20,7 +20,7 @@
     contents:
       - id: BoxSurvivalMedical
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
 
 - type: entity
@@ -33,7 +33,7 @@
       - id: BoxSurvivalMedical
       - id: RubberStampPsychologist
 
-  
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpack
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
index 0ae8407a2fc..4aa423e0aed 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -7,7 +7,7 @@
     contents:
       - id: BoxSurvivalMedical
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
 
 - type: entity
@@ -20,7 +20,7 @@
       - id: BoxSurvivalMedical
       - id: RubberStampPsychologist
 
-  
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackDuffel
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index 4eebbcfe917..1ef1441b3b9 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -7,7 +7,7 @@
     contents:
       - id: BoxSurvivalMedical
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
 
 - type: entity
@@ -20,7 +20,7 @@
       - id: BoxSurvivalMedical
       - id: RubberStampPsychologist
 
-  
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchel
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml
index eb9d3d038ae..5c27c96e5eb 100644
--- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml
@@ -1,11 +1,14 @@
-- type: advertisementsPack
+- type: messagePack
   id: CourierDrobeAds
-  advertisements:
+  messages:
     - advertisement-courierdrobe-1
     - advertisement-courierdrobe-2
     - advertisement-courierdrobe-3
     - advertisement-courierdrobe-4
     - advertisement-courierdrobe-5
-  thankyous:
+
+- type: messagePack
+  id: CourierDrobeGoodbyes
+  messages:
     - thankyou-courierdrobe-1
     - thankyou-courierdrobe-2
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
index 77f5a20858b..6b59a932612 100644
--- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
@@ -1,9 +1,12 @@
-- type: advertisementsPack
+- type: messagePack
   id: PrideDrobeAds
-  advertisements:
+  messages:
   - advertisement-pride-1
   - advertisement-pride-2
   - advertisement-pride-3
-  thankyous:
+
+- type: messagePack
+  id: PrideDrobeGoodbyes
+  messages:
   - thankyou-pride-1
   - thankyou-pride-2
diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
deleted file mode 100644
index ca0e83d45a3..00000000000
--- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-- type: listing
-  id: Mouse Operative Reinforcement
-  name: uplink-reinforcement-radio-nukie-mouse-name
-  description: uplink-reinforcement-radio-nukie-mouse-desc
-  productEntity: ReinforcementRadioSyndicateNukieMouse
-  icon: { sprite: DeltaV/Objects/Devices/communication.rsi, state: cheese-radio }
-  cost:
-    Telecrystal: 3
-  categories:
-  - UplinkUtility
-
-- type: listing
-  id: UplinkBionicSyrinxImplanter
-  name: uplink-bionic-syrinx-implanter-name
-  description: uplink-bionic-syrinx-implanter-desc
-  productEntity: BionicSyrinxImplanter
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkImplants
-  conditions:
-  - !type:BuyerSpeciesCondition
-    whitelist:
-    - Harpy
-  - !type:BuyerWhitelistCondition
-    blacklist:
-      components:
-      - SurplusBundle
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml
index 37b4a65d98d..38bbd956868 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml
@@ -7,7 +7,7 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
     #  - id: Flash
       - id: BruteAutoInjector
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml
index 2ab94da0a4b..caf5aa3515b 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml
@@ -7,7 +7,7 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
     #  - id: Flash
       - id: BruteAutoInjector
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml
index d2d081da462..9c27500a1f7 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml
@@ -7,7 +7,7 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
     #  - id: Flash
       - id: BruteAutoInjector
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
index f3fdeabd107..99021b47e42 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -234,7 +234,7 @@
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpsuitKilt
   name: kilt
   description: A fine bit o' garb for the lad an' lasses.
@@ -253,4 +253,4 @@
   - type: Sprite
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
   - type: Clothing
-    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
\ No newline at end of file
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/miningrock.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/miningrock.yml
index f4aef8284b8..204901d8bda 100644
--- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/miningrock.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/miningrock.yml
@@ -17,14 +17,17 @@
       - Barricade
       - MountainRockMining
       - MountainRock
-      - RandomCrystalSpawner
+      - RandomStalagmiteOrCrystal
       - RandomWallRockSpawner
       - RandomBasaltRockSpawner
+      - AsteroidRockOreCrab
+      - RandomWoodenStructure
     rareChance: 0.15
 
 - type: entity
   name: Crystal Spawner
   id: RandomCrystalSpawner
+  suffix: 100%
   parent: MarkerBase
   components:
   - type: Sprite
@@ -81,4 +84,19 @@
       - WallRockBasaltTin
       - WallRockBasaltUranium
       - WallRockBasaltArtifactFragment
-#Might add chance for no crystal later??
+
+- type: entity
+  id: RandomWoodenStructure
+  name: wooden wall or support spawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Objects/Decoration/mines.rsi
+        state: support_wall_broken
+  - type: RandomSpawner
+    prototypes:
+      - RandomWoodenWall
+      - RandomWoodenSupport
+    chance: 0.9
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
deleted file mode 100644
index bd1ad12a326..00000000000
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml
+++ /dev/null
@@ -1,247 +0,0 @@
-# All the Harpy customization
-
-# Ears Markings
-- type: marking
-  id: HarpyWingDefault
-  bodyPart: RArm
-  markingCategory: Arms
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-          color: "#964b00"
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpy
-
-- type: marking
-  id: HarpyWingClassic
-  bodyPart: RArm
-  markingCategory: Arms
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-          color: "#964b00"
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: classicharpy
-
-- type: marking
-  id: HarpyWingFolded
-  bodyPart: RArm
-  markingCategory: Arms
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-          color: "#964b00"
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpyfolded
-
-- type: marking
-  id: HarpyEarsDefault
-  bodyPart: Head
-  markingCategory: HeadTop
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-          color: "#964b00"
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_ears.rsi
-      state: harpy_ears_default
-
-- type: marking
-  id: HarpyTailPhoenix
-  bodyPart: Tail
-  markingCategory: Tail
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-          color: "#964b00"
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
-      state: phoenix_tail
-
-- type: marking
-  id: HarpyTailRooster
-  bodyPart: Tail
-  markingCategory: Tail
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
-      state: rooster_tail
-
-
-- type: marking
-  id: HarpyTailFinch
-  bodyPart: Tail
-  markingCategory: Tail
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_tails36x36.rsi
-      state: finch_tail
-
-- type: marking
-  id: HarpyTailPeacock
-  bodyPart: Tail
-  markingCategory: Tail
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
-      state: peacock_tail_feathers
-    - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
-      state: peacock_tail_eyes
-
-- type: marking
-  id: HarpyWing2ToneClassic
-  bodyPart: RArm
-  markingCategory: Arms
-  speciesRestriction: [Harpy]
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpy2tone1
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpy2tone2
-
-- type: marking
-  id: HarpyWing3ToneClassic
-  bodyPart: RArm
-  markingCategory: Arms
-  speciesRestriction: [Harpy]
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpy3tone1
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpy3tone2
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpy3tone3
-
-- type: marking
-  id: HarpyWingSpeckledClassic
-  bodyPart: RArm
-  markingCategory: Arms
-  speciesRestriction: [Harpy]
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpyspeckled1
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpyspeckled2
-
-- type: marking
-  id: HarpyWingUndertoneClassic
-  bodyPart: RArm
-  markingCategory: Arms
-  speciesRestriction: [Harpy]
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpyundertone1
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpyundertone2
-
-- type: marking
-  id: HarpyWingTipsClassic
-  bodyPart: RArm
-  markingCategory: Arms
-  speciesRestriction: [Harpy]
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpywingtip1
-    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
-      state: harpywingtip2
-
-- type: marking
-  id: HarpyChestDefault
-  bodyPart: Chest
-  markingCategory: Chest
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-          color: "#964b00"
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
-      state: upper
-    - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
-      state: lower
-
-- type: marking
-  id: HarpyLegsDefault
-  bodyPart: LLeg
-  markingCategory: Legs
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-          color: "#964b00"
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
-      state: thighs
-
-- type: marking
-  id: HarpyFeetDefault
-  bodyPart: RFoot
-  markingCategory: Legs
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      fallbackTypes:
-        - !type:SimpleColoring
-          color: "#964b00"
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
-      state: feet
-    - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
-      state: talons
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
index e932974a0f4..dd59d74d3f0 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
@@ -66,7 +66,7 @@
   - type: Tag
     tags:
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Fox
     understands:
@@ -179,7 +179,7 @@
     tags:
     - DoorBumpOpener
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Dog
     understands:
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
index 90a9e12e8d5..2dad0fe2e65 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -81,8 +81,8 @@
   - type: ZombieImmune # No zombie servant
   - type: RandomMetadata
     nameSegments: [names_golem]
-  #- type: PotentialPsionic
-  #- type: Psionic
+  - type: PotentialPsionic
+  - type: Psionic
     removable: false
   # - type: PyrokinesisPower # Pending psionic rework
   - type: Grammar
@@ -95,7 +95,7 @@
     factions:
     - PsionicInterloper
     - NanoTrasen
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     understands:
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
index c2ae33ec0ba..8968f0e77ad 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
@@ -96,7 +96,7 @@
     spawned:
     - id: FoodMeat
       amount: 1
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
deleted file mode 100644
index 66d19ffcc44..00000000000
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-- type: entity
-  save: false
-  name: Urist McHarpy
-  parent: MobHarpyBase
-  id: MobHarpy
-  components:
-  - type: CombatMode
-  - type: InteractionPopup
-    successChance: 1
-    interactSuccessString: hugging-success-generic
-    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
-    messagePerceivedByOthers: hugging-success-generic-others
-  - type: MindContainer
-    showExamineInfo: true
-  - type: Input
-    context: "human"
-  - type: MobMover
-  - type: InputMover
-  - type: Respirator
-  - type: Alerts
-  - type: Actions
-  - type: Eye
-  - type: CameraRecoil
-  - type: Examiner
-  - type: CanHostGuardian
-  - type: NpcFactionMember
-    factions:
-    - NanoTrasen
-  #- type: PotentialPsionic
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
deleted file mode 100644
index e51ae91d12c..00000000000
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ /dev/null
@@ -1,220 +0,0 @@
-- type: entity
-  save: false
-  name: Urist McHarpy
-  parent: BaseMobHuman
-  id: MobHarpyBase
-  abstract: true
-  components:
-  - type: HarpySinger
-  - type: Instrument
-    allowPercussion: false
-    program: 52
-  - type: SwappableInstrument
-    instrumentList:
-      "Voice": {52: 0}
-      "Trumpet": {56: 0}
-      "Electric": {27: 0}
-      "Bass": {33: 0}
-      "Rock": {29: 0}
-      "Acoustic": {24: 0}
-      "Flute": {73: 0}
-      "Sax": {66: 0}
-  - type: UserInterface
-    interfaces:
-      - key: enum.InstrumentUiKey.Key
-        type: InstrumentBoundUserInterface
-      - key: enum.VoiceMaskUIKey.Key
-        type: VoiceMaskBoundUserInterface
-      - key: enum.HumanoidMarkingModifierKey.Key
-        type: HumanoidMarkingModifierBoundUserInterface
-      - key: enum.StrippingUiKey.Key
-        type: StrippableBoundUserInterface
-  - type: Sprite
-    scale: 0.9, 0.9
-    layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
-      - map: [ "enum.HumanoidVisualLayers.Snout" ]
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-      - map: [ "underpants" ]
-      - map: [ "undershirt" ]
-      - map: [ "socks" ]
-      - map: [ "jumpsuit" ]
-      - map: ["enum.HumanoidVisualLayers.LFoot"]
-      - map: ["enum.HumanoidVisualLayers.RFoot"]
-      - map: ["enum.HumanoidVisualLayers.LHand"]
-      - map: ["enum.HumanoidVisualLayers.RHand"]
-      - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
-        color: "#ffffff"
-        sprite: Objects/Misc/handcuffs.rsi
-        state: body-overlay-2
-        visible: false
-      - map: [ "id" ]
-      - map: [ "gloves" ]
-      - map: [ "ears" ]
-      - map: [ "outerClothing" ]
-      - map: [ "eyes" ]
-      - map: [ "belt" ]
-      - map: [ "neck" ]
-      - map: [ "back" ]
-      - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-      - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
-      - map: [ "enum.HumanoidVisualLayers.Tail" ]
-      - map: [ "pocket1" ]
-      - map: [ "pocket2" ]
-      - map: [ "clownedon" ] # Dynamically generated
-        sprite: "Effects/creampie.rsi"
-        state: "creampie_human"
-        visible: false
-# Yes, RArm has to be down here
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      - map: [ "enum.HumanoidVisualLayers.Hair" ]
-      - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-      - map: [ "mask" ]
-      - map: [ "head" ]
-      - map: [ "singingLayer" ]
-        sprite: DeltaV/Effects/harpysinger.rsi
-        state: singing_music_notes
-        visible: false
-  - type: HumanoidAppearance
-    species: Harpy
-  - type: Fixtures
-    fixtures: # TODO: This needs a second fixture just for mob collisions.
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.32
-        density: 90
-        restitution: 0.0
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
-  - type: Body
-    prototype: Harpy
-  - type: Damageable
-    damageModifierSet: Harpy
-  - type: MeleeWeapon
-    soundHit:
-      collection: AlienClaw
-    animation: WeaponArcClaw
-    damage:
-      types:
-        Piercing: 5
-  - type: Speech
-    speechSounds: Harpy
-    speechVerb: Harpy
-  - type: Vocal
-    sounds:
-      Male: SoundsHarpy
-      Female: SoundsHarpy
-      Unsexed: SoundsHarpy
-  - type: GenericVisualizer
-    visuals:
-      enum.HarpyVisualLayers.Singing:
-        singingLayer:
-          False:  {visible: false}
-          True:  {visible: true}
-  - type: MovementSpeedModifier
-    baseWalkSpeed: 2.5
-    baseSprintSpeed: 5.0
-    weightlessAcceleration: 2.5
-  - type: Inventory
-    speciesId: harpy
-    templateId: digitigrade
-  - type: HarpyVisuals
-  - type: UltraVision
-  - type: Tag
-    tags:
-    - CanPilot
-    - FootstepSound
-    - DoorBumpOpener
-    - ShoesRequiredStepTriggerImmune
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - SolCommon
-    understands:
-    - GalacticCommon
-    - SolCommon
-
-- type: entity
-  save: false
-  name: Urist McHands
-  parent: MobHumanDummy
-  id: MobHarpyDummy
-  noSpawn: true
-  description: A dummy Harpy meant to be used in character setup.
-  components:
-  - type: HumanoidAppearance
-    species: Harpy
-  - type: Inventory
-    speciesId: harpy
-    templateId: digitigrade
-  - type: Sprite
-    scale: 0.9, 0.9
-    layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
-      - map: [ "enum.HumanoidVisualLayers.Snout" ]
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-      - map: [ "underpants" ]
-      - map: [ "undershirt" ]
-      - map: [ "socks" ]
-      - map: [ "jumpsuit" ]
-      - map: ["enum.HumanoidVisualLayers.LFoot"]
-      - map: ["enum.HumanoidVisualLayers.RFoot"]
-      - map: ["enum.HumanoidVisualLayers.LHand"]
-      - map: ["enum.HumanoidVisualLayers.RHand"]
-      - map: [ "id" ]
-      - map: [ "gloves" ]
-      - map: [ "ears" ]
-      - map: [ "outerClothing" ]
-      - map: [ "eyes" ]
-      - map: [ "belt" ]
-      - map: [ "neck" ]
-      - map: [ "back" ]
-      - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-      - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
-      - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-      - map: [ "enum.HumanoidVisualLayers.Tail" ]
-      - map: [ "pocket1" ]
-      - map: [ "pocket2" ]
-      - map: [ "clownedon" ] # Dynamically generated
-        sprite: "Effects/creampie.rsi"
-        state: "creampie_human"
-        visible: false
-# Yes, RArm has to be down here
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      - map: [ "enum.HumanoidVisualLayers.Hair" ]
-      - map: [ "mask" ]
-      - map: [ "head" ]
-
-- type: entity
-  id: ActionHarpyPlayMidi
-  name: Play MIDI
-  description: Sing your heart out! Right click yourself to set an instrument.
-  noSpawn: true
-  components:
-  - type: InstantAction
-    checkCanInteract: false
-    icon: DeltaV/Interface/Actions/harpy_sing.png
-    event: !type:OpenUiActionEvent
-      key: enum.InstrumentUiKey.Key
-
-- type: entity
-  id: ActionSyrinxChangeVoiceMask
-  name: Set name
-  description: Change the name others hear to something else.
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: DeltaV/Interface/Actions/harpy_syrinx.png
-    itemIconStyle: BigAction
-    event: !type:VoiceMaskSetNameEvent
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
index 52853d696a2..9e4f80bfb52 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
@@ -97,7 +97,7 @@
       Female: FemaleVulpkanin
       Unsexed: MaleVulpkanin
   - type: DogVision
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Canilunzt
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml
deleted file mode 100644
index 9849642f939..00000000000
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: entity
-  id: BionicSyrinxImplanter
-  name: bionic syrinx implanter
-  parent: BaseImplantOnlyImplanterSyndi
-  components:
-    - type: Implanter
-      implant: BionicSyrinxImplant
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml
deleted file mode 100644
index 93a9641f7be..00000000000
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- type: entity
-  parent: BaseSubdermalImplant
-  id: BionicSyrinxImplant
-  name: bionic syrinx implant
-  description: This implant lets a harpy adjust their voice to whoever they can think of.
-  noSpawn: true
-  components:
-    - type: SubdermalImplant
-      implantAction: ActionSyrinxChangeVoiceMask
-      whitelist:
-        components:
-        - HarpySinger
-    - type: VoiceMasker
-    - type: Tag
-      tags:
-        - SubdermalImplant
-        - BionicSyrinxImplant
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
index 8f7e6ce6b2d..7de554f5ff5 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml
@@ -6,100 +6,100 @@
   components:
   - type: Mail
     contents:
-    # Author Books
-    - id: BookNarsieLegend
-      prob: 0.02
-      orGroup: bookauthor
-    - id: BookTruth
-      prob: 0.02
-      orGroup: bookauthor
-    - id: BookWorld
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookIanAntarctica
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookSlothClownSSS
-      prob: 0.04
-      orGroup: bookauthor
-    - id: BookSlothClownPranks
-      prob: 0.04
-      orGroup: bookauthor
-    - id: BookSlothClownMMD
-      prob: 0.04
-      orGroup: bookauthor
-    - id: BookStruck
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookSun
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookPossum
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookCafe
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookFeather
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookIanLostWolfPup
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanRanch
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanOcean
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanMountain
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanCity
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanArctic
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookIanDesert
-      prob: 0.05
-      orGroup: bookauthor
-    - id: BookNames
-      prob: 0.08
-      orGroup: bookauthor
-    - id: BookEarth
-      prob: 0.08
-      orGroup: bookauthor
-    - id: BookTemple
-      prob: 0.09
-      orGroup: bookauthor
-    - id: BookAurora
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookWatched
-      prob: 0.04
-      orGroup: bookauthor
-    - id: BookMedicalOfficer
-      prob: 0.06
-      orGroup: bookauthor
-    - id: BookMorgue
-      prob: 0.06
-      orGroup: bookauthor
-    - id: BookRufus
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookMap
-      prob: 0.08
-      orGroup: bookauthor
-    - id: BookJourney
-      prob: 0.1
-      orGroup: bookauthor
-    - id: BookInspiration
-      prob: 0.09
-      orGroup: bookauthor
-    - id: BookRandom # The "spawn nothing" in the 'orGroup'
-      prob: 0.3
-      orGroup: bookauthor
+#    # Author Books
+#    - id: BookNarsieLegend
+#      prob: 0.02
+#      orGroup: bookauthor
+#    - id: BookTruth
+#      prob: 0.02
+#      orGroup: bookauthor
+#    - id: BookWorld
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookIanAntarctica
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookSlothClownSSS
+#      prob: 0.04
+#      orGroup: bookauthor
+#    - id: BookSlothClownPranks
+#      prob: 0.04
+#      orGroup: bookauthor
+#    - id: BookSlothClownMMD
+#      prob: 0.04
+#      orGroup: bookauthor
+#    - id: BookStruck
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookSun
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookPossum
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookCafe
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookFeather
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookIanLostWolfPup
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanRanch
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanOcean
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanMountain
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanCity
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanArctic
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookIanDesert
+#      prob: 0.05
+#      orGroup: bookauthor
+#    - id: BookNames
+#      prob: 0.08
+#      orGroup: bookauthor
+#    - id: BookEarth
+#      prob: 0.08
+#      orGroup: bookauthor
+#    - id: BookTemple
+#      prob: 0.09
+#      orGroup: bookauthor
+#    - id: BookAurora
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookWatched
+#      prob: 0.04
+#      orGroup: bookauthor
+#    - id: BookMedicalOfficer
+#      prob: 0.06
+#      orGroup: bookauthor
+#    - id: BookMorgue
+#      prob: 0.06
+#      orGroup: bookauthor
+#    - id: BookRufus
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookMap
+#      prob: 0.08
+#      orGroup: bookauthor
+#    - id: BookJourney
+#      prob: 0.1
+#      orGroup: bookauthor
+#    - id: BookInspiration
+#      prob: 0.09
+#      orGroup: bookauthor
+#    - id: BookRandom # The "spawn nothing" in the 'orGroup'
+#      prob: 0.3
+#      orGroup: bookauthor
     # id: Guidebook Books
     - id: BookSpaceEncyclopedia
       prob: 0.2
@@ -143,28 +143,28 @@
     - id: BookRandom # The "spawn nothing" in the 'orGroup'
       prob: 0.5
       orGroup: bookguide
-    # Other Books
-    - id: BookEscalation
-      prob: 0.2
-      orGroup: bookother
-    - id: BookEscalationSecurity
-      prob: 0.15
-      orGroup: bookother
-    - id: BookAtmosDistro
-      prob: 0.1
-      orGroup: bookother
-    - id: BookAtmosWaste
-      prob: 0.1
-      orGroup: bookother
-    - id: BookAtmosAirAlarms
-      prob: 0.1
-      orGroup: bookother
-    - id: BookAtmosVentsMore
-      prob: 0.1
-      orGroup: bookother
-    - id: BookRandom # The "spawn nothing" in the 'orGroup'
-      prob: 0.7
-      orGroup: bookother
+#    # Other Books
+#    - id: BookEscalation
+#      prob: 0.2
+#      orGroup: bookother
+#    - id: BookEscalationSecurity
+#      prob: 0.15
+#      orGroup: bookother
+#    - id: BookAtmosDistro
+#      prob: 0.1
+#      orGroup: bookother
+#    - id: BookAtmosWaste
+#      prob: 0.1
+#      orGroup: bookother
+#    - id: BookAtmosAirAlarms
+#      prob: 0.1
+#      orGroup: bookother
+#    - id: BookAtmosVentsMore
+#      prob: 0.1
+#      orGroup: bookother
+#    - id: BookRandom # The "spawn nothing" in the 'orGroup'
+#      prob: 0.7
+#      orGroup: bookother
 
 - type: entity
   noSpawn: true
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml
index a021e77f0a2..6a8114d884f 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml
@@ -87,7 +87,7 @@
     solution: ammo
   - type: DrainableSolution
     solution: ammo
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnProjectileHit
     transferAmount: 9
     blockSlots: NONE #shouldn't be blocked by a mask
   - type: InjectableSolution
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
index fad87f577fc..a0a511be2a5 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
@@ -11,6 +11,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: PrideDrobeAds
+  - type: SpeakOnUIClosed
+    pack: PrideDrobeGoodbyes
   - type: Speech
   - type: Sprite
     sprite: DeltaV/Structures/Machines/VendingMachines/pride.rsi
@@ -36,6 +38,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: CourierDrobeAds
+  - type: SpeakOnUIClosed
+    pack: CourierDrobeGoodbyes
   - type: Sprite
     sprite: DeltaV/Structures/Machines/VendingMachines/courierdrobe.rsi
     layers:
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml
index 43d56751716..575687336ad 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml
@@ -69,7 +69,7 @@
   id: MountainRock
   parent: BaseStructure
   name: mountain rock
-  suffix: un-mineable
+  suffix: Un-mineable
   description: A craggy mountain wall. It is too hard to mine.
   components:
   - type: Sprite
@@ -107,7 +107,7 @@
   id: AsteroidAltRockMining
   parent: AsteroidAltRock
   name: asteroid rock
-  suffix: higher ore yield
+  suffix: Higher Ore Yield
   description: A rocky asteroid.
   components:
   - type: Gatherable
@@ -117,3 +117,14 @@
   - type: OreVein
     oreChance: 0.33
     oreRarityPrototypeId: RandomOreDistributionStandard
+
+- type: entity
+  id: AsteroidRockOreCrab
+  parent: AsteroidAltRock
+  name: asteroid rock
+  suffix: Ore Crab
+  description: A rocky asteroid.
+  components:
+  - type: OreVein
+    oreChance: 0.33
+    oreRarityPrototypeId: OreCrab
diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml
index 9391756492b..9a2b9a4569d 100644
--- a/Resources/Prototypes/DeltaV/GameRules/events.yml
+++ b/Resources/Prototypes/DeltaV/GameRules/events.yml
@@ -4,9 +4,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-xeno-vent-start-announcement
-    startAudio:
-      path: /Audio/Announcements/aliens.ogg
+    startAnnouncement: true
     earliestStart: 20
     minimumPlayers: 15
     weight: 1
diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml
deleted file mode 100644
index d9a3fd92173..00000000000
--- a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml
+++ /dev/null
@@ -1,244 +0,0 @@
-- type: soundCollection
-  id: HarpyScreams
-  files:
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_scream1.ogg
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_scream2.ogg
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_scream3.ogg
-    - /Audio/Animals/monkey_scream.ogg
-    - /Audio/Voice/Human/malescream_1.ogg
-    - /Audio/Voice/Human/malescream_2.ogg
-    - /Audio/Voice/Human/malescream_3.ogg
-    - /Audio/Voice/Human/malescream_4.ogg
-    - /Audio/Voice/Human/malescream_5.ogg
-    - /Audio/Voice/Human/malescream_6.ogg
-    - /Audio/Voice/Human/femalescream_1.ogg
-    - /Audio/Voice/Human/femalescream_2.ogg
-    - /Audio/Voice/Human/femalescream_3.ogg
-    - /Audio/Voice/Human/femalescream_4.ogg
-    - /Audio/Voice/Human/femalescream_5.ogg
-    - /Audio/Voice/Moth/moth_scream.ogg
-    - /Audio/Voice/Skeleton/skeleton_scream.ogg
-    - /Audio/Voice/Reptilian/reptilian_scream.ogg
-
-- type: soundCollection
-  id: HarpyLaugh
-  files:
-    - /Audio/Voice/Human/manlaugh1.ogg
-    - /Audio/Voice/Human/manlaugh2.ogg
-    - /Audio/Voice/Human/womanlaugh.ogg
-    - /Audio/Voice/Diona/diona_rustle1.ogg
-    - /Audio/Voice/Diona/diona_rustle2.ogg
-    - /Audio/Voice/Diona/diona_rustle3.ogg
-    - /Audio/Animals/lizard_happy.ogg
-    - /Audio/Animals/ferret_happy.ogg
-    - /Audio/Voice/Moth/moth_laugh.ogg
-
-- type: soundCollection
-  id: HarpyHisses
-  files:
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss1.ogg
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss2.ogg
-    - /Audio/Weapons/ebladeon.ogg
-    - /Audio/Weapons/eblade1.ogg
-    - /Audio/Items/hiss.ogg
-    - /Audio/Items/hypospray.ogg
-    - /Audio/Items/ratchet.ogg
-    - /Audio/Items/welder.ogg
-    - /Audio/Machines/airlock_close.ogg
-    - /Audio/Machines/airlock_ext_close.ogg
-    - /Audio/Machines/airlock_ext_open.ogg
-    - /Audio/Machines/airlock_open.ogg
-    - /Audio/Machines/disposalflush.ogg
-    - /Audio/Machines/printer.ogg
-    - /Audio/Machines/windoor_open.ogg
-    - /Audio/Effects/spray.ogg
-    - /Audio/Effects/spray2.ogg
-
-- type: soundCollection
-  id: HarpySigh
-  files:
-    - /Audio/Voice/Human/male_sigh.ogg
-    - /Audio/Voice/Human/female_sigh.ogg
-
-- type: soundCollection
-  id: HarpyCry
-  files:
-    - /Audio/Voice/Human/cry_male_1.ogg
-    - /Audio/Voice/Human/cry_male_2.ogg
-    - /Audio/Voice/Human/cry_male_3.ogg
-    - /Audio/Voice/Human/cry_male_4.ogg
-    - /Audio/Voice/Human/cry_female_1.ogg
-    - /Audio/Voice/Human/cry_female_2.ogg
-    - /Audio/Voice/Human/cry_female_3.ogg
-    - /Audio/Voice/Human/cry_female_4.ogg
-
-- type: soundCollection
-  id: HarpyMeows
-  files:
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_meow2.ogg
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_meow3.ogg
-    - /Audio/Items/Toys/meow1.ogg
-    - /Audio/Animals/cat_meow.ogg
-
-- type: soundCollection
-  id: HarpyMews
-  files:
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_mew1.ogg
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_mew2.ogg
-
-- type: soundCollection
-  id: HarpyGrowls
-  files:
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_growl1.ogg
-    - /Audio/Animals/bear.ogg
-    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl1.ogg
-    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl2.ogg
-    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl3.ogg
-    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg
-    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg
-    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg
-
-- type: soundCollection
-  id: HarpyPurrs
-  files:
-    - /Audio/Nyanotrasen/Voice/Felinid/cat_purr1.ogg
-    - /Audio/Mecha/sound_mecha_hydraulic.ogg
-
-- type: soundCollection
-  id: HarpyRings
-  files:
-    - /Audio/Items/desk_bell_ring.ogg
-    - /Audio/Items/ring.ogg
-    - /Audio/Machines/ding.ogg
-    - /Audio/Machines/warning_buzzer.ogg
-
-- type: soundCollection
-  id: HarpyHonks
-  files:
-    - /Audio/Items/bikehorn.ogg
-    - /Audio/Items/brokenbikehorn.ogg
-
-- type: soundCollection
-  id: HarpyPews
-  files:
-    - /Audio/Weapons/Guns/Gunshots/silenced.ogg
-    - /Audio/Weapons/Guns/Gunshots/taser.ogg
-    - /Audio/Weapons/Guns/Gunshots/taser2.ogg
-    - /Audio/Weapons/Guns/Gunshots/laser.ogg
-    - /Audio/Weapons/Guns/Gunshots/laser3.ogg
-    - /Audio/Weapons/emitter.ogg
-    - /Audio/Effects/Arcade/player_attack.ogg
-    - /Audio/Effects/Arcade/player_charge.ogg
-    - /Audio/Effects/Arcade/player_heal.ogg
-    - /Audio/Magic/staff_animation.ogg
-    - /Audio/Magic/staff_change.ogg
-    - /Audio/Magic/staff_chaos.ogg
-    - /Audio/Magic/staff_door.ogg
-    - /Audio/Magic/staff_healing.ogg
-
-- type: soundCollection
-  id: HarpyBangs
-  files:
-    - /Audio/Weapons/Guns/Gunshots/atreides.ogg
-    - /Audio/Weapons/Guns/Gunshots/bang.ogg
-    - /Audio/Weapons/Guns/Gunshots/mk58.ogg
-    - /Audio/Weapons/Guns/Gunshots/pistol.ogg
-    - /Audio/Weapons/Guns/Gunshots/c-20r.ogg
-    - /Audio/Items/snap.ogg
-    - /Audio/Machines/blastdoor.ogg
-    - /Audio/Machines/machine_vend.ogg
-    - /Audio/Magic/disintegrate.ogg
-    - /Audio/Magic/fireball.ogg
-    - /Audio/Magic/forcewall.ogg
-    - /Audio/Magic/knock.ogg
-
-- type: soundCollection
-  id: HarpyBeeps
-  files:
-    - /Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg
-    - /Audio/Items/beep.ogg
-    - /Audio/Items/flashlight_pda.ogg
-    - /Audio/Items/locator_beep.ogg
-    - /Audio/Items/toolbox_drop.ogg
-    - /Audio/Items/Defib/defib_charge.ogg
-    - /Audio/Items/Defib/defib_ready.ogg
-    - /Audio/Items/Defib/defib_safety_off.ogg
-    - /Audio/Items/Defib/defib_safety_on.ogg
-    - /Audio/Items/Medical/healthscanner.ogg
-    - /Audio/Effects/RingtoneNotes/a.ogg
-    - /Audio/Effects/RingtoneNotes/asharp.ogg
-    - /Audio/Effects/RingtoneNotes/b.ogg
-    - /Audio/Effects/RingtoneNotes/c.ogg
-    - /Audio/Effects/RingtoneNotes/csharp.ogg
-    - /Audio/Effects/RingtoneNotes/d.ogg
-    - /Audio/Effects/RingtoneNotes/dsharp.ogg
-    - /Audio/Effects/RingtoneNotes/e.ogg
-    - /Audio/Effects/RingtoneNotes/f.ogg
-    - /Audio/Effects/RingtoneNotes/fsharp.ogg
-    - /Audio/Effects/RingtoneNotes/g.ogg
-    - /Audio/Effects/RingtoneNotes/gsharp.ogg
-    - /Audio/Effects/Arcade/gameover.ogg
-    - /Audio/Effects/Arcade/win.ogg
-    - /Audio/Machines/airlock_deny.ogg
-    - /Audio/Machines/alarm.ogg
-    - /Audio/Machines/beep.ogg
-    - /Audio/Machines/boltsdown.ogg
-    - /Audio/Machines/boltsup.ogg
-    - /Audio/Machines/custom_deny.ogg
-    - /Audio/Machines/high_tech_confirm.ogg
-    - /Audio/Machines/microwave_done_beep.ogg
-    - /Audio/Machines/scan_finish.ogg
-    - /Audio/Machines/vending_jingle.ogg
-
-- type: soundCollection
-  id: HarpyRevs
-  files:
-    - /Audio/Weapons/chainsawwield.ogg
-    - /Audio/Machines/blender.ogg
-    - /Audio/Machines/juicer.ogg
-    - /Audio/Machines/reclaimer_startup.ogg
-
-- type: soundCollection
-  id: HarpyClicks
-  files:
-    - /Audio/Items/deconstruct.ogg
-    - /Audio/Items/flashlight_off.ogg
-    - /Audio/Items/flashlight_on.ogg
-    - /Audio/Items/pistol_cock.ogg
-    - /Audio/Items/pistol_magin.ogg
-    - /Audio/Items/pistol_magout.ogg
-    - /Audio/Items/rped.ogg
-    - /Audio/Machines/door_lock_off.ogg
-    - /Audio/Machines/door_lock_on.ogg
-    - /Audio/Machines/id_swipe.ogg
-    - /Audio/Machines/machine_switch.ogg
-    - /Audio/Machines/screwdriveropen.ogg
-
-- type: soundCollection
-  id: HarpyChitter
-  files: 
-    - /Audio/Voice/Moth/moth_chitter.ogg
-    - /Audio/Machines/circuitprinter.ogg
-    - /Audio/Machines/diagnoser_printing.ogg
-    - /Audio/Machines/uniformprinter.ogg
-    - /Audio/Machines/vaccinator_running.ogg
-
-- type: soundCollection
-  id: HarpySqueak
-  files: 
-    - /Audio/Voice/Moth/moth_squeak.ogg
-    - /Audio/Animals/mouse_squeak.ogg
-
-- type: soundCollection
-  id: HarpyCaws
-  files: 
-    - /Audio/DeltaV/Voice/Harpy/caw1.ogg
-
-- type: soundCollection
-  id: HarpyChirps
-  files: 
-    - /Audio/DeltaV/Voice/Harpy/chirp1.ogg
-    - /Audio/Voice/Talk/pai.ogg
-    - /Audio/Voice/Talk/pai_ask.ogg
-    - /Audio/Voice/Talk/pai_exclaim.ogg
diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/DeltaV/Species/harpy.yml
deleted file mode 100644
index 383fbbfc66d..00000000000
--- a/Resources/Prototypes/DeltaV/Species/harpy.yml
+++ /dev/null
@@ -1,150 +0,0 @@
-- type: species
-  id: Harpy
-  name: species-name-harpy
-  roundStart: false
-  prototype: MobHarpy
-  sprites: MobHarpySprites
-  markingLimits: MobHarpyMarkingLimits
-  dollPrototype: MobHarpyDummy
-  skinColoration: HumanToned
-  minHeight: 0.6
-  defaultHeight: 0.8
-  maxHeight: 1.1
-  minWidth: 0.55
-  defaultWidth: 0.8
-  maxWidth: 1.15
-
-- type: speciesBaseSprites
-  id: MobHarpySprites
-  sprites:
-    Head: MobHarpyHead
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Chest: MobHarpyTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobHumanoidEyes
-    LArm: MobHarpyLArm
-    RArm: MobHarpyRArm
-    LHand: MobHarpyLHand
-    RHand: MobHarpyRHand
-    LLeg: MobHarpyLLeg
-    RLeg: MobHarpyRLeg
-    LFoot: MobHarpyLFoot
-    RFoot: MobHarpyRFoot
-
-
-- type: markingPoints
-  id: MobHarpyMarkingLimits
-  points:
-    Hair:
-      points: 1
-      required: false
-    FacialHair:
-      points: 1
-      required: false
-    Tail:
-      points: 1
-      required: true
-      defaultMarkings: [ HarpyTailPhoenix ]
-    HeadTop:
-      points: 1
-      required: true
-      defaultMarkings: [ HarpyEarsDefault ]
-    Chest:
-      points: 1
-      required: true
-      defaultMarkings: [ HarpyChestDefault ]
-    Legs:
-      points: 2
-      required: false
-    Arms:
-      points: 1
-      required: false
-      defaultMarkings: [ HarpyWingDefault ]
-
-- type: humanoidBaseSprite
-  id: MobHarpyHead
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobHarpyHeadMale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobHarpyHeadFemale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobHarpyTorso
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobHarpyTorsoMale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobHarpyTorsoFemale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobHarpyLLeg
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobHarpyLHand
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobHarpyLArm
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobHarpyLFoot
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobHarpyRLeg
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobHarpyRHand
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobHarpyRArm
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobHarpyRFoot
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Harpy/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/DeltaV/Traits/altvision.yml
index d1980bc23ad..d5166b00b65 100644
--- a/Resources/Prototypes/DeltaV/Traits/altvision.yml
+++ b/Resources/Prototypes/DeltaV/Traits/altvision.yml
@@ -1,13 +1,35 @@
-- type: trait
-  id: UltraVision
-  category: Visual
-  points: -1
-  components:
-    - type: UltraVision
+# - type: trait
+  # id: UltraVision
+  # category: Visual
+  # points: -1
+  # requirements:
+    # - !type:CharacterSpeciesRequirement
+      # inverted: true
+      # species: Vulpkanin
+    # - !type:CharacterSpeciesRequirement
+      # inverted: true
+      # species: Harpy
+    # - !type:CharacterTraitRequirement
+      # inverted: true
+      # traits:
+        # - DogVision
+  # components:
+    # - type: UltraVision
 
-- type: trait
-  id: DogVision
-  category: Visual
-  points: -1
-  components:
-    - type: DogVision
+# - type: trait
+  # id: DogVision
+  # category: Visual
+  # points: -1
+  # requirements:
+    # - !type:CharacterSpeciesRequirement
+      # inverted: true
+      # species: Vulpkanin
+    # - !type:CharacterSpeciesRequirement
+      # inverted: true
+      # species: Harpy
+    # - !type:CharacterTraitRequirement
+      # inverted: true
+      # traits:
+        # - UltraVision
+  # components:
+    # - type: DogVision
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index 5dbefa16841..011de6a7c52 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -30,13 +30,13 @@
       collection: HarpyPurrs
     HarpyRing:
       collection: HarpyRings
-    HarpyHonk:
+    Honk:
       collection: HarpyHonks
     HarpyPew:
       collection: HarpyPews
     HarpyBang:
       collection: HarpyBangs
-    HarpyBeep:
+    Beep:
       collection: HarpyBeeps
     HarpyRev:
       collection: HarpyRevs
@@ -58,8 +58,6 @@
       collection: VulpkaninWhines
     Howl:
       collection: VulpkaninHowls
-    Honk:
-      collection: BikeHorn
     Weh:
       collection: Weh
 
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
index 2cef3fd038c..29f75d0d509 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
@@ -1,243 +1,64 @@
-# Harpy
-- type: emote
-  id: HarpyHonk
-  category: Vocal
-  chatMessages: [honks.]
-  chatTriggers:
-    - honk
-    - honk.
-    - honk!
-    - honk?
-    - honks
-    - honks.
-    - honks!
-    - honks?
-    - honking
-    - honking.
-    - honking!
-    - honking?
-    - honked
-    - honked.
-    - honked!
-    - honked?
-
 - type: emote
   id: HarpyRing
   category: Vocal
-  chatMessages: [rings.]
+  chatMessages: [ rings ]
   chatTriggers:
-    - ring
-    - ring.
-    - ring!
-    - ring?
     - rings
-    - rings.
-    - rings!
-    - rings?
-    - ringing
-    - ringing.
-    - ringing!
-    - ringing?
-    - ringed
-    - ringed.
-    - ringed!
-    - ringed?
-    - rang
-    - rang.
-    - rang!
-    - rang?
 
 - type: emote
   id: HarpyPew
   category: Vocal
-  chatMessages: [pews.]
+  chatMessages: [ pews ]
   chatTriggers:
-    - pew
-    - pew.
-    - pew!
-    - pew?
     - pews
-    - pews.
-    - pews!
-    - pews?
-    - pewpew
-    - pewpew.
-    - pewpew!
-    - pewpew?
+    - pewpews
 
 - type: emote
   id: HarpyBang
   category: Vocal
-  chatMessages: [bangs.]
+  chatMessages: [ bangs ]
   chatTriggers:
-    - bang
-    - bang.
-    - bang!
-    - bang?
     - bangs
-    - bangs.
-    - bangs!
-    - bangs?
-    - banging
-    - banging.
-    - banging!
-    - banging?
-    - banged
-    - banged.
-    - banged!
-    - banged?
-
-- type: emote
-  id: HarpyBeep
-  category: Vocal
-  chatMessages: [beeps.]
-  chatTriggers:
-    - beep
-    - beep.
-    - beep!
-    - beep?
-    - beeps
-    - beeps.
-    - beeps!
-    - beeps?
-    - beeping
-    - beeping.
-    - beeping!
-    - beeping?
-    - beeped
-    - beeped.
-    - beeped!
-    - beeped?
 
 - type: emote
   id: HarpyRev
   category: Vocal
-  chatMessages: [revs.]
+  chatMessages: [ revs ]
   chatTriggers:
-    - rev
-    - rev.
-    - rev!
-    - rev?
     - revs
-    - revs.
-    - revs!
-    - revs?
-    - revving
-    - revving.
-    - revving!
-    - revving?
-    - revved
-    - revved.
-    - revved!
-    - revved?
 
 - type: emote
   id: HarpyCaw
   category: Vocal
-  chatMessages: [caws.]
+  chatMessages: [ caws ]
   chatTriggers:
-    - caw
-    - caw.
-    - caw!
-    - caw?
     - caws
-    - caws.
-    - caws!
-    - caws?
-    - cawing
-    - cawing.
-    - cawing!
-    - cawing?
-    - cawed
-    - cawed.
-    - cawed!
-    - cawed?
 
 #Vulpkanin
 - type: emote
   id: Bark
   category: Vocal
-  chatMessages: [barks.]
+  chatMessages: [ barks ]
   chatTriggers:
-    - bark
-    - bark.
-    - bark!
-    - bark?
     - barks
-    - barks.
-    - barks!
-    - barks?
-    - barked
-    - barked.
-    - barked!
-    - barked?
-    - barking
-    - barking.
-    - barking!
-    - barking?
 
 - type: emote
   id: Snarl
   category: Vocal
-  chatMessages: [snarls.]
+  chatMessages: [ snarls ]
   chatTriggers:
-    - snarl
-    - snarl.
-    - snarl!
-    - snarl?
     - snarls
-    - snarls.
-    - snarls!
-    - snarls?
-    - snarled
-    - snarled.
-    - snarled!
-    - snarled?
-    - snarling
-    - snarling.
-    - snarling!
-    - snarling?
 
 - type: emote
   id: Whine
   category: Vocal
-  chatMessages: [whines.]
+  chatMessages: [ whines ]
   chatTriggers:
-    - whine
-    - whine.
-    - whine!
-    - whine?
     - whines
-    - whines.
-    - whines!
-    - whines?
-    - whined
-    - whined.
-    - whined!
-    - whined?
-    - whining
-    - whining.
-    - whining!
-    - whining?
 
 - type: emote
   id: Howl
   category: Vocal
-  chatMessages: [howls.]
+  chatMessages: [ howls ]
   chatTriggers:
-    - howl
-    - howl.
-    - howl!
-    - howl?
     - howls
-    - howls.
-    - howls!
-    - howls?
-    - howling
-    - howling.
-    - howling!
-    - howling?
-    - howled
-    - howled.
-    - howling!
-    - howling?
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml
index 9ffa21b8c8e..26156fb82db 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml
@@ -1,5 +1,6 @@
 - type: speechVerb
   id: Vulpkanin
+  name: chat-speech-verb-name-vulpkanin
   speechVerbStrings:
   - chat-speech-verb-vulpkanin-1
   - chat-speech-verb-vulpkanin-2
@@ -8,6 +9,7 @@
 
 - type: speechVerb
   id: Felinid
+  name: chat-speech-verb-name-felinid
   speechVerbStrings:
   - chat-speech-verb-felinid-1
   - chat-speech-verb-felinid-2
@@ -16,6 +18,7 @@
 
 - type: speechVerb
   id: Harpy
+  name: chat-speech-verb-name-harpy
   speechVerbStrings:
   - chat-speech-verb-harpy-1
   - chat-speech-verb-harpy-2
diff --git a/Resources/Prototypes/DeviceLinking/sink_ports.yml b/Resources/Prototypes/DeviceLinking/sink_ports.yml
index f05934f3baa..56b10ec4fcc 100644
--- a/Resources/Prototypes/DeviceLinking/sink_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/sink_ports.yml
@@ -107,3 +107,8 @@
   id: SetParticleZeta
   name: signal-port-name-set-particle-zeta
   description: signal-port-description-set-particle-zeta
+
+- type: sinkPort
+  id: SetParticleSigma
+  name: signal-port-name-set-particle-sigma
+  description: signal-port-description-set-particle-sigma
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index d72006f6c41..605cb61c434 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -249,6 +249,15 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertclown.rsi
 
+- type: entity
+  parent: ClothingBackpackERTLeader
+  id: ClothingBackpackERTChaplain
+  name: ERT chaplain backpack
+  description: A spacious backpack with lots of pockets, worn by Chaplains of an Emergency Response Team.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/ertchaplain.rsi
+
 #Syndicate
 - type: entity
   parent: ClothingBackpack
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index ca16aa5d7ed..46d7ae45380 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -167,6 +167,9 @@
     sprite: Clothing/Back/Duffels/syndicate.rsi
   - type: ExplosionResistance
     damageCoefficient: 0.1
+  - type: Storage
+    grid:
+    - 0,0,8,4
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicate
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
index 2f904d3438c..62889d0aba2 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -10,11 +10,22 @@
   - type: Clothing
     slots: [belt]
     quickEquip: false
+    equipSound:
+      path: /Audio/SimpleStation14/Items/Equip/toolbelt_equip.ogg
+    clothingVisuals:
+      belt2: #there should be a cleaner way to do this tbh
+      - state: equipped-BELT
   - type: PhysicalComposition
     materialComposition:
       Cloth: 50
   - type: StaticPrice
-    price: 25
+    price: 20
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/toolbelt_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/toolbelt_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/toolbelt_drop.ogg
 
 - type: entity
   abstract: true
@@ -49,4 +60,3 @@
   - type: ContainerContainer
     containers:
       ballistic-ammo: !type:Container
-
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 1f90b421526..d90945a7eba 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -514,6 +514,8 @@
         name: Sabre
         insertVerbText: sheath-insert-verb
         ejectVerbText: sheath-eject-verb
+        insertSound: /Audio/SimpleStation14/Items/Handling/sword_sheath.ogg
+        ejectSound: /Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg
         whitelist:
           tags:
           - CaptainSabre
@@ -607,6 +609,20 @@
   - type: Clothing
     sprite: Clothing/Belt/securitywebbing.rsi
 
+- type: entity
+  parent: ClothingBeltSecurityWebbing
+  id: ClothingBeltSecurityWebbingFilled
+  name: security webbing
+  description: Unique and versatile chest rig, can hold security gear.
+  components:
+  - type: StorageFill
+    contents:
+      - id: GrenadeFlashBang
+      - id: TearGasGrenade
+      - id: Stunbaton
+      - id: Handcuffs
+      - id: Handcuffs
+
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltMercWebbing
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
index 38472e3901d..02cf0ab6f67 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -34,3 +34,13 @@
     spawned:
     - id: MaterialCloth1
       amount: 1
+
+# gloves that cover the fingertips and have synthetic fibers
+- type: entity
+  abstract: true
+  parent: ClothingHandsButcherable
+  id: ClothingHandsGlovesSyntheticBase
+  components:
+  - type: Fiber
+    fiberMaterial: fibers-synthetic
+  - type: FingerprintMask
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
index 1cd41073e1b..de08e6446c5 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
@@ -1,13 +1,8 @@
-# gloves that cover the fingertips and have synthetic fibers
-- type: entity
-  abstract: true
-  parent: ClothingHandsButcherable
-  id: ClothingHandsGlovesSyntheticBase
-  components:
-  - type: Fiber
-    fiberMaterial: fibers-synthetic
-  - type: FingerprintMask
+#DO NOT MAKE THESE THE SAME COLOR AS THE JUMPSUIT. It is going to cause contrast issues for those wearing the full set of color clothing and is almost definitely going to look worse.
+#If you want to make it similar to the jumpsuit color, it should be slightly off.
+#P.S: Most of these just use the shoe colors, so they end up having a nice "secondary" color when wearing the full set of color clothing.
 
+# Purple Gloves
 - type: entity
   parent: ClothingHandsGlovesSyntheticBase
   id: ClothingHandsGlovesColorPurple
@@ -15,12 +10,28 @@
   description: Regular purple gloves that do not keep you from frying.
   components:
   - type: Sprite
-    sprite: Clothing/Hands/Gloves/Color/purple.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    layers:
+    - state: icon
+      color: "#9C0DE1"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#9C0DE1"
+      right:
+      - state: inhand-right
+        color: "#9C0DE1"
   - type: Clothing
-    sprite: Clothing/Hands/Gloves/Color/purple.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    clothingVisuals:
+      gloves:
+      - state: equipped-HAND
+        color: "#9C0DE1"
   - type: Fiber
     fiberColor: fibers-purple
 
+# Red Gloves
 - type: entity
   parent: ClothingHandsGlovesSyntheticBase
   id: ClothingHandsGlovesColorRed
@@ -28,31 +39,28 @@
   description: Regular red gloves that do not keep you from frying.
   components:
   - type: Sprite
-    sprite: Clothing/Hands/Gloves/Color/red.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    layers:
+    - state: icon
+      color: "#940000"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#940000"
+      right:
+      - state: inhand-right
+        color: "#940000"
   - type: Clothing
-    sprite: Clothing/Hands/Gloves/Color/red.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    clothingVisuals:
+      gloves:
+      - state: equipped-HAND
+        color: "#940000"
   - type: Fiber
     fiberColor: fibers-red
 
-- type: entity
-  parent: ClothingHandsGlovesSyntheticBase
-  id: ClothingHandsGlovesColorBlack
-  name: black gloves
-  description: Regular black gloves that do not keep you from frying.
-  components:
-  - type: Sprite
-    sprite: Clothing/Hands/Gloves/Color/black.rsi
-  - type: Clothing
-    sprite: Clothing/Hands/Gloves/Color/black.rsi
-  - type: GloveHeatResistance
-    heatResistance: 1400
-  - type: Butcherable
-    butcheringType: Knife
-    spawned:
-    - id: ClothingHandsGlovesFingerless
-  - type: Fiber
-    fiberColor: fibers-black
-
+# Blue Gloves
 - type: entity
   parent: ClothingHandsGlovesSyntheticBase
   id: ClothingHandsGlovesColorBlue
@@ -60,12 +68,28 @@
   description: Regular blue gloves that do not keep you from frying.
   components:
   - type: Sprite
-    sprite: Clothing/Hands/Gloves/Color/blue.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    layers:
+    - state: icon
+      color: "#0089EF"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#0089EF"
+      right:
+      - state: inhand-right
+        color: "#0089EF"
   - type: Clothing
-    sprite: Clothing/Hands/Gloves/Color/blue.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    clothingVisuals:
+      gloves:
+      - state: equipped-HAND
+        color: "#0089EF"
   - type: Fiber
     fiberColor: fibers-blue
 
+# Brown Gloves
 - type: entity
   parent: ClothingHandsGlovesSyntheticBase
   id: ClothingHandsGlovesColorBrown
@@ -73,12 +97,28 @@
   description: Regular brown gloves that do not keep you from frying.
   components:
   - type: Sprite
-    sprite: Clothing/Hands/Gloves/Color/brown.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    layers:
+    - state: icon
+      color: "#723A02"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#723A02"
+      right:
+      - state: inhand-right
+        color: "#723A02"
   - type: Clothing
-    sprite: Clothing/Hands/Gloves/Color/brown.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    clothingVisuals:
+      gloves:
+      - state: equipped-HAND
+        color: "#723A02"
   - type: Fiber
     fiberColor: fibers-brown
 
+# Grey Gloves
 - type: entity
   parent: ClothingHandsGlovesSyntheticBase
   id: ClothingHandsGlovesColorGray
@@ -86,12 +126,28 @@
   description: Regular grey gloves that do not keep you from frying.
   components:
   - type: Sprite
-    sprite: Clothing/Hands/Gloves/Color/gray.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    layers:
+    - state: icon
+      color: "#999999"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#999999"
+      right:
+      - state: inhand-right
+        color: "#999999"
   - type: Clothing
-    sprite: Clothing/Hands/Gloves/Color/gray.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    clothingVisuals:
+      gloves:
+      - state: equipped-HAND
+        color: "#999999"
   - type: Fiber
     fiberColor: fibers-grey
 
+# Green Gloves
 - type: entity
   parent: ClothingHandsGlovesSyntheticBase
   id: ClothingHandsGlovesColorGreen
@@ -99,12 +155,28 @@
   description: Regular green gloves that do not keep you from frying.
   components:
   - type: Sprite
-    sprite: Clothing/Hands/Gloves/Color/green.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    layers:
+    - state: icon
+      color: "#5ABF2F"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#5ABF2F"
+      right:
+      - state: inhand-right
+        color: "#5ABF2F"
   - type: Clothing
-    sprite: Clothing/Hands/Gloves/Color/green.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    clothingVisuals:
+      gloves:
+      - state: equipped-HAND
+        color: "#5ABF2F"
   - type: Fiber
     fiberColor: fibers-green
 
+# Light Brown Gloves
 - type: entity
   parent: ClothingHandsGlovesSyntheticBase
   id: ClothingHandsGlovesColorLightBrown
@@ -112,12 +184,28 @@
   description: Regular light brown gloves that do not keep you from frying.
   components:
   - type: Sprite
-    sprite: Clothing/Hands/Gloves/Color/lightbrown.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    layers:
+    - state: icon
+      color: "#C09F72"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C09F72"
+      right:
+      - state: inhand-right
+        color: "#C09F72"
   - type: Clothing
-    sprite: Clothing/Hands/Gloves/Color/lightbrown.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    clothingVisuals:
+      gloves:
+      - state: equipped-HAND
+        color: "#C09F72"
   - type: Fiber
     fiberColor: fibers-brown
 
+# Orange Gloves
 - type: entity
   parent: ClothingHandsGlovesSyntheticBase
   id: ClothingHandsGlovesColorOrange
@@ -125,25 +213,87 @@
   description: Regular orange gloves that do not keep you from frying.
   components:
   - type: Sprite
-    sprite: Clothing/Hands/Gloves/Color/orange.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    layers:
+    - state: icon
+      color: "#EF8100"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#EF8100"
+      right:
+      - state: inhand-right
+        color: "#EF8100"
   - type: Clothing
-    sprite: Clothing/Hands/Gloves/Color/orange.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    clothingVisuals:
+      gloves:
+      - state: equipped-HAND
+        color: "#EF8100"
   - type: Fiber
     fiberColor: fibers-orange
 
+# White Gloves
 - type: entity
   parent: ClothingHandsGlovesSyntheticBase
   id: ClothingHandsGlovesColorWhite
   name: white gloves
-  description: Those gloves look fancy.
+  description: Regular white gloves that do not keep you from frying.
   components:
   - type: Sprite
-    sprite: Clothing/Hands/Gloves/Color/white.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    layers:
+    - state: icon
+      color: "#EAE8E8"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#EAE8E8"
+      right:
+      - state: inhand-right
+        color: "#EAE8E8"
   - type: Clothing
-    sprite: Clothing/Hands/Gloves/Color/white.rsi
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    clothingVisuals:
+      gloves:
+      - state: equipped-HAND
+        color: "#EAE8E8"
   - type: Fiber
     fiberColor: fibers-white
 
+# Black Gloves
+# TECHNICALLY, if you ported the worn state to the RSI, this could be greyscaled, but I do not really feel like doing that.
+- type: entity
+  parent: ClothingHandsGlovesSyntheticBase
+  id: ClothingHandsGlovesColorBlack
+  name: black gloves
+  description: Regular black gloves that do not keep you from frying.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/black.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#535353"
+      right:
+      - state: inhand-right
+        color: "#535353"
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/black.rsi
+  - type: GloveHeatResistance
+    heatResistance: 1400
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: ClothingHandsGlovesFingerless
+  - type: Fiber
+    fiberColor: fibers-black
+
+# Insulated Gloves (Yellow Gloves)
+# Currently can not be greyscaled without looking like shit.
 - type: entity
   parent: ClothingHandsBase
   id: ClothingHandsGlovesColorYellow
@@ -166,6 +316,7 @@
     fiberMaterial: fibers-insulative
     fiberColor: fibers-yellow
 
+# Budget Insulated Gloves
 - type: entity
   parent: ClothingHandsGlovesColorYellow
   id: ClothingHandsGlovesColorYellowBudget
@@ -192,6 +343,7 @@
       - 1.5
       - 1.5
 
+# Conductive Insulated Gloves
 - type: entity
   parent: ClothingHandsGlovesColorYellow
   id: ClothingHandsGlovesConducting
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index bf08db78f71..4cd0c04e2be 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -231,7 +231,6 @@
   - type: FingerprintMask
   - type: Thieving
     stripTimeReduction: 1
-    stealthy: true
   - type: NinjaGloves
 
 - type: entity
@@ -332,7 +331,6 @@
     tags: [] # ignore "WhitelistChameleon" tag
   - type: Thieving
     stripTimeReduction: 1.5
-    stealthy: true
 
 - type: entity
   parent: ClothingHandsGlovesColorWhite
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml
index e6a57319999..db34297b42a 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml
@@ -29,4 +29,3 @@
   components:
   - type: Thieving
     stripTimeReduction: 2
-    stealthy: true
diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
index 8ee6479ee65..51a56f1f1d6 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
@@ -20,6 +20,9 @@
     - state: icon_mask
       map: [ "unfoldedLayer" ]
       visible: false
+  - type: Tag
+    tags:
+    - Bandana
 
 - type: entity
   parent: [ClothingHeadBandBase, ClothingMaskBandBlack]
@@ -69,4 +72,4 @@
 - type: entity
   parent: [ClothingHeadBandBase, ClothingMaskBandBrown]
   id: ClothingHeadBandBrown
-  name: brown bandana
\ No newline at end of file
+  name: brown bandana
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index b98a8cf78e4..f1489b0ddd6 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -571,6 +571,21 @@
         Piercing: 0.9
         Heat: 0.9
 
+#ERT Chaplain Hardsuit
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSyndie
+  id: ClothingHeadHelmetHardsuitERTChaplain
+  name: ERT chaplain hardsuit helmet
+  description: A special hardsuit helmet worn by members of an emergency response team.
+  components:
+  - type: BreathMask
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
+  - type: PointLight
+    color: "#ffffff"
+
 #ERT Engineer Hardsuit
 - type: entity
   parent: ClothingHeadHelmetHardsuitSyndie
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index c845d7cc4a0..30907f70b5b 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -483,17 +483,30 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ClothingHeadBase, BaseFoldable]
   id: ClothingHeadHatUshanka
   name: ushanka
   description: "Perfect for winter in Siberia, da?"
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Hats/ushanka.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/ushanka.rsi
+  - type: Appearance
   - type: AddAccentClothing
     accent: RussianAccent
+  - type: Foldable
+    canFoldInsideContainer: true
+  - type: FoldableClothing
+    foldedEquippedPrefix: up
+    foldedHeldPrefix: up
+  - type: Sprite
+    sprite: Clothing/Head/Hats/ushanka.rsi
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon-up
+      map: ["foldedLayer"]
+      visible: false
+
 
 - type: entity
   parent: ClothingHeadBase
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 72abbd5f720..b79b72ffb63 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -113,7 +113,7 @@
 
 #Janitorial Bombsuit Helmet
 - type: entity
-  parent: ClothingHeadBase
+  parent: ClothingHeadHelmetBombSuit
   id: ClothingHeadHelmetJanitorBombSuit
   name: janitorial bombsuit helmet
   description: A heavy helmet designed to withstand explosions formed from reactions between chemicals.
@@ -123,9 +123,6 @@
     sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
-  - type: IngestionBlocker
-  - type: ExplosionResistance
-    damageCoefficient: 0.9
 
 #Cult Helmet
 - type: entity
@@ -147,29 +144,6 @@
         Piercing: 0.9
         Heat: 0.9
 
-#SCAF Helmet
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHelmetScaf
-  name: scaf helmet
-  description: A robust, strong helmet.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/scaf.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/scaf.rsi
-  - type: IngestionBlocker
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.8
-  - type: Tag
-    tags:
-    - HidesHair
-    - WhitelistChameleon
-
 #Space Ninja Helmet
 - type: entity
   parent: ClothingHeadEVAHelmetBase
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index 3fd55faf266..c7ba6e0b32a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -35,31 +35,20 @@
 
 - type: entity
   parent: ClothingHeadBase
-  id: ClothingHeadHatFlowerCrown
-  name: flower crown
-  description: A coronet of fresh and fragrant flowers.
+  id: ClothingHeadHatFlowerWreath
+  name: flower wreath
+  description: A wreath of colourful flowers. Can be worn both on head and neck.
   components:
   - type: Sprite
-    sprite: Clothing/Head/Misc/flower-crown.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
   - type: Clothing
-    sprite: Clothing/Head/Misc/flower-crown.rsi
-  - type: Construction
-    graph: flowercrown
-    node: flowercrown
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatHairflower
-  name: hairflower
-  description: A red flower for beautiful ladies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Misc/hairflower.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Misc/hairflower.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
+    slots:
+    - HEAD
+    - neck
   - type: Construction
-    graph: hairflower
-    node: hairflower
+    graph: flowerwreath
+    node: flowerwreath
 
 - type: entity
   parent: ClothingHeadLightBase
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
index c673e5ee01a..d520860e867 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
@@ -24,6 +24,7 @@
       visible: false
   - type: Tag
     tags:
+    - Bandana
     - HidesNose
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index ad738792a73..4d7351464ff 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -177,6 +177,8 @@
     materialComposition:
       Steel: 50
       Plastic: 100
+  - type: StaticPrice
+    price: 12.5 # increases in price after decomposed into raw materials
 
 - type: entity
   parent: ClothingMaskBase
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
index 1e85073da9b..d0e4e4d7e9f 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
@@ -28,4 +28,3 @@
   suffix: Voice Mask, Chameleon
   components:
     - type: VoiceMasker
-      default: ClothingMaskGas
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
index 6b4be3c9f84..51325c0bbbd 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -79,17 +79,3 @@
     event: !type:StethoscopeActionEvent
     checkCanInteract: false
     priority: -1
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckFlowerWreath
-  name: flower wreath
-  description: A wreath of colourful flowers.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
-  - type: Clothing
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
-  - type: Construction
-    graph: flowerwreath
-    node: flowerwreath
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
index 0d22a653dbf..0054a3645c7 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -151,3 +151,35 @@
     clothingVisuals:
       neck:
       - state: trans-equipped
+ 
+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckAutismPin
+  name: autism pin
+  description: be autism do crime
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/autismpin.rsi
+    layers:
+    - state: autism
+  - type: Clothing
+    sprite: Clothing/Neck/Misc/autismpin.rsi
+    clothingVisuals:
+      neck:
+      - state: autism-equipped
+
+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckGoldAutismPin
+  name: golden autism pin
+  description: be autism do warcrime
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/goldautismpin.rsi
+    layers:
+    - state: goldautism
+  - type: Clothing
+    sprite: Clothing/Neck/Misc/goldautismpin.rsi
+    clothingVisuals:
+      neck:
+      - state: goldautism-equipped
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index fdaee45ccc8..9a1f1427402 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -183,32 +183,6 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Armor/magusred.rsi
 
-- type: entity
-  parent: ClothingOuterBaseLarge
-  id: ClothingOuterArmorScaf
-  name: scaf suit
-  description: A green and brown tactical suit for combat situations.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.4
-        Heat: 0.9
-        Caustic: 0.9
-  - type: ExplosionResistance
-    damageCoefficient: 0.8
-  - type: GroupExamine
-  - type: Tag
-    tags:
-    - Hardsuit
-    - WhitelistChameleon
-
 - type: entity
   parent: ClothingOuterBaseLarge
   id: ClothingOuterArmorCaptainCarapace
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 902c57418e4..8f4312e7711 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -23,6 +23,9 @@
     walkModifier: 0.9
     sprintModifier: 0.9
   - type: HeldSpeedModifier
+  - type: Tag
+    tags:
+      - WhitelistChameleon
 
 - type: entity
   abstract: true
@@ -41,7 +44,49 @@
     - key: enum.StorageUiKey.Key
       type: StorageBoundUserInterface
   - type: StaticPrice
-    price: 80
+    price: 70
+
+- type: entity
+  abstract: true
+  parent: [ClothingOuterStorageBase, BaseFoldable]
+  id: ClothingOuterStorageFoldableBase
+  components:
+  - type: Appearance
+  - type: Foldable
+    canFoldInsideContainer: true
+    unfoldVerbText: fold-zip-verb
+    foldVerbText: fold-unzip-verb
+  - type: FoldableClothing
+    foldedEquippedPrefix: open
+    foldedHeldPrefix: open
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon-open
+      map: ["foldedLayer"]
+      visible: false
+
+- type: entity
+  abstract: true
+  parent: ClothingOuterStorageFoldableBase
+  id: ClothingOuterStorageFoldableBaseOpened
+  suffix: opened
+  components:
+  - type: Foldable
+    folded: true
+  - type: Clothing
+    equippedPrefix: open
+  - type: Item
+    heldPrefix: open
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+      visible: false
+    - state: icon-open
+      map: ["foldedLayer"]
+      visible: true
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index 41d6990baaa..c78a5f9bdb5 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -114,7 +114,7 @@
           Quantity: 20
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatLab
   name: lab coat
   description: A suit that protects against minor chemical spills.
@@ -129,7 +129,12 @@
         Caustic: 0.75
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLab]
+  id: ClothingOuterCoatLabOpened
+  name: lab coat
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatLabChem
   name: chemist lab coat
   description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
@@ -144,7 +149,12 @@
         Caustic: 0.75
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabChem]
+  id: ClothingOuterCoatLabChemOpened
+  name: chemist lab coat
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatLabViro
   name: virologist lab coat
   description: A suit that protects against bacteria and viruses. Has an green stripe on the shoulder.
@@ -158,9 +168,13 @@
       coefficients:
         Caustic: 0.75
 
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabViro]
+  id: ClothingOuterCoatLabViroOpened
+  name: virologist lab coat
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatLabGene
   name: geneticist lab coat
   description: A suit that protects against minor chemical spills. Has an blue stripe on the shoulder.
@@ -174,9 +188,13 @@
       coefficients:
         Caustic: 0.75
 
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabGene]
+  id: ClothingOuterCoatLabGeneOpened
+  name: geneticist lab coat
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatLabCmo
   name: chief medical officer's lab coat
   description: Bluer than the standard model.
@@ -190,6 +208,11 @@
       coefficients:
         Caustic: 0.75
 
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabCmo]
+  id: ClothingOuterCoatLabCmoOpened
+  name: chief medical officer's lab coat
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatRnd
@@ -206,7 +229,12 @@
         Caustic: 0.75
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatRnd]
+  id: ClothingOuterCoatRndOpened
+  name: scientist lab coat
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatRobo
   name: roboticist lab coat
   description: More like an eccentric coat than a labcoat. Helps pass off bloodstains as part of the aesthetic. Comes with red shoulder pads.
@@ -221,7 +249,12 @@
         Caustic: 0.75
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatRobo]
+  id: ClothingOuterCoatRoboOpened
+  name: roboticist lab coat
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatRD
   name: research director lab coat
   description: Woven with top of the line technology, this labcoat helps protect against radiation in similar way to the experimental hardsuit.
@@ -236,6 +269,11 @@
         Caustic: 0.75
         Radiation: 0.9
 
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatRD]
+  id: ClothingOuterCoatRDOpened
+  name: research director lab coat
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatPirate
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index a05d346c2f2..974da1ebccd 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -516,6 +516,7 @@
     - MonkeyWearable
     - Hardsuit
     - WhitelistChameleon
+    - HidesHarpyWings
 
 # Syndicate Medic Hardsuit
 - type: entity
@@ -534,6 +535,7 @@
     tags:
     - Hardsuit
     - WhitelistChameleon
+    - HidesHarpyWings
 
 #Syndicate Elite Hardsuit
 - type: entity
@@ -777,6 +779,20 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTLeader
 
+#ERT Chaplain Hardsuit
+- type: entity
+  parent: ClothingOuterHardsuitJuggernaut
+  id: ClothingOuterHardsuitERTChaplain
+  name: ERT chaplain's hardsuit
+  description: A protective hardsuit worn by the chaplains of an Emergency Response Team.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi #if you change this, please update the humanoid.yml with a better markers sprite.
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitERTChaplain
+
 #ERT Engineer Hardsuit
 - type: entity
   parent: ClothingOuterHardsuitCBURN
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 58faf268470..b81b3d1e7f0 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -14,6 +14,7 @@
     - SuitEVA
     - MonkeyWearable
     - WhitelistChameleon
+    - HidesHarpyWings
 
 #Syndicate EVA
 - type: entity
@@ -31,6 +32,7 @@
     - SuitEVA
     - MonkeyWearable
     - WhitelistChameleon
+    - HidesHarpyWings
 
 #Emergency EVA
 - type: entity
@@ -72,6 +74,7 @@
     - SuitEVA
     - MonkeyWearable
     - WhitelistChameleon
+    - HidesHarpyWings
 
 #NTSRA Voidsuit / Ancient Voidsuit
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 96a97be87ec..d6cd5295731 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -8,6 +8,9 @@
     sprite: Clothing/OuterClothing/Suits/bombsuit.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/bombsuit.rsi
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
   - type: Armor
     modifiers:
       coefficients:
@@ -22,9 +25,10 @@
     tags:
     - Hardsuit
     - WhitelistChameleon
+    - HidesHarpyWings
 
 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: ClothingOuterSuitBomb
   id: ClothingOuterSuitJanitorBomb
   name: janitorial bomb suit
   description: A heavy helmet designed to withstand explosions formed from reactions between chemicals.
@@ -34,16 +38,6 @@
     sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi
-  - type: ClothingSpeedModifier
-    walkModifier: 0.8
-    sprintModifier: 0.8
-  - type: ExplosionResistance
-    damageCoefficient: 0.15
-  - type: GroupExamine
-  - type: Tag
-    tags:
-    - Hardsuit
-    - WhitelistChameleon
 
 - type: entity
   parent: ClothingOuterBaseLarge
@@ -70,6 +64,10 @@
     sprintModifier: 0.7
   - type: HeldSpeedModifier
   - type: GroupExamine
+  - type: Tag
+    tags:
+      - WhitelistChameleon
+      - HidesHarpyWings
 
 - type: entity
   parent: ClothingOuterBaseLarge
@@ -97,6 +95,10 @@
       sprintModifier: 0.8
     - type: HeldSpeedModifier
     - type: GroupExamine
+    - type: Tag
+      tags:
+        - WhitelistChameleon
+        - HidesHarpyWings
 
 - type: entity
   parent: [ClothingOuterBaseLarge, GeigerCounterClothing]
@@ -120,7 +122,11 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
-      
+  - type: Tag
+    tags:
+      - WhitelistChameleon
+      - HidesHarpyWings
+
 - type: entity
   parent: ClothingOuterBaseLarge
   id: ClothingOuterSuitSpaceNinja
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
index f49f5f4804b..b867abfeed3 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -63,6 +63,9 @@
     sprite: Clothing/OuterClothing/Vests/hazard.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/hazard.rsi
+  - type: Tag
+    tags:
+    - HiViz
 
 #(Bartender) vest
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index 241fc45352a..fdc49dc0616 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -202,7 +202,7 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepSpurs
-      
+
 - type: entity
   parent: ClothingShoesBootsCowboyBrown
   id: ClothingShoesBootsCowboyBlack
@@ -212,7 +212,7 @@
     sprite: Clothing/Shoes/Boots/cowboybootsblack.rsi
   - type: Clothing
     sprite: Clothing/Shoes/Boots/cowboybootsblack.rsi
-    
+
 - type: entity
   parent: ClothingShoesBootsCowboyBrown
   id: ClothingShoesBootsCowboyWhite
@@ -222,7 +222,7 @@
     sprite: Clothing/Shoes/Boots/cowboybootswhite.rsi
   - type: Clothing
     sprite: Clothing/Shoes/Boots/cowboybootswhite.rsi
-    
+
 - type: entity
   parent: ClothingShoesBootsCowboyBrown
   id: ClothingShoesBootsCowboyFancy
@@ -231,4 +231,4 @@
   - type: Sprite
     sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
   - type: Clothing
-    sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
\ No newline at end of file
+    sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/color.yml b/Resources/Prototypes/Entities/Clothing/Shoes/color.yml
index 0bfe153b59d..16608aacc99 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/color.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/color.yml
@@ -1,3 +1,6 @@
+# DO NOT ARBITRARILY CHANGE THESE TO MAKE THEM "CONSISTENT" WITH THE COLOR JUMPSUITS. You are probably just going to make them look worse.
+
+# Black Shoes
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesColorBlack
@@ -5,10 +8,59 @@
   description: Stylish black shoes.
   components:
   - type: Sprite
-    sprite: Clothing/Shoes/Color/black.rsi
+    sprite: Clothing/Shoes/color.rsi
+    layers:
+    - state: icon
+      color: "#3f3f3f" #Different from the worn state for contrast reasons.
+    - state: soles-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#3f3f3f"
+      - state: soles-inhand-left
+      right:
+      - state: inhand-right
+        color: "#3f3f3f"
+      - state: soles-inhand-right
+  - type: Clothing
+    sprite: Clothing/Shoes/color.rsi
+    clothingVisuals:
+      shoes:
+      - state: equipped-FEET
+        color: "#1d1d1d"
+      - state: soles-equipped-FEET
+
+# White Shoes
+- type: entity
+  parent: ClothingShoesBaseButcherable
+  id: ClothingShoesColorWhite
+  name: white shoes
+  description: Don't take them off at your office Christmas party.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/color.rsi
+    layers:
+    - state: icon
+      color: "#EAE8E8" #Deliberately NOT pure white
+    - state: soles-icon
+  - type: Item
+    inhandVisuals: #We don't want the sole icons. Since this is white, it's just going to look weird (white on white doesn't really contrast.)
+      left:
+      - state: inhand-left
+        color: "#EAE8E8"
+      right:
+      - state: inhand-right
+        color: "#EAE8E8"
   - type: Clothing
-    sprite: Clothing/Shoes/Color/black.rsi
+    sprite: Clothing/Shoes/color.rsi
+    clothingVisuals:
+      shoes:
+      - state: equipped-FEET
+        color: "#EAE8E8"
+      - state: contrastedsoles-equipped-FEET
 
+# Blue Shoes
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesColorBlue
@@ -16,10 +68,30 @@
   description: Stylish blue shoes.
   components:
   - type: Sprite
-    sprite: Clothing/Shoes/Color/blue.rsi
+    sprite: Clothing/Shoes/color.rsi
+    layers:
+    - state: icon
+      color: "#0089EF"    
+    - state: soles-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#0089EF"
+      - state: soles-inhand-left
+      right:
+      - state: inhand-right
+        color: "#0089EF"
+      - state: soles-inhand-right
   - type: Clothing
-    sprite: Clothing/Shoes/Color/blue.rsi
+    sprite: Clothing/Shoes/color.rsi
+    clothingVisuals:
+      shoes:
+      - state: equipped-FEET
+        color: "#0089EF"
+      - state: soles-equipped-FEET
 
+# Brown Shoes
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesColorBrown
@@ -27,10 +99,30 @@
   description: A pair of brown shoes.
   components:
   - type: Sprite
-    sprite: Clothing/Shoes/Color/brown.rsi
+    sprite: Clothing/Shoes/color.rsi
+    layers:
+    - state: icon
+      color: "#723A02"    
+    - state: soles-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#723A02"
+      - state: soles-inhand-left
+      right:
+      - state: inhand-right
+        color: "#723A02"
+      - state: soles-inhand-right
   - type: Clothing
-    sprite: Clothing/Shoes/Color/brown.rsi
+    sprite: Clothing/Shoes/color.rsi
+    clothingVisuals:
+      shoes:
+      - state: equipped-FEET
+        color: "#592D01"
+      - state: soles-equipped-FEET
 
+# Green Shoes
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesColorGreen
@@ -38,10 +130,30 @@
   description: Stylish green shoes.
   components:
   - type: Sprite
-    sprite: Clothing/Shoes/Color/green.rsi
+    sprite: Clothing/Shoes/color.rsi
+    layers:
+    - state: icon
+      color: "#5ABF2F"    
+    - state: soles-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#5ABF2F"
+      - state: soles-inhand-left
+      right:
+      - state: inhand-right
+        color: "#5ABF2F"
+      - state: soles-inhand-right
   - type: Clothing
-    sprite: Clothing/Shoes/Color/green.rsi
+    sprite: Clothing/Shoes/color.rsi
+    clothingVisuals:
+      shoes:
+      - state: equipped-FEET
+        color: "#5ABF2F"
+      - state: soles-equipped-FEET
 
+# Orange Shoes
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesColorOrange
@@ -49,21 +161,30 @@
   description: Stylish orange shoes.
   components:
   - type: Sprite
-    sprite: Clothing/Shoes/Color/orange.rsi
+    sprite: Clothing/Shoes/color.rsi
+    layers:
+    - state: icon
+      color: "#EF8100"    
+    - state: soles-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#EF8100"
+      - state: soles-inhand-left
+      right:
+      - state: inhand-right
+        color: "#EF8100"
+      - state: soles-inhand-right
   - type: Clothing
-    sprite: Clothing/Shoes/Color/orange.rsi
-
-- type: entity
-  parent: ClothingShoesBaseButcherable
-  id: ClothingShoesColorPurple
-  name: purple shoes
-  description: Stylish purple shoes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/Color/purple.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/Color/purple.rsi
+    sprite: Clothing/Shoes/color.rsi
+    clothingVisuals:
+      shoes:
+      - state: equipped-FEET
+        color: "#EF8100"
+      - state: soles-equipped-FEET
 
+# Red Shoes
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesColorRed
@@ -71,28 +192,87 @@
   description: Stylish red shoes.
   components:
   - type: Sprite
-    sprite: Clothing/Shoes/Color/red.rsi
+    sprite: Clothing/Shoes/color.rsi
+    layers:
+    - state: icon
+      color: "#940000"    
+    - state: soles-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#940000"
+      - state: soles-inhand-left
+      right:
+      - state: inhand-right
+        color: "#940000"
+      - state: soles-inhand-right
   - type: Clothing
-    sprite: Clothing/Shoes/Color/red.rsi
+    sprite: Clothing/Shoes/color.rsi
+    clothingVisuals:
+      shoes:
+      - state: equipped-FEET
+        color: "#940000"
+      - state: soles-equipped-FEET
 
+# Yellow Shoes
 - type: entity
   parent: ClothingShoesBaseButcherable
-  id: ClothingShoesColorWhite
-  name: white shoes
-  description: Don't take them off at your office Christmas party.
+  id: ClothingShoesColorYellow
+  name: yellow shoes
+  description: Stylish yellow shoes.
   components:
   - type: Sprite
-    sprite: Clothing/Shoes/Color/white.rsi
+    sprite: Clothing/Shoes/color.rsi
+    layers:
+    - state: icon
+      color: "#EBE216"    
+    - state: soles-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#EBE216"
+      - state: soles-inhand-left
+      right:
+      - state: inhand-right
+        color: "#EBE216"
+      - state: soles-inhand-right
   - type: Clothing
-    sprite: Clothing/Shoes/Color/white.rsi
+    sprite: Clothing/Shoes/color.rsi
+    clothingVisuals:
+      shoes:
+      - state: equipped-FEET
+        color: "#EBE216"
+      - state: soles-equipped-FEET
 
+# Purple Shoes
 - type: entity
   parent: ClothingShoesBaseButcherable
-  id: ClothingShoesColorYellow
-  name: yellow shoes
-  description: Stylish yellow shoes.
+  id: ClothingShoesColorPurple
+  name: purple shoes
+  description: Stylish purple shoes.
   components:
   - type: Sprite
-    sprite: Clothing/Shoes/Color/yellow.rsi
+    sprite: Clothing/Shoes/color.rsi
+    layers:
+    - state: icon
+      color: "#9C0DE1"    
+    - state: soles-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#9C0DE1"
+      - state: soles-inhand-left
+      right:
+      - state: inhand-right
+        color: "#9C0DE1"
+      - state: soles-inhand-right
   - type: Clothing
-    sprite: Clothing/Shoes/Color/yellow.rsi
+    sprite: Clothing/Shoes/color.rsi
+    clothingVisuals:
+      shoes:
+      - state: equipped-FEET
+        color: "#9C0DE1"
+      - state: soles-equipped-FEET
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
index 4b9cbeef424..987eda582e4 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -15,6 +15,7 @@
   parent: [ClothingShoesBaseButcherable, ClothingSlotBase]
   id: ClothingShoesClownBase
   components:
+  - type: WaddleWhenWorn
   - type: ItemSlots
     slots:
       item:
@@ -157,9 +158,28 @@
     - type: Tag
       tags: [] # ignore "WhitelistChameleon" tag
     - type: Sprite
-      sprite: Clothing/Shoes/Color/black.rsi
+      sprite: Clothing/Shoes/color.rsi
+      layers:
+      - state: icon
+        color: "#3f3f3f"
+      - state: soles-icon
     - type: Clothing
-      sprite: Clothing/Shoes/Color/black.rsi
+      sprite: Clothing/Shoes/color.rsi
+      clothingVisuals:
+        shoes:
+        - state: equipped-FEET
+          color: "#1d1d1d"
+        - state: soles-equipped-FEET
+    - type: Item
+      inhandVisuals:
+        left:
+        - state: inhand-left
+          color: "#3f3f3f"
+        - state: soles-inhand-left
+        right:
+        - state: inhand-right
+          color: "#3f3f3f"
+        - state: soles-inhand-right
     - type: ChameleonClothing
       slot: [FEET]
       default: ClothingShoesColorBlack
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
index de9875b3ad6..9c896786c26 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -50,6 +50,12 @@
   - type: WirelessNetworkConnection
     range: 1200
   - type: StationLimitedNetwork
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/cloth_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/cloth_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/cloth_drop.ogg
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
new file mode 100644
index 00000000000..1f77059841b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
@@ -0,0 +1,491 @@
+# White Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorWhite
+  name: white jumpskirt
+  description: A generic white jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Grey Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorGrey
+  name: grey jumpskirt
+  description: A tasteful grey jumpskirt that reminds you of the good old days.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#b3b3b3"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#b3b3b3"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#b3b3b3"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#b3b3b3"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Black Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorBlack
+  name: black jumpskirt
+  description: A generic black jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#3f3f3f"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#3f3f3f"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#3f3f3f"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#3f3f3f"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Blue Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorBlue
+  name: blue jumpskirt
+  description: A generic blue jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#52aecc"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#52aecc"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#52aecc"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#52aecc"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Dark Blue Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorDarkBlue
+  name: dark blue jumpskirt
+  description: A generic dark blue jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#3285ba"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#3285ba"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#3285ba"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#3285ba"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Teal Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorTeal
+  name: teal jumpskirt
+  description: A generic teal jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#77f3b7"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#77f3b7"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#77f3b7"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#77f3b7"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Green Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorGreen
+  name: green jumpskirt
+  description: A generic green jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#9ed63a"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#9ed63a"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#9ed63a"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#9ed63a"
+      - state: trinkets-equipped-INNERCLOTHING
+
+ # Dark Green Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorDarkGreen
+  name: dark green jumpskirt
+  description: A generic dark green jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#79CC26"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#79CC26"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#79CC26"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#79CC26"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Orange Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorOrange
+  name: orange jumpskirt
+  description: Don't wear this near paranoid security officers.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#ff8c19"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#ff8c19"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#ff8c19"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#ff8c19"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Pink Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorPink
+  name: pink jumpskirt
+  description: Just looking at this makes you feel <i>fabulous</i>.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#ffa69b"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#ffa69b"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#ffa69b"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#ffa69b"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Red Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorRed
+  name: red jumpskirt
+  description: A generic red jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#eb0c07"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#eb0c07"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#eb0c07"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#eb0c07"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Yellow Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorYellow
+  name: yellow jumpskirt
+  description: A generic yellow jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#ffe14d"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#ffe14d"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#ffe14d"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#ffe14d"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Purple Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorPurple
+  name: purple jumpskirt
+  description: A generic light purple jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#9f70cc"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#9f70cc"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#9f70cc"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#9f70cc"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Light Brown Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorLightBrown
+  name: light brown jumpskirt
+  description: A generic light brown jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#c59431"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#c59431"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#c59431"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#c59431"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Brown Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorBrown
+  name: brown jumpskirt
+  description: A generic brown jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#a17229"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#a17229"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#a17229"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#a17229"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Maroon Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorMaroon
+  name: maroon jumpskirt
+  description: A generic maroon jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#cc295f"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#cc295f"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#cc295f"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#cc295f"
+      - state: trinkets-equipped-INNERCLOTHING
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
new file mode 100644
index 00000000000..f56afabeac1
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
@@ -0,0 +1,503 @@
+# White Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorWhite
+  name: white jumpsuit
+  description: A generic white jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Grey Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorGrey
+  name: grey jumpsuit
+  description: A tasteful grey jumpsuit that reminds you of the good old days.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#b3b3b3"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#b3b3b3"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#b3b3b3"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#b3b3b3"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Black Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorBlack
+  name: black jumpsuit
+  description: A generic black jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#3f3f3f"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#3f3f3f"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#3f3f3f"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#3f3f3f"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Blue Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorBlue
+  name: blue jumpsuit
+  description: A generic blue jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#52aecc"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#52aecc"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#52aecc"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#52aecc"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Dark Blue Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorDarkBlue
+  name: dark blue jumpsuit
+  description: A generic dark blue jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#3285ba"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#3285ba"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#3285ba"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#3285ba"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Teal Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorTeal
+  name: teal jumpsuit
+  description: A generic teal jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#77f3b7"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#77f3b7"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#77f3b7"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#77f3b7"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Green Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorGreen
+  name: green jumpsuit
+  description: A generic green jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#9ed63a"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#9ed63a"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#9ed63a"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#9ed63a"
+      - state: trinkets-equipped-INNERCLOTHING
+
+ # Dark Green Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorDarkGreen
+  name: dark green jumpsuit
+  description: A generic dark green jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#79CC26"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#79CC26"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#79CC26"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#79CC26"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Orange Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorOrange
+  name: orange jumpsuit
+  description: Don't wear this near paranoid security officers.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#ff8c19"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#ff8c19"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#ff8c19"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#ff8c19"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Pink Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorPink
+  name: pink jumpsuit
+  description: Just looking at this makes you feel <i>fabulous</i>.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#ffa69b"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#ffa69b"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#ffa69b"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#ffa69b"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Red Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorRed
+  name: red jumpsuit
+  description: A generic red jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#eb0c07"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#eb0c07"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#eb0c07"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#eb0c07"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Yellow Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorYellow
+  name: yellow jumpsuit
+  description: A generic yellow jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#ffe14d"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#ffe14d"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#ffe14d"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#ffe14d"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Purple Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorPurple
+  name: purple jumpsuit
+  description: A generic light purple jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#9f70cc"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#9f70cc"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#9f70cc"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#9f70cc"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Light Brown Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorLightBrown
+  name: light brown jumpsuit
+  description: A generic light brown jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#c59431"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#c59431"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#c59431"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#c59431"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Brown Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorBrown
+  name: brown jumpsuit
+  description: A generic brown jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#a17229"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#a17229"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#a17229"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#a17229"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Maroon Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorMaroon
+  name: maroon jumpsuit
+  description: A generic maroon jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#cc295f"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#cc295f"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#cc295f"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#cc295f"
+      - state: trinkets-equipped-INNERCLOTHING
+
+# Rainbow Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformColorRainbow
+  name: rainbow jumpsuit
+  description: A multi-colored jumpsuit!
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 23c35fbc8a7..7cbf5c940ae 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -263,15 +263,34 @@
     sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi # DeltaV - resprite
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: ClothingUniformBase
   id: ClothingUniformJumpskirtPrisoner
   name: prisoner jumpskirt
   description: Busted.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/prisoner.rsi
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#ff8300"
+    - state: prisoner-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#ff8300"
+      - state: prisoner-inhand-left
+      right:
+      - state: inhand-right
+        color: "#ff8300"
+      - state: prisoner-inhand-right
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/prisoner.rsi
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#ff8300"
+      - state: prisoner-equipped-INNERCLOTHING
   - type: SuitSensor
     controlsLocked: true
     randomMode: false
@@ -279,8 +298,8 @@
   - type: Tag
     tags:
     - ClothMade
-    - WhitelistChameleon
     - PrisonUniform
+    - WhitelistChameleon
     - Skirt # Delta-V - Skirt Tag so Harpies can wear it.
 
 - type: entity
@@ -360,184 +379,6 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi # DeltaV - resprite
 
-# COLORS
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorGrey
-  description: A tasteful grey jumpskirt that reminds you of the good old days.
-  name: grey jumpskirt
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/grey.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/grey.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorBlack
-  name: black jumpskirt
-  description: A generic black jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/black.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/black.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorBlue
-  name: blue jumpskirt
-  description: A generic blue jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/blue.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/blue.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorGreen
-  name: green jumpskirt
-  description: A generic green jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/green.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/green.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorOrange
-  name: orange jumpskirt
-  description: "Don't wear this near paranoid security officers."
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/orange.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/orange.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorPink
-  name: pink jumpskirt
-  description: "Just looking at this makes you feel fabulous."
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/pink.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/pink.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorRed
-  name: red jumpskirt
-  description: A generic red jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/red.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/red.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorWhite
-  name: white jumpskirt
-  description: A generic white jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/white.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/white.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorYellow
-  name: yellow jumpskirt
-  description: A generic yellow jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/yellow.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/yellow.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorDarkBlue
-  name: dark blue jumpskirt
-  description: A generic dark blue jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorTeal
-  name: teal jumpskirt
-  description: A generic teal jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/teal.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/teal.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorPurple
-  name: purple jumpskirt
-  description: A generic purple jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorDarkGreen
-  name: dark green jumpskirt
-  description: A generic dark green jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorLightBrown
-  name: light brown jumpskirt
-  description: A generic light brown jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorBrown
-  name: brown jumpskirt
-  description: A generic brown jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/brown.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/brown.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtColorMaroon
-  name: maroon jumpskirt
-  description: A generic maroon jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/Color/maroon.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/Color/maroon.rsi
-
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtLibrarian
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 7c38f720a35..6c853374f29 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -458,9 +458,28 @@
   description: Busted.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/prisoner.rsi
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#ff8300"
+    - state: prisoner-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#ff8300"
+      - state: prisoner-inhand-left
+      right:
+      - state: inhand-right
+        color: "#ff8300"
+      - state: prisoner-inhand-right
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/prisoner.rsi
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#ff8300"
+      - state: prisoner-equipped-INNERCLOTHING
   - type: SuitSensor
     controlsLocked: true
     randomMode: false
@@ -594,195 +613,6 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi # DeltaV - resprite
 
-# COLORS
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorGrey
-  description: A tasteful grey jumpsuit that reminds you of the good old days.
-  name: grey jumpsuit
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/grey.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/grey.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorBlack
-  name: black jumpsuit
-  description: A generic black jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/black.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/black.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorBlue
-  name: blue jumpsuit
-  description: A generic blue jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/blue.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/blue.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorGreen
-  name: green jumpsuit
-  description: A generic green jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/green.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/green.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorOrange
-  name: orange jumpsuit
-  description: "Don't wear this near paranoid security officers."
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/orange.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/orange.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorPink
-  name: pink jumpsuit
-  description: "Just looking at this makes you feel fabulous."
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/pink.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/pink.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorRed
-  name: red jumpsuit
-  description: A generic red jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/red.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/red.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorWhite
-  name: white jumpsuit
-  description: A generic white jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/white.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/white.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorYellow
-  name: yellow jumpsuit
-  description: A generic yellow jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/yellow.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/yellow.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorDarkBlue
-  name: dark blue jumpsuit
-  description: A generic dark blue jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorTeal
-  name: teal jumpsuit
-  description: A generic teal jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/teal.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/teal.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorPurple
-  name: purple jumpsuit
-  description: A generic purple jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorDarkGreen
-  name: dark green jumpsuit
-  description: A generic dark green jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorLightBrown
-  name: light brown jumpsuit
-  description: A generic light brown jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorBrown
-  name: brown jumpsuit
-  description: A generic brown jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/brown.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/brown.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitColorMaroon
-  name: maroon jumpsuit
-  description: A generic maroon jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/Color/maroon.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/Color/maroon.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ClothingUniformColorRainbow
-  name: rainbow jumpsuit
-  description: A multi-colored jumpsuit!
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
-
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformOveralls
@@ -1095,6 +925,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/musician.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitERTChaplain
+  name: ERT chaplain uniform
+  description: A special suit made for Central Command's elite chaplain corps.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitERTEngineer
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/misc_roles.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/misc_roles.yml
index 55ffe34b532..a8147ef7820 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/misc_roles.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/misc_roles.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: UniformShortsRed
   name: boxing shorts
   description: These are shorts, not boxers.
@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Shorts/Color/red.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: UniformShortsRedWithTop
   name: boxing shorts with top
   description: These are shorts, not boxers.
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml
index 88278077b5c..e113f0ffc76 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml
@@ -10,9 +10,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/procedural.rsi
     layers:
-    - state: base_torso_standart
+    - state: base_torso_standard
       map: [ "torso" ]
-    - state: base_leg_standart
+    - state: base_leg_standard
       map: [ "leg" ]
     - state: mask_null
       map: [ "decor" ]
@@ -24,9 +24,9 @@
     sprite: Clothing/Uniforms/procedural.rsi
     clothingVisuals:
       jumpsuit:
-      - state: base_torso_standart
+      - state: base_torso_standard
         map: [ "torso" ]
-      - state: base_leg_standart
+      - state: base_leg_standard
         map: [ "leg" ]
       - state: mask_null
         map: [ "decor" ]
@@ -42,7 +42,7 @@
     offset: 0
     prototypes:
     - ClothingUniformRandomArmless
-    - ClothingUniformRandomStandart
+    - ClothingUniformRandomStandard
     - ClothingUniformRandomBra
     - ClothingUniformRandomShorts
     - ClothingUniformRandomShirt
@@ -57,7 +57,7 @@
       - torso:
           base_torso_armless: Sixteen
         leg:
-          base_leg_standart: Sixteen
+          base_leg_standard: Sixteen
           base_leg_short: Sixteen
           base_leg_skirt: Sixteen
           base_leg_skirt_long: Sixteen
@@ -76,16 +76,16 @@
 
 - type: entity
   parent: ClothingUniformRandom
-  id: ClothingUniformRandomStandart
+  id: ClothingUniformRandomStandard
   name: colorful costume
   components:
   - type: RandomSprite
     available:
       - torso:
-          base_torso_standart: Sixteen
-          base_torso_standart2: Sixteen
+          base_torso_standard: Sixteen
+          base_torso_standard2: Sixteen
         leg:
-          base_leg_standart: Sixteen
+          base_leg_standard: Sixteen
           base_leg_short: Sixteen
           base_leg_skirt: Sixteen
           base_leg_skirt_long: Sixteen
@@ -100,15 +100,15 @@
           decor_torso_armless8: Sixteen
           decor_torso_armless9: Sixteen
           decor_torso_armless10: Sixteen
-          decor_torso_standart1: Sixteen
-          decor_torso_standart2: Sixteen
-          decor_torso_standart3: Sixteen
-          decor_torso_standart4: Sixteen
-          decor_torso_standart5: Sixteen
-          decor_torso_standart6: Sixteen
-          decor_torso_standart7: Sixteen
-          decor_torso_standart8: Sixteen
-          decor_torso_standart9: Sixteen
+          decor_torso_standard1: Sixteen
+          decor_torso_standard2: Sixteen
+          decor_torso_standard3: Sixteen
+          decor_torso_standard4: Sixteen
+          decor_torso_standard5: Sixteen
+          decor_torso_standard6: Sixteen
+          decor_torso_standard7: Sixteen
+          decor_torso_standard8: Sixteen
+          decor_torso_standard9: Sixteen
           mask_null: ""
 
 - type: entity
@@ -121,7 +121,7 @@
       - torso:
           base_torso_bra: Sixteen
         leg:
-          base_leg_standart: Sixteen
+          base_leg_standard: Sixteen
           base_leg_short: Sixteen
           base_leg_skirt: Sixteen
           base_leg_skirt_long: Sixteen
@@ -143,7 +143,7 @@
       - torso:
           mask_null: ""
         leg:
-          base_leg_standart: Sixteen
+          base_leg_standard: Sixteen
           base_leg_short: Sixteen
           base_leg_skirt: Sixteen
           base_leg_skirt_long: Sixteen
@@ -159,11 +159,11 @@
           base_torso_armless: Sixteen
           mask_null: ""
         leg:
-          base_leg_standart: Sixteen
+          base_leg_standard: Sixteen
           base_leg_short: Sixteen
         decor:
           base_torso_shirt: Sixteen
         overlay:
           decor_torso_shirt1: Sixteen
           decor_torso_shirt2: Sixteen
-          decor_torso_shirt3: Sixteen
\ No newline at end of file
+          decor_torso_shirt3: Sixteen
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
index d7a5e2b787d..ad02f4aa676 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
@@ -8,9 +8,28 @@
     - type: Tag
       tags: [] # ignore "WhitelistChameleon" tag
     - type: Sprite
-      sprite: Clothing/Uniforms/Jumpsuit/Color/black.rsi
+      sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      layers:
+      - state: icon
+        color: "#3f3f3f"
+      - state: trinkets-icon
+    - type: Item
+      inhandVisuals:
+        left:
+        - state: inhand-left
+          color: "#3f3f3f"
+        - state: trinkets-inhand-left
+        right:
+        - state: inhand-right
+          color: "#3f3f3f"
+        - state: trinkets-inhand-right
     - type: Clothing
-      sprite: Clothing/Uniforms/Jumpsuit/Color/black.rsi
+      sprite: Clothing/Shoes/color.rsi
+      clothingVisuals:
+        shoes:
+        - state: equipped-FEET
+          color: "#1d1d1d"
+        - state: soles-equipped-FEET
     - type: SuitSensor
       randomMode: false
       mode: SensorOff
diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
index 810ada5429d..16532c03e67 100644
--- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
@@ -10,7 +10,7 @@
     tags:
       - WhitelistChameleon
   - type: StaticPrice
-    price: 15
+    price: 10
   - type: Clothing
     equipDelay: 0.5
     unequipDelay: 0.5
diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index a8e28a1ef73..096e88bcb6f 100644
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -9,6 +9,7 @@
   - type: SmokeVisuals
   - type: Transform
     anchored: true
+  - type: Clickable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -76,6 +77,9 @@
     animationState: foam-dissolve
   - type: Slippery
   - type: StepTrigger
+  # disabled until foam reagent duplication is fixed
+  #- type: ScoopableSolution
+  #  solution: solutionArea
 
 - type: entity
   id: MetalFoam
@@ -128,9 +132,10 @@
     snap:
     - Wall
   components:
-  - type: Tag
-    tags:
-    - RCDDeconstructWhitelist
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Effects/rcd.yml b/Resources/Prototypes/Entities/Effects/rcd.yml
index adc6aa593c1..902429818e5 100644
--- a/Resources/Prototypes/Entities/Effects/rcd.yml
+++ b/Resources/Prototypes/Entities/Effects/rcd.yml
@@ -1,16 +1,115 @@
 - type: entity
-  id: EffectRCDConstruction
+  id: EffectRCDBase
+  abstract: true
   noSpawn: true
   components:
   - type: Transform
     anchored: True
   - type: Sprite
+    snapCardinals: true
+    noRot: true
     drawdepth: Effects
     sprite: /Textures/Effects/rcd.rsi
-    state: construct
-  - type: TimedDespawn
-    lifetime: 3.2
+    state: construct0
   - type: Tag
     tags:
     - HideContextMenu
   - type: AnimationPlayer
+  
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstructPreview
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstructPreview
+  
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct0
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct0
+  - type: TimedDespawn
+    lifetime: 1.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct1
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct1
+  - type: TimedDespawn
+    lifetime: 2.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct2
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct2
+  - type: TimedDespawn
+    lifetime: 3.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct3
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct3
+  - type: TimedDespawn
+    lifetime: 4.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct4
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct4
+  - type: TimedDespawn
+    lifetime: 5.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct2
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct2
+  - type: TimedDespawn
+    lifetime: 3.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct4
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct4
+  - type: TimedDespawn
+    lifetime: 5.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct6
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct6
+  - type: TimedDespawn
+    lifetime: 7.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct8
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct8
+  - type: TimedDespawn
+    lifetime: 9.2
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
index 11042146689..ff9e5124328 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -19,6 +19,7 @@
       - DrinkAloe
       - DrinkAndalusia
       - DrinkAntifreeze
+      - DrinkArnoldPalmer
       - DrinkB52Glass
       - DrinkBahamaMama
       - DrinkBananaHonkGlass
@@ -27,12 +28,15 @@
       - DrinkBerryJuice
       - DrinkBlackRussianGlass
       - DrinkBlueCuracaoGlass
+      - DrinkBlueHawaiianGlass
       - DrinkBloodyMaryGlass
       - DrinkBooger
       - DrinkBraveBullGlass
       - DrinkCarrotJuice
+      - DrinkCoconutRum
       - DrinkChocolateGlass
       - DrinkCognacGlass
+      - DrinkCosmopolitan
       - DrinkCubaLibreGlass
       - DrinkDeadRumGlass
       - DrinkDevilsKiss
@@ -66,15 +70,19 @@
       - DrinkMilkshake
       - DrinkMojito
       - DrinkNTCahors
+      - DrinkPainkillerGlass
       - DrinkPatronGlass
+      - DrinkPinaColadaGlass
       - DrinkPoscaGlass
       - DrinkRedMeadGlass
       - DrinkRewriter
+      - DrinkRoyRogersGlass
       - DrinkRootBeerFloatGlass
       - DrinkRumGlass
       - DrinkSakeGlass
       - DrinkSbitenGlass
       - DrinkScrewdriverCocktailGlass
+      - DrinkShirleyTempleGlass
       - DrinkSuiDreamGlass
       - DrinkSingulo
       - DrinkSoyLatte
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
index c8a941c1281..e3339082b34 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
@@ -31,6 +31,7 @@
       - DrinkDrGibbCan
       - DrinkEnergyDrinkCan
       - DrinkShamblersJuiceCan
+      - DrinkSolDryCan
       - DrinkPwrGameCan
       - DrinkHotCoco
       - DrinkHotCoffee
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
index 883182aae8d..ae7e5bcf762 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
@@ -44,7 +44,6 @@
         - CrateMaterialPlastic
         - CrateMaterialWood
         - CrateMaterialPlasteel
-        - CrateFunSprayPaints
         - CrateFunArtSupplies
         - CrateEngineeringCableLV
         - CrateEngineeringCableMV
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 10fb034d0d5..4c820998ea2 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -66,6 +66,8 @@
         - ClothingUniformJumpsuitPirate
         - ClothingShoesBootsCowboyFancy
         - ClothingHeadHatCowboyBountyHunter
+        - ClothingNeckAutismPin
+        - ClothingNeckGoldAutismPin
       rareChance: 0.01
       prototypes:
         - Lighter
@@ -78,7 +80,7 @@
         - ClothingHeadHatCone
         - ClothingNeckBling
         - ClothingHeadHelmetCosmonaut
-        - ClothingHeadHelmetScaf
+        - ClothingHeadHelmetBasic
         - ClothingShoeSlippersDuck
         - ClothingUnderSocksBee
         - ClothingUnderSocksCoder
@@ -174,12 +176,7 @@
         - MaterialCloth10
         - MaterialWoodPlank10
         - ResearchDisk
-        - DeathPaint
         - Plunger
-        - SprayPaintBlue
-        - SprayPaintRed
-        - SprayPaintGreen
-        - SprayPaintOrange
         - TechnologyDisk
         - PowerCellMedium
         - PowerCellSmall
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index eba1e300edf..d12b85cde41 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -36,6 +36,7 @@
         - PlushieMoth
         - PlushieMothRandom # Nyanotrasen Random Moth Plushies
         - PlushieArachind
+        - PlushieArachne
       chance: 0.5
       offset: 0.2
 
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
index 20a42d721f6..27852ff1b5b 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -563,6 +563,18 @@
       - state: green
       - state: ertleader
 
+- type: entity
+  id: SpawnPointERTChaplain
+  parent: SpawnPointJobBase
+  name: ERTchaplain
+  components:
+  - type: SpawnPoint
+    job_id: ERTChaplain
+  - type: Sprite
+    layers:
+      - state: green
+      - state: chaplain
+
 - type: entity
   id: SpawnPointERTEngineer
   parent: SpawnPointJobBase
diff --git a/Resources/Prototypes/Entities/Markers/construction_ghost.yml b/Resources/Prototypes/Entities/Markers/construction_ghost.yml
index d198ebdd51f..be9cc915d91 100644
--- a/Resources/Prototypes/Entities/Markers/construction_ghost.yml
+++ b/Resources/Prototypes/Entities/Markers/construction_ghost.yml
@@ -7,4 +7,4 @@
     color: '#3F38'
   - type: ConstructionGhost
   - type: Clickable
-  - type: InteractionOutline
+  - type: InteractionOutline
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
index c68075dc508..3ca7a78b398 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
@@ -1,8 +1,8 @@
 - type: marking
   id: GauzeLefteyePatch
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -13,10 +13,10 @@
     state: gauze_lefteye_2
 
 - type: marking
-  id: GauzeLefteyeTape
+  id: GauzeLefteyePad
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -29,8 +29,8 @@
 - type: marking
   id: GauzeRighteyePatch
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -41,10 +41,10 @@
     state: gauze_righteye_2
 
 - type: marking
-  id: GauzeRighteyeTape
+  id: GauzeRighteyePad
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -57,8 +57,8 @@
 - type: marking
   id: GauzeBlindfold
   bodyPart: Eyes
-  markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin
   coloring:
     default:
       type:
@@ -71,8 +71,8 @@
 - type: marking
   id: GauzeShoulder
   bodyPart: Chest
-  markingCategory: Chest
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -85,8 +85,8 @@
 - type: marking
   id: GauzeStomach
   bodyPart: Chest
-  markingCategory: Chest
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -99,8 +99,8 @@
 - type: marking
   id: GauzeUpperArmRight
   bodyPart: RArm
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -113,8 +113,8 @@
 - type: marking
   id: GauzeLowerArmRight
   bodyPart: RArm, RHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -127,8 +127,8 @@
 - type: marking
   id: GauzeLeftArm
   bodyPart: LArm, LHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -141,8 +141,8 @@
 - type: marking
   id: GauzeLowerLegLeft
   bodyPart: LFoot
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -155,8 +155,8 @@
 - type: marking
   id: GauzeUpperLegLeft
   bodyPart: LLeg
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -169,8 +169,8 @@
 - type: marking
   id: GauzeUpperLegRight
   bodyPart: RLeg
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -183,8 +183,8 @@
 - type: marking
   id: GauzeLowerLegRight
   bodyPart: RFoot
-  markingCategory: Legs
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -197,8 +197,8 @@
 - type: marking
   id: GauzeBoxerWrapRight
   bodyPart: RHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -211,8 +211,8 @@
 - type: marking
   id: GauzeBoxerWrapLeft
   bodyPart: LHand
-  markingCategory: Arms
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
     default:
       type:
@@ -226,7 +226,7 @@
 - type: marking
   id: GauzeLizardLefteyePatch
   bodyPart: Eyes
-  markingCategory: Head
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -235,12 +235,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardlefteye
+    state: gauze_lizard_lefteye
 
 - type: marking
   id: GauzeLizardRighteyePatch
   bodyPart: Eyes
-  markingCategory: Head
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -249,12 +249,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardrighteye
+    state: gauze_lizard_righteye
 
 - type: marking
   id: GauzeLizardFootRight
   bodyPart: RFoot
-  markingCategory: Legs
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -263,12 +263,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardfoot_r
+    state: gauze_lizard_foot_r
 
 - type: marking
   id: GauzeLizardFootLeft
   bodyPart: LFoot
-  markingCategory: Legs
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -277,12 +277,12 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardfoot_l
+    state: gauze_lizard_foot_l
 
 - type: marking
   id: GauzeLizardBlindfold
   bodyPart: Eyes
-  markingCategory: Head
+  markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
     default:
@@ -291,4 +291,187 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_lizardblindfold
+    state: gauze_lizard_blindfold
+
+# Moth Specific Markings
+- type: marking
+  id: GauzeMothBlindfold
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_blindfold
+
+- type: marking
+  id: GauzeMothShoulder
+  bodyPart: Chest
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_shoulder
+
+- type: marking
+  id: GauzeMothStomach
+  bodyPart: Chest
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_abdomen
+
+- type: marking
+  id: GauzeMothLeftEyePatch
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lefteye_2
+
+- type: marking
+  id: GauzeMothLeftEyePad
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lefteye_1
+
+- type: marking
+  id: GauzeMothRightEyePatch
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_righteye_2
+
+- type: marking
+  id: GauzeMothRightEyePad
+  bodyPart: Eyes
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_righteye_1
+
+- type: marking
+  id: GauzeMothUpperArmRight
+  bodyPart: RArm
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperarm_r
+
+- type: marking
+  id: GauzeMothUpperArmLeft
+  bodyPart: LArm
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperarm_l
+
+- type: marking
+  id: GauzeMothUpperLegRight
+  bodyPart: RLeg
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperleg_r
+
+- type: marking
+  id: GauzeMothUpperLegLeft
+  bodyPart: LLeg
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_upperleg_l
+
+- type: marking
+  id: GauzeMothLowerLegRight
+  bodyPart: RFoot
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lowerleg_r
+
+- type: marking
+  id: GauzeMothLowerLegLeft
+  bodyPart: LFoot
+  markingCategory: Overlay
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_lowerleg_l
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 0645e451af2..eba1253dde4 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseMob
   id: BaseBorgChassis
   name: cyborg
@@ -83,6 +83,7 @@
     templateId: borg
   - type: Hands
     showInHands: false
+    disableExplosionRecursion: true
   - type: IntrinsicRadioReceiver
   - type: IntrinsicRadioTransmitter
     channels:
@@ -101,8 +102,6 @@
   - type: BorgChassis
   - type: WiresPanel
   - type: ActivatableUIRequiresPanel
-  - type: Wires
-    layoutId: Borg
   - type: NameIdentifier
     group: Silicon
   - type: ContainerContainer
@@ -131,6 +130,9 @@
   - type: Speech
     speechVerb: Robotic
     speechSounds: Pai
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSilicon
   - type: UnblockableSpeech
   - type: Construction
     graph: Cyborg
@@ -140,6 +142,7 @@
   - type: Lock
     locked: true
   - type: ActivatableUIRequiresLock
+  - type: LockedWiresPanel
   - type: Flashable
   - type: Damageable
     damageContainer: Silicon
@@ -213,13 +216,14 @@
     visMask:
       - PsionicInvisibility
       - Normal
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - RobotTalk
     understands:
     - GalacticCommon
     - RobotTalk
+  - type: CanWalk
 
 - type: entity
   id: BaseBorgChassisNT
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 6191e612505..5056fda4c06 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -119,7 +119,7 @@
   - type: Inventory
     templateId: borgShort
   - type: SiliconLawProvider # Delta-V - Adds custom lawset for Engineering Cyborg
-    laws: Engineer 
+    laws: Engineer
 
 - type: entity
   id: BorgChassisJanitor
@@ -224,7 +224,10 @@
     access: [["Medical"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgDutch
-  - type: FabricateCandy # Nyanotrasen - The medical cyborg can generate candies filled with medicine.
+  - type: FabricateActions
+    actions:
+    - ActionFabricateLollipop
+    - ActionFabricateGumball
   - type: SiliconLawProvider # Delta-V - Adds custom lawset for Medical cyborg
     laws: Medical
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index e311681ce5f..7f3b1cae588 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -13,6 +13,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: bat
       sprite: Mobs/Animals/bat.rsi
+  - type: Carriable
   - type: Speech
     speechSounds: Squeak
     speechVerb: SmallMob
@@ -22,7 +23,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.25
-        density: 10
+        density: 0.8
         mask:
         - FlyingMobMask
         layer:
@@ -48,7 +49,7 @@
     flavorKind: station-event-random-sentience-flavor-organic
   - type: Bloodstream
     bloodMaxVolume: 50
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
@@ -88,7 +89,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.1
-        density: 30
+        density: 0.1
         mask:
         - FlyingMobMask
         layer:
@@ -188,6 +189,8 @@
     noMovementLayers:
       movement:
         state: chicken-0
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Fixtures
     fixtures:
       fix1:
@@ -240,7 +243,7 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Chicken
     understands:
@@ -343,7 +346,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.2
-        density: 100
+        density: 0.0007
         mask:
         - SmallMobMask
         layer:
@@ -438,7 +441,6 @@
     makeSentient: true
     allowSpeech: true
     allowMovement: true
-    whitelistRequired: false
     name: ghost-role-information-mothroach-name
     description: ghost-role-information-mothroach-description
   - type: Fixtures
@@ -447,7 +449,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.2
-        density: 120
+        density: 0.007
         mask:
         - SmallMobMask
         layer:
@@ -519,7 +521,7 @@
       prob: 0.5
   - type: Extractable
     grindableSolutionName: food
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Moffic
     understands:
@@ -556,6 +558,13 @@
         damage: 60
       behaviors:
       - !type:GibBehavior { }
+  - type: FireVisuals
+    sprite: Mobs/Effects/onfire.rsi
+    normalState: Mouse_burning
+
+
+# Note that the mallard duck is actually a male drake mallard, with the brown duck being the female variant of the same species, however ss14 lacks sex specific textures
+# The white duck is more akin to a pekin or call duck.
 
 - type: entity
   name: mallard duck #Quack
@@ -580,6 +589,8 @@
         - MobMask
         layer:
         - MobLayer
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Tag
     tags:
     - DoorBumpOpener
@@ -619,7 +630,7 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Duck
     understands:
@@ -779,9 +790,8 @@
           Quantity: 30
   - type: Udder
     reagentId: Milk
-    targetSolution: udder
-    quantity: 25
-    updateRate: 30
+    quantityPerUpdate: 25
+    growthDelay: 30
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -840,6 +850,8 @@
     noMovementLayers:
       movement:
         state: crab
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -872,7 +884,7 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Voice/Arachnid/arachnid_chitter.ogg
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Crab
     understands:
@@ -907,6 +919,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: goat
       sprite: Mobs/Animals/goat.rsi
+  - type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
@@ -951,9 +964,8 @@
         maxVol: 250
   - type: Udder
     reagentId: MilkGoat
-    targetSolution: udder
-    quantity: 25
-    updateRate: 20
+    quantityPerUpdate: 25
+    growthDelay: 20
   - type: Wooly
   - type: Food
     solution: wool
@@ -999,6 +1011,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: goose
       sprite: Mobs/Animals/goose.rsi
+  - type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
@@ -1118,7 +1131,7 @@
   - type: Inventory
     speciesId: kangaroo
     templateId: kangaroo
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Kangaroo
     understands:
@@ -1245,6 +1258,7 @@
       sprite: "Effects/creampie.rsi"
       state: "creampie_human"
       visible: false
+  - type: Carriable
   - type: Hands
   - type: GenericVisualizer
     visuals:
@@ -1299,6 +1313,7 @@
     tags:
     - VimPilot
     - DoorBumpOpener
+  - type: CanWalk
 
 - type: entity
   name: monkey
@@ -1311,7 +1326,7 @@
   - type: Speech
     speechSounds: Monkey
     speechVerb: Monkey
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Monkey
     understands:
@@ -1350,7 +1365,7 @@
   - type: Speech
     speechSounds: Monkey
     speechVerb: Monkey
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Monkey
     understands:
@@ -1395,7 +1410,7 @@
   - type: NameIdentifier
     group: Kobold
   - type: LizardAccent
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Kobold
     understands:
@@ -1570,7 +1585,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.2
-        density: 100
+        density: 0.76
         mask:
         - SmallMobMask
         layer:
@@ -1630,7 +1645,7 @@
     spawned:
     - id: FoodMeatRat
       amount: 1
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
@@ -1672,6 +1687,9 @@
   - type: PreventSpiller
   - type: RandomBark
     barkMultiplier: 0.3
+  - type: FireVisuals
+    sprite: Mobs/Effects/onfire.rsi
+    normalState: Mouse_burning
 
 - type: entity
   parent: MobMouse
@@ -1767,6 +1785,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: lizard
       sprite: Mobs/Animals/lizard.rsi
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -1821,6 +1840,8 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: slug
       sprite: Mobs/Animals/slug.rsi
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -1873,6 +1894,7 @@
     noMovementLayers:
       movement:
         state: frog
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -1936,6 +1958,8 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: parrot
       sprite: Mobs/Animals/parrot.rsi
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Fixtures
     fixtures:
       fix1:
@@ -1973,7 +1997,7 @@
       path: /Audio/Animals/parrot_raught.ogg
   - type: Bloodstream
     bloodMaxVolume: 50
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     understands:
@@ -1991,6 +2015,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: penguin
       sprite: Mobs/Animals/penguin.rsi
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2124,6 +2149,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: snake
       sprite: Mobs/Animals/snake.rsi
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2186,6 +2212,7 @@
     noMovementLayers:
       movement:
         state: tarantula
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2236,7 +2263,7 @@
   - type: MeleeChemicalInjector
     transferAmount: 0.75
     solution: melee
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Xeno
     understands:
@@ -2371,6 +2398,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: possum
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2446,6 +2474,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: raccoon
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2510,6 +2539,7 @@
     noMovementLayers:
       movement:
         state: fox
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2517,7 +2547,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 50 #They actually are pretty light, I looked it up
+        density: 16.66
         mask:
         - MobMask
         layer:
@@ -2572,7 +2602,7 @@
   - type: Tag
     tags:
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Fox
     understands:
@@ -2590,6 +2620,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: corgi
+  - type: Carriable
   - type: Physics
   - type: Speech
     speechVerb: Canine
@@ -2599,7 +2630,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 50
+        density: 25.5
         mask:
         - MobMask
         layer:
@@ -2623,7 +2654,7 @@
     spawned:
     - id: FoodMeat
       amount: 2
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Dog
     understands:
@@ -2746,6 +2777,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2753,7 +2785,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 15
+        density: 9
         mask:
         - MobMask
         layer:
@@ -2780,7 +2812,7 @@
     spawned:
     - id: FoodMeat
       amount: 3
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Cat
     understands:
@@ -2852,7 +2884,7 @@
   - type: NpcFactionMember
     factions:
     - Syndicate
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Xeno
     understands:
@@ -2906,6 +2938,17 @@
         Base: caracal_flop
       Dead:
         Base: caracal_dead
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 30
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
 
 - type: entity
   name: kitten
@@ -2925,6 +2968,8 @@
         Base: kitten_dead
       Dead:
         Base: kitten_dead
+  - type: Carriable
+    freeHandsRequired: 1
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -2939,6 +2984,17 @@
     thresholds:
       0: Alive
       25: Dead
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 2
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
 
 - type: entity
   name: sloth
@@ -2955,6 +3011,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: sloth
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -3016,6 +3073,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: ferret
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -3023,7 +3081,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 5
+        density: 4
         mask:
         - MobMask
         layer:
@@ -3100,7 +3158,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.2
-        density: 120
+        density: 0.8
         mask:
         - SmallMobMask
         layer:
@@ -3157,7 +3215,7 @@
     spawned:
     - id: FoodMeat
       amount: 1
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
@@ -3198,12 +3256,15 @@
   - type: Bloodstream
     bloodMaxVolume: 60
   - type: CanEscapeInventory
-    BaseResistTime: 3
+    baseResistTime: 3
   - type: MobPrice
     price: 60
   - type: NonSpreaderZombie
   - type: RandomBark
     barkMultiplier: 0.45
+  - type: FireVisuals
+    sprite: Mobs/Effects/onfire.rsi
+    normalState: Mouse_burning
 
 - type: entity
   name: pig
@@ -3217,13 +3278,14 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: pig
       sprite: Mobs/Animals/pig.rsi
+  - type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 250
+        density: 750
         mask:
         - MobMask
         layer:
@@ -3269,7 +3331,7 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Animals/pig_oink.ogg
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Pig
     understands:
@@ -3292,6 +3354,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: nymph
       sprite: Mobs/Animals/nymph.rsi
+  - type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -3299,7 +3362,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 100 # High, because wood is heavy.
+        density: 15
         mask:
         - MobMask
         layer:
@@ -3310,7 +3373,7 @@
   - type: InventorySlots
   - type: Strippable
   - type: Bloodstream
-    bloodReagent: Water
+    bloodReagent: Sap
     bloodMaxVolume: 60
   - type: UserInterface
     interfaces:
@@ -3359,7 +3422,7 @@
     reformTime: 10
     popupText: diona-reform-attempt
     reformPrototype: MobDionaReformed
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - RootSpeak
     understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
index 3bcf8e7a16f..f8d0497b971 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
@@ -15,7 +15,7 @@
   - type: Sprite
     sprite: Mobs/Aliens/Argocyte/argocyte_common.rsi
   - type: SolutionContainerManager
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Xeno
     understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
index bc63deeac36..8a10337c946 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -84,7 +84,7 @@
         500: Dead
     - type: Metabolizer
       solutionOnBody: false
-      updateFrequency: 0.25
+      updateInterval: 0.25
       metabolizerTypes: [ Dragon ]
       groups:
         - id: Medicine
@@ -165,7 +165,6 @@
     explosionMaxTileIntensity: 10
   - type: ProjectileAnomaly
     projectilePrototype: ProjectileIcicle
-    targetNonSentientChance: 0.1
   - type: TempAffectingAnomaly
     tempChangePerSecond: -25
     hotspotExposeTemperature: -1000
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 3e6c603626b..787f8ae5427 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -22,6 +22,7 @@
       layers:
       - map: [ "enum.DamageStateVisualLayers.Base" ]
         state: alive
+    - type: Carriable # This one is for you, deltanedas o7
     - type: CombatMode
     - type: Physics
     - type: Fixtures
@@ -70,7 +71,6 @@
       tags:
         - Carp
         - DoorBumpOpener
-        - NoPaint
     - type: ReplacementAccent
       accent: genericAggressive
     - type: Speech
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index 01fce382e37..2515c7880ac 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -229,6 +229,7 @@
   description: It consists of a liquid, and it wants to dissolve you in itself.
   components:
   - type: GhostRole
+    prob: 0
     description: ghost-role-information-angry-slimes-description
   - type: NpcFactionMember
     factions:
@@ -292,6 +293,7 @@
     solution: bloodstream
   - type: DrainableSolution
     solution: bloodstream
+  - type: CanWalk
 
 - type: entity
   name: Reagent Slime Spawner
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
index 75da5cce39e..7c1f2fde4b4 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -48,7 +48,7 @@
       task: SimpleHumanoidHostileCompound
 
 - type: entity
-  name: syndicate footsoldier 
+  name: syndicate footsoldier
   parent: BaseMobHuman
   id: MobSyndicateFootsoldier
   components:
@@ -75,7 +75,7 @@
   save: false # mobs are currently not saveable.
   id: SalvageHumanCorpse
   name: unidentified corpse
-  description: I think he's dead.
+  description: I think they're dead.
   components:
   - type: RandomHumanoidAppearance
     randomizeName: false
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
index 657ac466f84..1f153ff3141 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -1,13 +1,17 @@
 - type: entity
   name: Mimic
   id: MobMimic
-  parent: [ SimpleMobBase, MobCombat ]
   description: Surprise. # When this gets a proper write this should use the object's actual description >:)
   components:
   - type: Tag
     tags:
     - FootstepSound
+  - type: Clickable
+  - type: CombatMode
+  - type: InteractionOutline
   - type: InputMover
+  - type: Input
+    context: "human"
   - type: MobMover
   - type: NpcFactionMember
     factions:
@@ -20,6 +24,7 @@
   - type: Icon
     sprite: Structures/Machines/VendingMachines/cola.rsi
     state: normal
+  - type: Physics
   - type: Fixtures
     fixtures:
       fix1:
@@ -38,6 +43,3 @@
     damage:
       types:
         Blunt: 20
-  - type: MovementSpeedModifier
-    baseWalkSpeed : 1
-    baseSprintSpeed : 1
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 5141811a8ea..6eb43fb89ae 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -36,7 +36,7 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalIan
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Dog
     understands:
@@ -127,7 +127,7 @@
     tags:
     - CannotSuicide
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Cat
     understands:
@@ -151,7 +151,7 @@
     tags:
     - CannotSuicide
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Cat
     understands:
@@ -306,7 +306,7 @@
     spawned:
     - id: FoodMeat
       amount: 2
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Dog
     understands:
@@ -411,7 +411,7 @@
     spawned:
     - id: FoodMeat
       amount: 3
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Dog
     understands:
@@ -576,7 +576,7 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalRenault
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Fox
     understands:
@@ -629,7 +629,7 @@
     - CannotSuicide
     - Hamster
     - VimPilot
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
@@ -807,7 +807,7 @@
     attributes:
       proper: true
       gender: female
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Bubblish
     understands:
@@ -847,7 +847,7 @@
     attributes:
       proper: true
       gender: male
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Monkey
     understands:
@@ -881,7 +881,7 @@
 #  - type: AlwaysRevolutionaryConvertible
   - type: StealTarget
     stealGroup: AnimalTropico
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Crab
     understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 50fe3b6765e..e10bdbcf0ec 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -119,13 +119,14 @@
     attributes:
       gender: male
   - type: PotentialPsionic # Nyano
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Mouse
     understands:
     - GalacticCommon
     - Mouse
+  - type: CanWalk
 
 - type: entity
   id: MobRatKingBuff
@@ -170,6 +171,8 @@
   description: He's da mini rat. He don't make da roolz.
   noSpawn: true #Must be configured to a King or the AI breaks.
   components:
+  - type: Carriable
+    freeHandsRequired: 1
   - type: CombatMode
   - type: MovementSpeedModifier
     baseWalkSpeed : 3.5
@@ -296,12 +299,15 @@
   - type: Food
   - type: Item
     size: Tiny # Delta V - Make them eatable and pickable.
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Mouse
     understands:
     - GalacticCommon
     - Mouse
+  - type: FireVisuals
+    sprite: Mobs/Effects/onfire.rsi
+    normalState: Mouse_burning
 
 - type: weightedRandomEntity
   id: RatKingLoot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 1316aefc50b..1c6bda6fd3c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -98,6 +98,3 @@
   - type: Speech
     speechVerb: Ghost
   - type: UniversalLanguageSpeaker
-  - type: Tag
-    tags:
-      - NoPaint
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
index 9559ae3a0c0..08cb776c530 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
@@ -50,7 +50,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat
   - type: Physics
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Cat
     understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index e3166c15f6e..bc9a18b0210 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -60,7 +60,6 @@
   - type: NameIdentifier
     group: GenericNumber
   - type: Repairable
-    fuelcost: 15
     doAfterDelay: 8
   - type: Pullable
   - type: Tag
@@ -107,7 +106,7 @@
   - type: TypingIndicator
     proto: robot
   - type: ZombieImmune
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - RobotTalk
@@ -122,11 +121,16 @@
   description: Horrifying.
   components:
   - type: SpamEmitSound
+    minInterval: 2
+    maxInterval: 12
     sound:
       collection: BikeHorn
   - type: Sprite
     sprite: Mobs/Silicon/Bots/honkbot.rsi
     state: honkbot
+  - type: HTN
+    rootTask:
+      task: HonkbotCompound
   - type: Slippery
     launchForwardsMultiplier: 2
   - type: Speech
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 901bf149cbc..3735bcc4eca 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: basic slime
   id: MobAdultSlimes
   parent: [ SimpleMobBase, MobCombat ]
@@ -17,6 +17,7 @@
     layers:
     - map: [ "enum.DamageStateVisualLayers.Base" ]
       state: blue_adult_slime
+  - type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
@@ -86,7 +87,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaled: true
+        scaleByQuantity: true
         damage:
           types:
             Heat: 3
@@ -111,7 +112,7 @@
     successChance: 0.5
     interactSuccessString: petting-success-slimes
     interactFailureString: petting-failure-generic
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Bubblish
     understands:
@@ -127,6 +128,7 @@
     speechSounds: Slime
   - type: TypingIndicator
     proto: slime
+  - type: CanWalk
 
 - type: entity
   name: blue slime
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 9ea2d784dbb..adf3af93eab 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: basic
   id: MobSpaceBasic
   parent: SimpleSpaceMobBase
@@ -165,7 +165,7 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepBounce
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Kangaroo
     understands:
@@ -251,7 +251,7 @@
   - type: MeleeChemicalInjector
     solution: melee
     transferAmount: 4
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Xeno
     understands:
@@ -357,7 +357,7 @@
     - type: MeleeChemicalInjector
       solution: melee
       transferAmount: 6
-    - type: LanguageSpeaker
+    - type: LanguageKnowledge
       speaks:
       - Xeno
       understands:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 26553a2f1f2..397989643e6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -125,7 +125,7 @@
     chance: -2
   - type: Psionic #Nyano - Summary: makes psionic by default.
     removable: false
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - Xeno
     understands:
@@ -239,7 +239,7 @@
   - type: Tag
     tags:
     - CannotSuicide
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Xeno
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 80e87d3670c..6291fd23335 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -75,8 +75,6 @@
     followEntity: true
   - type: CargoOrderConsole
   - type: CrewMonitoringConsole
-    snap: false
-    precision: 3
   - type: GeneralStationRecordConsole
   - type: DeviceNetwork
     deviceNetId: Wireless
@@ -85,8 +83,8 @@
     range: 500
   - type: StationLimitedNetwork
   - type: Thieving
-    stripTimeReduction: 9999
-    stealthy: true
+    stripTimeMultiplier: 0
+    ignoreStripHidden: true
   - type: Stripping
   - type: SolutionScanner
   - type: IgnoreUIRange
diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
deleted file mode 100644
index c1653c49b03..00000000000
--- a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- type: entity
-  save: false
-  name: Urist McWeb
-  parent: BaseMobArachnid
-  id: MobArachnid
-  components:
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 1.5 # This makes space and crit more lethal to arachnids.
-    damageRecovery:
-      types:
-        Asphyxiation: -0.5
-  #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index aa10a631b54..0eda8ae9d76 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -85,9 +85,13 @@
       0: Alive
       450: Critical
       500: Dead
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      250: 0.7
+      400: 0.5
   - type: Metabolizer
     solutionOnBody: false
-    updateFrequency: 0.25
+    updateInterval: 0.25
     metabolizerTypes: [ Dragon ]
     groups:
     - id: Medicine
@@ -125,14 +129,13 @@
   - type: Tag
     tags:
     - CannotSuicide
+    - DoorBumpOpener
 
 - type: entity
   parent: BaseMobDragon
   id: MobDragon
   components:
   - type: Dragon
-    spawnsLeft: 2
-    spawnsProto: MobCarpDragon
     spawnRiftAction: ActionSpawnRift
   - type: GenericAntag
     rule: Dragon
diff --git a/Resources/Prototypes/Entities/Mobs/Player/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Player/gingerbread.yml
deleted file mode 100644
index 18ff8381d4f..00000000000
--- a/Resources/Prototypes/Entities/Mobs/Player/gingerbread.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: entity
-  save: false
-  name: Urist McCookie
-  parent: BaseMobGingerbread
-  id: MobGingerbread
-  components:
-    - type: Respirator
-      damage:
-        types:
-          Asphyxiation: 0.5
-      damageRecovery:
-        types:
-          Asphyxiation: -1.0
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 9f0d54ee64a..ae4a370f9d1 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -66,7 +66,7 @@
           mask:
             - FlyingMobMask
           layer:
-            - FlyingMobLayer
+            - Opaque
     - type: Damageable
       damageContainer: Biological
     - type: MobState
@@ -86,6 +86,8 @@
       animation: WeaponArcFist
       attackRate: 1.8
       autoAttack: true
+      soundHit:
+        collection: Punch
       damage:
         types:
           Blunt: 20
@@ -104,7 +106,6 @@
     - type: Tag
       tags:
         - CannotSuicide
-        - NoPaint
 
 # From the uplink injector
 - type: entity
@@ -213,7 +214,6 @@
       tags:
         - CannotSuicide
         - FootstepSound
-        - NoPaint
     - type: Inventory
       templateId: holoclown
     - type: Hands
@@ -229,6 +229,8 @@
       angle: 30
       animation: WeaponArcFist
       attackRate: 1.8
+      soundHit:
+        collection: BikeHorn
       damage:
         types:
           Blunt: 5
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index 223f9986a12..52446ae8fa8 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -119,6 +119,66 @@
       prototypes: [ ERTLeaderGearEVALecter ]
     - type: InitialInfectedExempt
 
+## ERT Chaplain
+
+- type: entity
+  id: RandomHumanoidSpawnerERTChaplain
+  parent: RandomHumanoidSpawnerERTLeader
+  name: ERT chaplain
+  suffix: ERTRole, Basic
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: chaplain #needs an ERT variant once a good suit it made.
+    - type: RandomMetadata
+      nameSegments:
+      - NamesFirstMilitary
+      - NamesLastMilitary
+    - type: RandomHumanoidSpawner
+      settings: ERTChaplain
+
+- type: randomHumanoidSettings
+  id: ERTChaplain
+  parent: ERTLeader
+  components:
+    - type: MindShield
+    - type: GhostRole
+      name: ghost-role-information-ert-chaplain-name
+      description: ghost-role-information-ert-chaplain-description
+    - type: GhostTakeoverAvailable
+    - type: RandomMetadata
+      nameSegments:
+      - NamesFirstMilitary
+      - NamesLastMilitary
+    - type: Loadout
+      prototypes: [ ERTChaplainGear ]
+    - type: InitialInfectedExempt
+
+- type: entity
+  id: RandomHumanoidSpawnerERTChaplainEVA
+  parent: RandomHumanoidSpawnerERTChaplain
+  name: ERT chaplain
+  suffix: ERTRole, Enviro EVA
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: chaplain #needs an ERT variant once a good suit it made.
+    - type: RandomHumanoidSpawner
+      settings: ERTChaplainEVA
+
+- type: randomHumanoidSettings
+  id: ERTChaplainEVA
+  parent: ERTChaplain
+  components:
+    - type: MindShield
+    - type: GhostRole
+      name: ghost-role-information-ert-chaplain-name
+      description: ghost-role-information-ert-chaplain-description
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ERTChaplainGearEVA ]
+    - type: InitialInfectedExempt
+
 ## ERT Janitor
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
deleted file mode 100644
index ea01677626d..00000000000
--- a/Resources/Prototypes/Entities/Mobs/Player/moth.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: entity
-  save: false
-  name: Urist McFluff
-  parent: BaseMobMoth
-  id: MobMoth
diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
deleted file mode 100644
index 4e5974b3084..00000000000
--- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: entity
-  save: false
-  parent: BaseMobSlimePerson
-  id: MobSlimePerson
diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
deleted file mode 100644
index de1e3da2be7..00000000000
--- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: entity
-  save: false
-  name: Vox
-  parent: BaseMobVox
-  id: MobVox
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
deleted file mode 100644
index c135ac2b829..00000000000
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ /dev/null
@@ -1,135 +0,0 @@
-- type: entity
-  save: false
-  name: Urist McWebs
-  parent: BaseMobSpeciesOrganic
-  id: BaseMobArachnid
-  abstract: true
-  components:
-  - type: Body
-    prototype: Arachnid
-    requiredLegs: 2 # It would be funny if arachnids could use their little back limbs to move around once they lose their legs, but just something to consider post-woundmed
-  - type: HumanoidAppearance
-    species: Arachnid
-  - type: Hunger
-    baseDecayRate: 0.0125 # Spiders have slow metabolisms all things considered, so I decided to just make their hunger drain slower.
-  - type: Carriable # Carrying system from nyanotrasen.
-  - type: Thirst
-  - type: Sericulture
-    action: ActionSericulture
-    productionLength: 2
-    entityProduced: MaterialWebSilk1
-    hungerCost: 4 # Should total to 25 total silk on full hunger
-  - type: Tag
-    tags:
-    - CanPilot
-    - FootstepSound
-    - DoorBumpOpener
-    - SpiderCraft
-  - type: Butcherable
-    butcheringType: Spike
-    spawned:
-      - id: FoodMeatSpider
-        amount: 5
-  - type: Inventory
-    templateId: arachnid
-  - type: Reactive
-    reactions:
-    - reagents: [Water]
-      methods: [Touch]
-      effects:
-      - !type:WearableReaction
-        slot: head
-        prototypeID: WaterDropletHat
-    - reagents: [Water, SpaceCleaner]
-      methods: [Touch]
-      effects:
-      - !type:WashCreamPieReaction
-  # Damage (Self)
-  - type: Bloodstream
-    bloodReagent: CopperBlood
-  # Damage (Others)
-  - type: MeleeWeapon
-    animation: WeaponArcBite
-    soundHit:
-      path: /Audio/Effects/bite.ogg
-    damage:
-      types:
-        Piercing: 5
-  # Visual & Audio
-  - type: DamageVisuals
-    damageOverlayGroups:
-      Brute:
-        sprite: Mobs/Effects/brute_damage.rsi
-        color: "#162581"
-  - type: Speech
-    speechVerb: Arachnid
-    speechSounds: Arachnid
-  - type: Vocal
-    sounds:
-      Male: UnisexArachnid
-      Female: UnisexArachnid
-      Unsexed: UnisexArachnid
-  - type: TypingIndicator
-    proto: spider
-  - type: Sprite # I'd prefer if these maps were better. Insert map pun here.
-    layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
-      - map: [ "enum.HumanoidVisualLayers.Snout" ]
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-      - shader: StencilClear
-        sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115
-        # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear.
-        # sprite refactor when
-        state: l_leg
-      - shader: StencilMask
-        map: ["enum.HumanoidVisualLayers.StencilMask"]
-        sprite: Mobs/Customization/masking_helpers.rsi
-        state: unisex_full
-        visible: false
-      - map: ["jumpsuit"]
-      - map: ["enum.HumanoidVisualLayers.LFoot"]
-      - map: ["enum.HumanoidVisualLayers.RFoot"]
-      - map: ["enum.HumanoidVisualLayers.LHand"]
-      - map: ["enum.HumanoidVisualLayers.RHand"]
-      - map: [ "gloves" ]
-      - map: [ "shoes" ]
-      - map: [ "ears" ]
-      - map: [ "outerClothing" ]
-      - map: [ "eyes" ]
-      - map: [ "belt" ]
-      - map: [ "id" ]
-      - map: [ "enum.HumanoidVisualLayers.Tail" ] # Mentioned in moth code: This needs renaming lol.
-      - map: [ "neck" ]
-      - map: [ "back" ]
-      - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-      - map: [ "enum.HumanoidVisualLayers.Hair" ] # Do these need to be here? (arachnid hair arachnid hair)
-      - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
-      - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-      - map: [ "mask" ]
-      - map: [ "head" ]
-      - map: [ "pocket1" ]
-      - map: [ "pocket2" ]
-      - map: ["enum.HumanoidVisualLayers.Handcuffs"]
-        color: "#ffffff"
-        sprite: Objects/Misc/handcuffs.rsi
-        state: body-overlay-2
-        visible: false
-      - map: [ "clownedon" ] # Dynamically generated
-        sprite: "Effects/creampie.rsi"
-        state: "creampie_arachnid"
-        visible: false
-
-- type: entity
-  parent: BaseSpeciesDummy
-  id: MobArachnidDummy
-  noSpawn: true
-  components:
-  - type: HumanoidAppearance
-    species: Arachnid
-
-#88w88
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index f9bc0f1f90e..9e7e8921ddc 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -188,7 +188,7 @@
   - type: CanHostGuardian
   - type: NpcFactionMember
     factions:
-    - Wastelander
+    - NanoTrasen
   - type: CreamPied
   - type: Stripping
   - type: Strippable
@@ -219,7 +219,7 @@
     price: 1500 # Kidnapping a living person and selling them for cred is a good move.
     deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less.
   - type: CanEscapeInventory # Carrying system from nyanotrasen.
-  - type: LanguageSpeaker # This is here so all with no LanguageSpeaker at least spawn with the default languages.
+  - type: LanguageKnowledge # This is here so even if species doesn't have a defined language, they at least speak GC
     speaks:
     - GalacticCommon
     understands:
@@ -229,6 +229,7 @@
     - CanPilot
     - FootstepSound
     - DoorBumpOpener
+  - type: CanWalk
 
 - type: entity
   save: false
@@ -311,6 +312,8 @@
         Asphyxiation: -1.0
   - type: FireVisuals
     alternateState: Standing
+  - type: OfferItem
+  - type: LayingDown
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index 5cb3de6f168..e1628c620a2 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -25,14 +25,14 @@
     damageOverlayGroups:
       Brute:
         sprite: Mobs/Effects/brute_damage.rsi
-        color: "#75b1f0"
+        color: "#cd7314"
   - type: Butcherable
     butcheringType: Spike
     spawned:
       - id: FoodMeatPlant
         amount: 5
   - type: Bloodstream
-    bloodReagent: Water
+    bloodReagent: Sap
   - type: Reactive
     groups:
       Flammable: [ Touch ]
@@ -47,7 +47,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaled: true
+        scaleByQuantity: true
         damage:
           types:
             Blunt: 2
@@ -62,7 +62,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaled: true
+        scaleByQuantity: true
         damage:
           types:
             Poison: 5
@@ -102,7 +102,7 @@
     actionPrototype: DionaGibAction
     allowedStates:
     - Dead
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - RootSpeak
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index 82fe8831471..b38ea2634fd 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -7,7 +7,7 @@
   components:
   - type: Hunger
   - type: Thirst
-  - type: Carriable
+  - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon
     sprite: Mobs/Species/Slime/parts.rsi # It was like this beforehand, no idea why.
     state: full
@@ -47,9 +47,11 @@
       Male: UnisexDwarf
       Female: FemaleDwarf
       Unsexed: UnisexDwarf
+  - type: ReplacementAccent
+    accent: dwarf
   - type: Speech
     speechSounds: Bass
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - SolCommon
diff --git a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
deleted file mode 100644
index c514a6f1a05..00000000000
--- a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: entity
-  save: false
-  name: Urist McCookie
-  parent: BaseMobSpeciesOrganic
-  id: BaseMobGingerbread
-  abstract: true
-  components:
-  - type: HumanoidAppearance
-    species: Gingerbread
-  - type: Icon
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: full
-  - type: Body
-    prototype: Gingerbread
-    requiredLegs: 2
-  - type: Damageable
-    damageContainer: Biological
-    damageModifierSet: Gingerbread
-  - type: DamageVisuals
-    damageOverlayGroups:
-      Brute:
-        sprite: Mobs/Effects/brute_damage.rsi
-        color: "#896e55"
-  - type: Butcherable
-    butcheringType: Spike
-    spawned:
-      - id: FoodBakedCookie #should be replaced with gingerbread sheets or something... provided you're willing to make a full spriteset of those.
-        amount: 5
-  - type: Bloodstream
-    bloodReagent: Sugar
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.35
-        density: 100 #fairly light
-        restitution: 0.0
-        mask:
-          - MobMask
-        layer:
-          - MobLayer
-
-- type: entity
-  parent: BaseSpeciesDummy
-  id: MobGingerbreadDummy
-  noSpawn: true
-  components:
-  - type: HumanoidAppearance
-    species: Gingerbread
diff --git a/Resources/Prototypes/Entities/Mobs/Species/golem.yml b/Resources/Prototypes/Entities/Mobs/Species/golem.yml
deleted file mode 100644
index a746c4e074a..00000000000
--- a/Resources/Prototypes/Entities/Mobs/Species/golem.yml
+++ /dev/null
@@ -1,461 +0,0 @@
-# - type: entity
-#   name: Urist McGolem
-#   id: MobGolemBase
-#   save: false
-#   abstract: true
-#   description: An artificial construct imitating life. This one has no soul installed yet.
-#   components:
-#   - type: Sprite
-#     noRot: true
-#     drawdepth: Mobs
-#     layers:
-#     - map: [ "enum.HumanoidVisualLayers.Chest" ]
-#       color: "#e8b59b"
-#       sprite: Nyanotrasen/Mobs/Species/Golem/cult.rsi
-#       state: cultgolem_chest
-#     - map: [ "enum.HumanoidVisualLayers.Head" ]
-#       color: "#e8b59b"
-#       sprite: Nyanotrasen/Mobs/Species/Golem/cult.rsi
-#       state: cultgolem_head
-#     - map: [ "enum.ToggleVisuals.Layer" ]
-#       sprite: Nyanotrasen/Mobs/Species/Golem/cult.rsi
-#       state: lights
-#       visible: false
-#       shader: unshaded
-#     - map: [ "enum.HumanoidVisualLayers.RArm" ]
-#       color: "#e8b59b"
-#       sprite: Nyanotrasen/Mobs/Species/Golem/cult.rsi
-#       state: cultgolem_r_arm
-#     - map: [ "enum.HumanoidVisualLayers.LArm" ]
-#       color: "#e8b59b"
-#       sprite: Nyanotrasen/Mobs/Species/Golem/cult.rsi
-#       state: cultgolem_l_arm
-#     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-#       color: "#e8b59b"
-#       sprite: Nyanotrasen/Mobs/Species/Golem/cult.rsi
-#       state: cultgolem_r_leg
-#     - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-#       color: "#e8b59b"
-#       sprite: Nyanotrasen/Mobs/Species/Golem/cult.rsi
-#       state: cultgolem_l_leg
-#     - map: [ "jumpsuit" ]
-#     - map: [ "enum.HumanoidVisualLayers.LHand" ]
-#       color: "#e8b59b"
-#       sprite: Nyanotrasen/Mobs/Species/Golem/cult.rsi
-#       state: cultgolem_l_hand
-#     - map: [ "enum.HumanoidVisualLayers.RHand" ]
-#       color: "#e8b59b"
-#       sprite: Nyanotrasen/Mobs/Species/Golem/cult.rsi
-#       state: cultgolem_r_hand
-#     - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
-#       color: "#ffffff"
-#       sprite: Objects/Misc/handcuffs.rsi
-#       state: body-overlay-2
-#       visible: false
-#     - map: [ "id" ]
-#     - map: [ "gloves" ]
-#     - map: [ "shoes" ]
-#     - map: [ "ears" ]
-#     - map: [ "outerClothing" ]
-#     - map: [ "eyes" ]
-#     - map: [ "belt" ]
-#     - map: [ "neck" ]
-#     - map: [ "back" ]
-#     - map: [ "mask" ]
-#     - map: [ "head" ]
-#     - map: [ "pocket1" ]
-#     - map: [ "pocket2" ]
-#     - map: [ "clownedon" ]
-#       sprite: "Effects/creampie.rsi"
-#       state: "creampie_human"
-#       visible: false
-#   - type: LagCompensation
-#   - type: RangedDamageSound
-#     soundGroups:
-#       Brute:
-#         collection:
-#           MeatBulletImpact
-#     soundTypes:
-#       Heat:
-#         collection:
-#           MeatLaserImpact
-#   - type: Tag
-#     tags:
-#     - CanPilot
-#     - DoorBumpOpener
-#     - ShoesRequiredStepTriggerImmune
-#     # TODO: https://github.com/Nyanotrasen/Nyanotrasen/issues/1628
-#     # - GunsDisabled
-#   - type: Reactive
-#     groups:
-#       Acidic: [Touch]
-#     reactions:
-#     - reagents: [Water, SpaceCleaner]
-#       methods: [Touch]
-#       effects:
-#       - !type:WashCreamPieReaction
-#   - type: Flashable
-#   - type: Polymorphable
-#   - type: Identity
-#   - type: Hands
-#   - type: MovementSpeedModifier
-#     baseWalkSpeed: 1.8
-#     baseSprintSpeed: 3
-#   - type: MovedByPressure
-#   - type: DamageOnHighSpeedImpact
-#     damage:
-#       types:
-#         Blunt: 5
-#     soundHit:
-#       path: /Audio/Effects/hit_kick.ogg
-#   - type: Stamina
-#     excess: 300
-#   - type: IdExaminable
-#   - type: HealthExaminable
-#     examinableTypes:
-#       - Blunt
-#       - Slash
-#       - Piercing
-#       - Heat
-#       - Shock
-#   - type: StatusEffects
-#     allowed:
-#       - Stun
-#       - KnockedDown
-#       - SlowedDown
-#       - Muted
-#       - Pacified
-#   - type: Inventory
-#     templateId: golem
-#   - type: InventorySlots
-#   - type: Clickable
-#   - type: InteractionOutline
-#   - type: Icon
-#     sprite: Nyanotrasen/Mobs/Species/Golem/cult.rsi
-#     state: full
-#   - type: Physics
-#     bodyType: KinematicController
-#   - type: Fixtures
-#     fixtures: # TODO: This needs a second fixture just for mob collisions.
-#       fix1:
-#         shape:
-#           !type:PhysShapeCircle
-#           radius: 0.35
-#         density: 400
-#         restitution: 0.0
-#         mask:
-#           - MobMask
-#         layer:
-#           - MobLayer
-#   - type: Body
-#     prototype: Golem
-#   - type: Damageable
-#     damageContainer: Inorganic
-#     damageModifierSet: Metallic
-#   - type: MobState
-#   - type: MobThresholds
-#     thresholds:
-#       0: Alive
-#       100: Dead
-#   - type: SlowOnDamage
-#     speedModifierThresholds:
-#       60: 0.7
-#       80: 0.5
-#   - type: Appearance
-#   - type: RotationVisuals
-#   - type: CombatMode
-#     canDisarm: true
-#   - type: Climbing
-#   - type: Cuffable
-#   - type: Ensnareable
-#     sprite: Objects/Misc/ensnare.rsi
-#     state: icon
-#   - type: AnimationPlayer
-#   - type: Buckle
-#   - type: MeleeWeapon
-#     hidden: true
-#     soundHit:
-#       collection: Punch
-#       params:
-#         pitchscale: 0.3
-#     angle: 30
-#     animation: WeaponArcFist
-#     attackRate: 1
-#     damage:
-#       types:
-#         Blunt: 12
-#   - type: Pullable
-#   - type: DoAfter
-#   - type: CreamPied
-#   - type: Stripping
-#   - type: Strippable
-#   - type: UserInterface
-#     interfaces:
-#       - key: enum.VoiceMaskUIKey.Key
-#         type: VoiceMaskBoundUserInterface
-#       - key: enum.HumanoidMarkingModifierKey.Key
-#         type: HumanoidMarkingModifierBoundUserInterface
-#       - key: enum.StrippingUiKey.Key
-#         type: StrippableBoundUserInterface
-#       - key: enum.LawsUiKey.Key
-#         type: LawsBoundUserInterface
-#       - key: enum.GolemUiKey.Key
-#         type: GolemBoundUserInterface
-#   - type: Puller
-#   - type: Speech
-#     speechSounds: Baritone
-#   - type: Vocal
-#   - type: Emoting
-#   - type: Grammar
-#     attributes:
-#       proper: true
-#   - type: StandingState
-#   - type: CanEscapeInventory
-#   - type: MobPrice
-#     price: 6000
-#     deathPenalty: 0.1
-#   - type: MindContainer
-#   - type: Input
-#     context: "human"
-#   - type: MobMover
-#   - type: InputMover
-#   - type: Alerts
-#   - type: Actions
-#   - type: Eye
-#   - type: CameraRecoil
-#   - type: Examiner
-#   - type: CanHostGuardian
-#   - type: NpcFactionMember
-#     factions:
-#     - NanoTrasen
-#     - PsionicInterloper
-#   - type: ItemSlots
-#     slots:
-#       crystal_slot:
-#         name: SoulCrystal
-#         locked: true
-#   - type: Golem
-#   - type: GenericVisualizer
-#     visuals:
-#       enum.ToggleVisuals.Toggled:
-#         enum.ToggleVisuals.Layer:
-#           True: { visible: true }
-#           False: { visible: false }
-#       enum.CreamPiedVisuals.Creamed:
-#         clownedon:
-#           True: {visible: true}
-#           False: {visible: false}
-#   #- type: Psionic
-#     removable: false
-#   - type: Laws
-#   - type: IntrinsicUI
-#     uis:
-#       - key: enum.LawsUiKey.Key
-#         toggleAction:
-#           name: action-name-show-laws
-#           description: action-description-show-laws
-#           icon: Structures/Wallmounts/posters.rsi/poster11_legit.png #someone wanna make new icons?
-#           iconOn: Structures/Wallmounts/posters.rsi/poster11_legit.png
-#           keywords: [ "AI", "console", "interface", "laws", "borg" ]
-#           priority: -3
-#           event: !type:ToggleIntrinsicUIEvent
-#   - type: GuideHelp
-#     guides:
-#     - AltarsGolemancy
-
-# - type: entity
-#   parent: MobGolemBase
-#   id: MobGolemCult
-#   name: golem
-#   suffix: shell
-#   components:
-#   - type: Repairable
-#     fuelcost: 60
-#     doAfterDelay: 32
-#   - type: Construction
-#     graph: Golem
-#     node: golem
-
-# - type: entity
-#   parent: MobGolemBase
-#   id: MobGolemWood
-#   name: wood golem
-#   description: An artificial construct imitating life. This one has no soul installed yet.
-#   components:
-#   - type: Sprite
-#     noRot: true
-#     drawdepth: Mobs
-#     layers:
-#     - map: [ "enum.HumanoidVisualLayers.Chest" ]
-#       color: "#e8b59b"
-#       sprite: Mobs/Species/Diona/parts.rsi
-#       state: torso_m
-#     - map: [ "enum.HumanoidVisualLayers.Head" ]
-#       color: "#e8b59b"
-#       sprite: Nyanotrasen/Mobs/Species/Golem/wood.rsi
-#       state: head
-#     - map: [ "enum.ToggleVisuals.Layer" ]
-#       sprite: Nyanotrasen/Mobs/Species/Golem/wood.rsi
-#       state: lights
-#       visible: false
-#       shader: unshaded
-#     - map: [ "enum.PlantHolderLayers.Plant" ]
-#       offset: 0, 0.55
-#       scale: 0.5, 0.5
-#     - map: [ "enum.HumanoidVisualLayers.RArm" ]
-#       color: "#e8b59b"
-#       sprite: Mobs/Species/Diona/parts.rsi
-#       state: r_arm
-#     - map: [ "enum.HumanoidVisualLayers.LArm" ]
-#       color: "#e8b59b"
-#       sprite: Mobs/Species/Diona/parts.rsi
-#       state: l_arm
-#     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-#       color: "#e8b59b"
-#       sprite: Mobs/Species/Diona/parts.rsi
-#       state: r_leg
-#     - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-#       color: "#e8b59b"
-#       sprite: Mobs/Species/Diona/parts.rsi
-#       state: l_leg
-#     - map: [ "jumpsuit" ]
-#     - map: [ "enum.HumanoidVisualLayers.LHand" ]
-#       color: "#e8b59b"
-#       sprite: Mobs/Species/Diona/parts.rsi
-#       state: l_hand
-#     - map: [ "enum.HumanoidVisualLayers.RHand" ]
-#       color: "#e8b59b"
-#       sprite: Mobs/Species/Diona/parts.rsi
-#       state: r_hand
-#     - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
-#       color: "#ffffff"
-#       sprite: Objects/Misc/handcuffs.rsi
-#       state: body-overlay-2
-#       visible: false
-#     - map: [ "id" ]
-#     - map: [ "gloves" ]
-#     - map: [ "shoes" ]
-#     - map: [ "ears" ]
-#     - map: [ "outerClothing" ]
-#     - map: [ "eyes" ]
-#     - map: [ "belt" ]
-#     - map: [ "neck" ]
-#     - map: [ "back" ]
-#     - map: [ "mask" ]
-#     - map: [ "head" ]
-#     - map: [ "pocket1" ]
-#     - map: [ "pocket2" ]
-#   - type: Inventory
-#     templateId: golem_shoeless
-#   - type: Damageable
-#     damageContainer: Inorganic
-#     damageModifierSet: Wood
-#   - type: Flammable
-#     fireSpread: true
-#     canResistFire: true
-#     damage:
-#       types:
-#         Heat: 1.2 #per second, scales with number of fire 'stacks'
-#   - type: PlantHolder
-#   - type: PlantHolderVisuals
-#   - type: SolutionContainerManager
-#     solutions:
-#       soil:
-#         maxVol: 100
-#   - type: RefillableSolution
-#     solution: soil
-#     maxRefill: 50
-#   - type: Repairable #needs plant repair stuff l8er
-#     fuelcost: 60
-#     doAfterDelay: 32
-#   - type: Reactive
-#     groups:
-#       Acidic: [Touch]
-#       Flammable: [Touch]
-#       Extinguish: [Touch]
-#     reactions:
-#     - reagents: [Water, SpaceCleaner]
-#       methods: [Touch]
-#       effects:
-#       - !type:WashCreamPieReaction
-#   - type: Construction
-#     graph: GolemWood
-#     node: golem
-
-# - type: entity
-#   parent: MobGolemBase
-#   name: silver golem
-#   id: MobGolemSilver
-#   description: A fusion between soul and quantum machine, the epitome of epistemics.
-#   components:
-#     - type: MovementSpeedModifier
-#       baseWalkSpeed: 4
-#       baseSprintSpeed: 5.5
-#     - type: RandomSprite
-#       available:
-#         - enum.DamageStateVisualLayers.Base:
-#             silver_base: ""
-#           enum.ToggleVisuals.Layer:
-#             lights: Sixteen
-#     - type: Sprite
-#       drawdepth: Mobs
-#       sprite: Nyanotrasen/Mobs/Species/Golem/silver.rsi
-#       layers:
-#         - map: [ "enum.DamageStateVisualLayers.Base" ]
-#           state: silver_base
-#         - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
-#           color: "#ffffff"
-#           sprite: Objects/Misc/handcuffs.rsi
-#           state: body-overlay-2
-#           visible: false
-#         - map: [ "enum.ToggleVisuals.Layer" ]
-#           sprite: Nyanotrasen/Mobs/Species/Golem/silver.rsi
-#           state: lights
-#           color: "#40a7d7"
-#           shader: unshaded
-#           visible: false
-#     - type: Icon
-#       sprite: Nyanotrasen/Mobs/Species/Golem/silver.rsi
-#       state: full
-#     - type: Fixtures
-#       fixtures:
-#         fix1:
-#           shape:
-#             !type:PhysShapeCircle
-#             radius: 0.35
-#           density: 200
-#           mask:
-#             - FlyingMobMask
-#           layer:
-#             - FlyingMobLayer
-#     - type: HeatResistance
-#     - type: Internals
-#     - type: TypingIndicator
-#       proto: robot
-#     - type: MeleeWeapon
-#       hidden: true
-#       angle: 30
-#       animation: WeaponArcFist
-#       soundHit:
-#         path: /Audio/Nyanotrasen/Mobs/SilverGolem/sonic_jackhammer.ogg
-#       attackRate: 1.5
-#       damage:
-#         types:
-#           Blunt: 10
-#           Holy: 8
-#     - type: Inventory
-#       templateId: golem_silver
-#     - type: PsychokinesisPower
-#     - type: Construction
-#       graph: GolemSilver
-#       node: golem
-#     - type: MovementIgnoreGravity
-#     - type: RangedDamageSound
-#       soundGroups:
-#         Brute:
-#           collection:
-#             MetalBulletImpact
-#       soundTypes:
-#         Heat:
-#           collection:
-#             MetalLaserImpact
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index 6fb72f8f73f..4e174a2d8b7 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -21,12 +21,12 @@
     - id: FoodMeatHuman
       amount: 5
   - type: PsionicInsulation
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     understands:
     - GalacticCommon
-
+    
 - type: entity
   parent: BaseSpeciesDummy
   id: MobHumanDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
deleted file mode 100644
index 5959c497186..00000000000
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-- type: entity
-  save: false
-  name: Urist McFluff
-  parent: BaseMobSpeciesOrganic
-  id: BaseMobMoth
-  abstract: true
-  components:
-  - type: HumanoidAppearance
-    species: Moth
-  - type: Hunger
-  - type: Thirst
-  - type: Carriable # Carrying system from nyanotrasen.
-  - type: Icon
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: full
-  - type: Body
-    prototype: Moth
-    requiredLegs: 2
-  - type: Damageable
-    damageContainer: Biological
-    damageModifierSet: Moth
-  - type: ZombieAccentOverride
-    accent: zombieMoth
-  - type: Speech
-    speechVerb: Moth
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - Moffic
-    understands:
-    - GalacticCommon
-    - Moffic
-  - type: TypingIndicator
-    proto: moth
-  - type: Butcherable
-    butcheringType: Spike
-    spawned:
-    - id: FoodMeat
-      amount: 5
-  - type: Bloodstream
-    bloodReagent: InsectBlood
-  - type: DamageVisuals
-    damageOverlayGroups:
-      Brute:
-        sprite: Mobs/Effects/brute_damage.rsi
-        color: "#808A51"
-  - type: MothAccent
-  - type: Vocal
-    sounds:
-      Male: UnisexMoth
-      Female: UnisexMoth
-      Unsexed: UnisexMoth
-  - type: MovementSpeedModifier
-    weightlessAcceleration: 2.5 # Move around more easily in space.
-  - type: Flammable
-    damage:
-      types:
-        Heat: 4 # DV - Reduced by .5
-  - type: Temperature # Moths hate the heat and thrive in the cold.
-    heatDamageThreshold: 320
-    coldDamageThreshold: 230
-    currentTemperature: 310.15
-    specificHeat: 46
-    coldDamage:
-      types:
-        Cold : 0.05 #per second, scales with temperature & other constants
-    heatDamage:
-      types:
-        Heat : 3 #per second, scales with temperature & other constants
-  - type: Sprite # sprite again because we want different layer ordering
-    noRot: true
-    drawdepth: Mobs
-    layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
-      - map: [ "enum.HumanoidVisualLayers.Snout" ]
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-      - shader: StencilClear
-        sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115
-        # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear.
-        # sprite refactor when
-        state: l_leg
-      - shader: StencilMask
-        map: [ "enum.HumanoidVisualLayers.StencilMask" ]
-        sprite: Mobs/Customization/masking_helpers.rsi
-        state: unisex_full
-        visible: false
-      - map: [ "jumpsuit" ]
-      - map: [ "enum.HumanoidVisualLayers.LHand" ]
-      - map: [ "enum.HumanoidVisualLayers.RHand" ]
-      - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-      - map: [ "enum.HumanoidVisualLayers.RFoot" ]
-      - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
-        color: "#ffffff"
-        sprite: Objects/Misc/handcuffs.rsi
-        state: body-overlay-2
-        visible: false
-      - map: [ "gloves" ]
-      - map: [ "shoes" ]
-      - map: [ "ears" ]
-      - map: [ "outerClothing" ]
-      - map: [ "eyes" ]
-      - map: [ "belt" ]
-      - map: [ "id" ]
-      - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everyhting doesn't break
-      - map: [ "neck" ]
-      - map: [ "back" ]
-      - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-      - map: [ "enum.HumanoidVisualLayers.Hair" ]
-      - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
-      - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-      - map: [ "mask" ]
-      - map: [ "head" ]
-      - map: [ "pocket1" ]
-      - map: [ "pocket2" ]
-      - map: [ "clownedon" ] # Dynamically generated
-        sprite: "Effects/creampie.rsi"
-        state: "creampie_moth"
-        visible: false
-
-- type: entity
-  parent: BaseSpeciesDummy
-  id: MobMothDummy
-  noSpawn: true
-  components:
-  - type: HumanoidAppearance
-    species: Moth
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index bdea4499ed1..35f9e9fa393 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -59,7 +59,7 @@
       types:
         Heat : 1.5 #per second, scales with temperature & other constants
   - type: Wagging
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Draconic
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
deleted file mode 100644
index a601010ef94..00000000000
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-- type: entity
-  name: Urist McSlime
-  parent: BaseMobSpeciesOrganic
-  id: BaseMobSlimePerson
-  abstract: true
-  components:
-  - type: Hunger
-  - type: Thirst
-  - type: Carriable # Carrying system from nyanotrasen.
-  - type: Icon
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: full
-  - type: Body
-    prototype: Slime
-    requiredLegs: 2
-  - type: HumanoidAppearance
-    species: SlimePerson
-  - type: Speech
-    speechVerb: Slime
-    speechSounds: Slime
-  - type: TypingIndicator
-    proto: slime
-  - type: Vocal
-    sounds:
-      Male: MaleSlime
-      Female: FemaleSlime
-      Unsexed: MaleSlime
-  - type: Damageable
-    damageContainer: Biological
-    damageModifierSet: Slime
-  - type: DamageVisuals
-    damageOverlayGroups:
-      Brute:
-        sprite: Mobs/Effects/brute_damage.rsi
-        color: "#2cf274"
-  - type: Bloodstream
-    bloodReagent: Slime # TODO Color slime blood based on their slime color or smth
-  - type: Barotrauma
-    damage:
-      types:
-        Blunt: 0.60 #per second, scales with pressure and other constants. Slighty more than humans.
-  - type: Reactive
-    groups:
-      Flammable: [ Touch ]
-      Extinguish: [ Touch ]
-    reactions:
-    - reagents: [ Water, SpaceCleaner ]
-      methods: [ Touch ]
-      effects:
-      - !type:WashCreamPieReaction
-    - reagents: [ Water ]
-      methods: [ Touch ]
-      effects:
-      - !type:HealthChange
-        scaled: true
-        damage:
-          types:
-            Heat: 2
-      - !type:PopupMessage
-        type: Local
-        visualType: Large
-        messages: [ "slime-hurt-by-water-popup" ]
-        probability: 0.25
-  - type: Butcherable
-    butcheringType: Spike
-    spawned:
-    - id: FoodMeatSlime
-      amount: 5
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 0.2
-    damageRecovery:
-      types:
-        Asphyxiation: -1.0
-    maxSaturation: 15
-  - type: LanguageSpeaker
-    speaks:
-    - GalacticCommon
-    - Bubblish
-    understands:
-    - GalacticCommon
-    - Bubblish
-
-- type: entity
-  parent: MobHumanDummy
-  id: MobSlimePersonDummy
-  noSpawn: true
-  components:
-    - type: HumanoidAppearance
-      species: SlimePerson
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
deleted file mode 100644
index a271e9d0846..00000000000
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-- type: entity
-  parent: BaseMobSpeciesOrganic
-  id: BaseMobVox
-  abstract: true
-  components:
-  - type: Hunger
-  - type: Thirst
-  - type: Icon
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: vox_m
-  - type: Body
-    prototype: Vox
-    requiredLegs: 2
-  - type:  HumanoidAppearance
-    species: Vox
-    #- type: VoxAccent # Not yet coded
-  - type: Inventory
-    speciesId: vox
-  - type: Speech
-    speechVerb: Vox
-    speechSounds: Vox
-  - type: TypingIndicator
-    proto: vox
-  - type: Vocal
-    sounds:
-      Male: UnisexVox
-      Female: UnisexVox
-      Unsexed: UnisexVox
-  - type: Butcherable
-    butcheringType: Spike
-    spawned:
-    - id: FoodMeatChicken
-      amount: 5
-  - type: Damageable
-    damageContainer: Biological
-    damageModifierSet: Vox
-  - type: DamageVisuals
-    damageOverlayGroups:
-      Brute:
-        sprite: Mobs/Effects/brute_damage.rsi
-        color: "#7a8bf2"
-  - type: Bloodstream
-    bloodReagent: AmmoniaBlood
-  - type: MeleeWeapon
-    soundHit:
-      collection: AlienClaw
-    angle: 30
-    animation: WeaponArcClaw
-    damage:
-      types:
-        Slash: 5 # Reduce?
-
-- type: entity
-  parent: BaseSpeciesDummy
-  id: MobVoxDummy
-  noSpawn: true
-  components:
-  - type: HumanoidAppearance
-    species: Vox
-  - type: Body
-    prototype: Vox
-
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index d5be77eef1c..5c35afd8f07 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -43,6 +43,7 @@
   - type: MovementSpeedModifier
   - type: Polymorphable
   - type: StatusIcon
+  - type: LanguageSpeaker # Einstein Engines. This component is required to support speech, although it does not define known languages.
   - type: RequireProjectileTarget
     active: False
 
@@ -62,6 +63,21 @@
         damage: 400
       behaviors:
       - !type:GibBehavior { }
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 1500
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawnInContainer: true
+        spawn:
+          Ash:
+            min: 1
+            max: 1
+      - !type:BurnBodyBehavior { }
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MeatLaserImpact
   - type: RadiationReceiver
   - type: Stamina
   - type: MobState
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index 4bdd6245c5d..e758022710b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -2,6 +2,7 @@
   parent: DrinkBase
   id: DrinkCartonBaseFull
   abstract: true
+  suffix: Full
   components:
   - type: Openable
     sound:
@@ -112,6 +113,24 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tomatojuice.rsi
 
+- type: entity
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
+  id: DrinkCoconutWaterCarton
+  name: coconut water
+  description: It's the inside of the coconut that counts.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 50
+  - type: Drink
+  - type: Label
+    currentLabel: coconut water
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/coconutwater.rsi
+
 - type: entity
   parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
   id: DrinkCreamCarton
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 0602fcf8f9d..cfe5294ff05 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -33,6 +33,12 @@
     interfaces:
     - key: enum.TransferAmountUiKey.Key
       type: TransferAmountBoundUserInterface
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
 
 - type: entity
   parent: DrinkBase
@@ -79,8 +85,8 @@
 
 # Transformable container - normal glass
 - type: entity
-  name: metamorphic glass
-  description: A metamorphic glass that automagically turns into a glass appropriate for the drink within. There's a sanded off patent number on the bottom.
+  name: glass cup
+  description: A glass cup, able to hold a variety of liquids for your drinking pleasure.
   parent: DrinkGlassBase
   id: DrinkGlass
   components:
@@ -258,6 +264,22 @@
         - ReagentId: Antifreeze
           Quantity: 30
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkArnoldPalmer
+  suffix: arnold palmer
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ArnoldPalmer
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkAtomicBombGlass
@@ -369,6 +391,9 @@
   - type: Icon
     sprite: Objects/Consumable/Drinks/beerglass.rsi
     state: icon
+  - type: Tag
+    tags:
+    - Beer
 
 - type: entity
   parent: DrinkGlass
@@ -434,6 +459,22 @@
     sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkBlueHawaiianGlass
+  suffix: blue hawaiian
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: BlueHawaiian
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkBooger
@@ -498,6 +539,35 @@
     sprite: Objects/Consumable/Drinks/chocolateglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkCoconutRum
+  suffix: coconut rum
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: CoconutRum
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/coconutrum.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkCoconutWaterGlass
+  suffix: coconut water
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 30
+
 - type: entity
   parent: DrinkGlass
   id: DrinkCoffee
@@ -530,6 +600,22 @@
     sprite: Objects/Consumable/Drinks/cognacglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkCosmopolitan
+  suffix: cosmopolitan
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Cosmopolitan
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/cosmopolitan.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkCream
@@ -943,6 +1029,9 @@
   - type: Icon
     sprite: Objects/Consumable/Drinks/iced_beerglass.rsi
     state: icon
+  - type: Tag
+    tags:
+    - Beer
 
 - type: entity
   parent: DrinkGlass
@@ -1334,6 +1423,22 @@
     sprite: Objects/Consumable/Drinks/orangejuice.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkPainkillerGlass
+  suffix: painkiller
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Painkiller
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/painkiller.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkPatronGlass
@@ -1350,6 +1455,22 @@
     sprite: Objects/Consumable/Drinks/patronglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkPinaColadaGlass
+  suffix: piña colada
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: PinaColada
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/pinacolada.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkPoisonBerryJuice
@@ -1478,6 +1599,22 @@
     sprite: Objects/Consumable/Drinks/rumglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkRoyRogersGlass
+  suffix: roy rogers
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: RoyRogers
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/royrogers.rsi
+    state: icon
+
 ##Commented out in favor of Nyano sake/soju
 #- type: entity
 #  parent: DrinkGlass
@@ -1604,6 +1741,22 @@
     sprite: Objects/Consumable/Drinks/glass_white.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkShirleyTempleGlass
+  suffix: shirley temple
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ShirleyTemple
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/shirleytemple.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkSilencerGlass
@@ -1636,6 +1789,22 @@
     sprite: Objects/Consumable/Drinks/singulo.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkSolDryGlass
+  suffix: sol dry
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: SolDry
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkSnowWhite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 07828ff5ba5..fc35fae1af8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -3,6 +3,7 @@
   parent: DrinkBase
   id: DrinkBottlePlasticBaseFull
   abstract: true
+  suffix: Full
   components:
   - type: Tag
     tags:
@@ -355,6 +356,9 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pwinebottle.rsi
   - type: Sealable
+  - type: Tag
+    tags:
+    - Wine
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -501,6 +505,9 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/winebottle.rsi
   - type: Sealable
+  - type: Tag
+    tags:
+    - Wine
 
 # Small Bottles
 
@@ -523,6 +530,9 @@
     sprite: Objects/Consumable/Drinks/beer.rsi
   - type: Openable
     closeable: false
+  - type: Tag
+    tags:
+    - Beer
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -543,6 +553,9 @@
     sprite: Objects/Consumable/Drinks/beer.rsi
   - type: Openable
     closeable: false
+  - type: Tag
+    tags:
+    - Beer
 
 
 - type: entity
@@ -714,7 +727,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkSugarJug
   name: sugar jug
-  suffix: for drinks
+  suffix: For Drinks, Full
   description: some people put this in their coffee...
   components:
   - type: SolutionContainerManager
@@ -777,6 +790,23 @@
   - type: Label
     currentLabel: ice
 
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkCoconutWaterJug
+  name: coconut water jug
+  description: It's on the inside of the coconut that counts.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 300
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 300
+  - type: Drink
+  - type: Label
+    currentLabel: coconut water
+
 - type: entity
   parent: DrinkBottlePlasticBaseFull
   id: DrinkCoffeeJug
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index 38ebc132c9f..a9ff1c784a9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -62,6 +62,12 @@
   - type: Tag
     tags:
     - DrinkCan
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
 
 - type: entity
   parent: DrinkCanBaseFull
@@ -182,6 +188,9 @@
     sprite: Objects/Consumable/Drinks/rootbeer.rsi
   - type: Item
     sprite: Objects/Consumable/Drinks/rootbeer.rsi
+  - type: Tag
+    tags:
+    - Beer
 
 - type: entity
   parent: DrinkCanBaseFull
@@ -236,6 +245,24 @@
   - type: Item
     sprite: Objects/Consumable/Drinks/space-up.rsi
 
+- type: entity
+  parent: DrinkCanBaseFull
+  id: DrinkSolDryCan
+  name: sol dry
+  description: Sweet ginger soda from outer space!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: SolDry
+          Quantity: 30
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/sol_dry.rsi
+  - type: Item
+    sprite: Objects/Consumable/Drinks/sol_dry.rsi
+
 - type: entity
   parent: DrinkCanBaseFull
   id: DrinkStarkistCan
@@ -480,6 +507,9 @@
     sprite: Objects/Consumable/Drinks/beer_can.rsi
   - type: Item
     sprite: Objects/Consumable/Drinks/beer_can.rsi
+  - type: Tag
+    tags:
+    - Beer
 
 - type: entity
   parent: DrinkCanBaseFull
@@ -499,3 +529,6 @@
     sprite: Objects/Consumable/Drinks/wine_can.rsi
   - type: Item
     sprite: Objects/Consumable/Drinks/wine_can.rsi
+  - type: Tag
+    tags:
+    - Wine
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 4fc2e170d5b..c4693c6a719 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -37,6 +37,12 @@
     damage:
       types:
         Blunt: 0
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
 
 - type: entity
   parent: DrinkBaseCup
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index c80398e3496..9a523c997b9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -31,6 +31,12 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 50
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
 
 - type: entity
   parent: DrinkGlassBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
index 86bc34f3c8b..aeaa54ccf1f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -5,6 +5,7 @@
   parent: BaseItem
   abstract: true
   description: An empty bottle.
+  suffix: Empty
   components:
   - type: Sprite
     state: icon
@@ -93,6 +94,7 @@
   parent: BaseItem
   abstract: true
   description: An empty carton.
+  suffix: Empty
   components:
   - type: Sprite
     state: icon
@@ -136,6 +138,12 @@
     materialComposition:
       Cardboard: 20
   - type: SpaceGarbage
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg
 
 - type: entity
   name: base empty bottle
@@ -303,7 +311,6 @@
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/winebottle_empty.rsi
 
-
 - type: entity
   name: lime juice carton
   parent: DrinkCartonBaseEmpty
@@ -347,6 +354,10 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/milk.rsi
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
 
 - type: entity
   name: soy milk carton
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index 07d07e370be..71b38959ce3 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -711,7 +711,7 @@
     state: suppermatter
   - type: SliceableFood
     slice: FoodCakeSuppermatterSlice
-    TotalCount: 8
+    count: 8
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index fe888595847..8cd1c5dfab6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -156,6 +156,8 @@
           path: /Audio/Weapons/Guns/Empty/empty.ogg
         ejectSound:
           path: /Audio/Weapons/Guns/Empty/empty.ogg
+        swap: false
+        disableEject: true
   - type: Tag
     tags:
     - Fruit
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index 58fe2a34154..bbe5cf244b2 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -32,7 +32,6 @@
     size: Tiny
   - type: Drink
     solution: food
-    refillable: false
   - type: Openable
     sound:
       collection: packetOpenSounds
@@ -523,7 +522,7 @@
 # Shakers
 
 - type: entity
-  parent: BaseFoodCondimentBottle
+  parent: BaseFoodCondiment
   id: BaseFoodShaker
   abstract: true
   name: empty shaker
@@ -561,6 +560,8 @@
         acts: [ "Destruction" ]
   - type: Sprite
     state: shaker-empty
+  - type: RefillableSolution
+    solution: food
 
 - type: entity
   parent: BaseFoodShaker
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
index 5fbfe9c09b2..74277cf7ff4 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -609,3 +609,24 @@
           Quantity: 4
         - ReagentId: Vitamin
           Quantity: 4
+
+- type: entity
+  name: harpy wings
+  parent: FoodMealBase
+  id: FoodHarpyWings
+  description: It's a bit stringy.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - chicken
+  - type: Sprite
+    state: harpywings
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 25
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 13
+        - ReagentId: Protein
+          Quantity: 7
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 85de407988b..58af9cf3bd8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -718,6 +718,7 @@
     tags:
     - Cooked
     - Meat
+    - Steak
   - type: Sprite
     layers:
     - state: plain-cooked
@@ -774,6 +775,7 @@
     tags:
     - Cooked
     - Meat
+    - Steak
   - type: Sprite
     layers:
     - state: product-cooked
@@ -942,6 +944,7 @@
     tags:
     - Cooked
     - Meat
+    - Steak
   - type: Sprite
     layers:
     - state: goliath-cooked
@@ -971,6 +974,7 @@
     tags:
     - Cooked
     - Meat
+    - Steak
   - type: Sprite
     layers:
     - state: rouny-cooked
@@ -996,6 +1000,7 @@
     tags:
     - Cooked
     - Meat
+    - Steak
   - type: Sprite
     layers:
     - state: lizard-cooked
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index eec7711d4af..3f0277e1bc3 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -124,6 +124,9 @@
     sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
   - type: Produce
     seedId: laughinPea
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: tower-cap log
@@ -258,6 +261,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Banana
 
 - type: entity
   name: mimana
@@ -413,6 +417,7 @@
   - type: Tag
     tags:
     - Carrot
+    - Vegetable
   - type: SolutionContainerManager
     solutions:
       food:
@@ -458,6 +463,9 @@
     sprite: Objects/Specific/Hydroponics/cabbage.rsi
   - type: Produce
     seedId: cabbage
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: garlic
@@ -483,6 +491,9 @@
     sprite: Objects/Specific/Hydroponics/garlic.rsi
   - type: Produce
     seedId: garlic
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: lemon
@@ -658,6 +669,8 @@
   - type: Tag
     tags:
     - Potato
+    - Vegetable
+
 
 - type: entity
   name: tomato
@@ -712,6 +725,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Vegetable
 
 - type: entity
   name: blue tomato
@@ -756,6 +770,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Vegetable
 
 - type: entity
   name: blood tomato
@@ -798,6 +813,7 @@
   - type: Tag
     tags:
     - Fruit # Fuck you they're a fruit
+    - Vegetable
 
 - type: entity
   name: eggplant
@@ -824,6 +840,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Vegetable
 
 - type: entity
   name: apple
@@ -912,6 +929,7 @@
   - type: Tag
     tags:
     - Corn
+    - Vegetable
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/corn.rsi
   - type: Produce
@@ -974,6 +992,9 @@
   - type: SliceableFood
     count: 5
     slice: FoodOnionSlice
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: red onion
@@ -1002,6 +1023,9 @@
   - type: SliceableFood
     count: 5
     slice: FoodOnionRedSlice
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: chanterelle cluster
@@ -1019,6 +1043,9 @@
     sprite: Objects/Specific/Hydroponics/chanterelle.rsi
   - type: Produce
     seedId: chanterelle
+  - type: Tag
+    tags:
+    - Vegetable
 
 # Slices
 
@@ -1129,6 +1156,9 @@
       sprite: Objects/Specific/Hydroponics/chili.rsi
     - type: Produce
       seedId: chili
+    - type: Tag
+      tags:
+      - Vegetable
 
 - type: entity
   name: chilly pepper
@@ -1180,6 +1210,9 @@
     seedId: aloe
   - type: Extractable
     grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: poppy
@@ -1187,6 +1220,10 @@
   id: FoodPoppy
   description: A flower with extracts often used in the production of medicine
   components:
+  - type: Clothing
+    slots:
+    - HEAD
+    quickEquip: false
   - type: FlavorProfile
     flavors:
       - medicine
@@ -1459,6 +1496,9 @@
       reagents:
       - ReagentId: MilkSoy
         Quantity: 5
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: spaceman's trumpet
@@ -1512,6 +1552,9 @@
       reagents:
       - ReagentId: CarpoToxin
         Quantity: 2
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: watermelon
@@ -1604,9 +1647,6 @@
       reagents:
       - ReagentId: JuiceWatermelon
         Quantity: 4
-  - type: Tag
-    tags:
-    - Fruit
 
 - type: entity
   name: grapes
@@ -1635,6 +1675,9 @@
       reagents:
       - ReagentId: JuiceGrape
         Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: berries
@@ -1707,7 +1750,6 @@
     tags:
     - Recyclable
     - Trash
-    - Fruit
   - type: SolutionContainerManager
     solutions:
       food:
@@ -1746,6 +1788,9 @@
     sprite: Objects/Specific/Hydroponics/pea.rsi
   - type: Produce
     seedId: pea
+  - type: Tag
+    tags:
+    - Vegetable
 
 - type: entity
   name: pumpkin
@@ -1794,6 +1839,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Vegetable
 
 - type: entity
   name: cotton boll
@@ -1822,3 +1868,4 @@
   - type: Tag
     tags:
     - ClothMade
+    - CottonBoll
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index e88a641c7c0..e5ae7723671 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -392,10 +392,10 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 30
+        maxVol: 25
         reagents:
         - ReagentId: Nutriment
-          Quantity: 25
+          Quantity: 20
 
 - type: entity
   id: FoodSnackMREBrownie
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index 3b080e843b4..6b96f3bcb36 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -806,6 +806,10 @@
             Quantity: 4
           - ReagentId: Allicin
             Quantity: 3
+  - type: Tag
+    tags:
+    - ChiliBowl
+
 
 - type: entity
   name: cold chili
@@ -830,6 +834,9 @@
             Quantity: 8
           - ReagentId: Vitamin
             Quantity: 4
+  - type: Tag
+    tags:
+    - ChiliBowl
 
 - type: entity
   name: chili con carnival
@@ -860,6 +867,9 @@
             Quantity: 4
           - ReagentId: Allicin
             Quantity: 3
+  - type: Tag
+    tags:
+    - ChiliBowl
 
 - type: entity
   name: monkey's delight
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index 659cbaa28a2..18ea198697e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -80,7 +80,7 @@
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: Omnizine
-            Quantity: 30
+            Quantity: 5
 
 - type: entity
   id: CigaretteOmnizine
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index bc9079fb2db..eb8e0a1ffe6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -182,7 +182,7 @@
   id: CigPackSyndicate
   parent: CigPackBase
   name: Interdyne herbals packet
-  description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves.
+  description: Premium medicinal cigarettes from the Interdyne Corporation. Not endorsed by the Terra-Gov Surgeon General.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml
index 374a396a5a6..0049c389b5b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml
@@ -6,5 +6,5 @@
   description: "Like a cigar, but for tough teens. (WARNING:Pour only water into the vape)"
   components:
   - type: Sprite
-    sprite: Objects/Consumable/Smokeables/Vapes/vape-standart.rsi
+    sprite: Objects/Consumable/Smokeables/Vapes/vape-standard.rsi
     state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
index e4cd6ba0dea..61554d0621b 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
@@ -17,6 +17,8 @@
     whitelist:
       tags:
       - Burnt
+      - Cigarette
+      - Cigar
     maxItemSize: Tiny
     grid:
     - 0,0,9,0
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index 75d9b071bee..06836df342c 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -300,9 +300,9 @@
         orGroup: GiftPool
       - id: ClothingHeadHatBunny
         orGroup: GiftPool
-      - id: ClothingHeadHatFlowerCrown
+      - id: ClothingHeadHatFlowerWreath
         orGroup: GiftPool
-      - id: ClothingHeadHatHairflower
+      - id: FoodPoppy
         orGroup: GiftPool
       - id: ClothingMaskClown
         orGroup: GiftPool
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index c2a1fe6e7dc..f60ffad8478 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1175,9 +1175,9 @@
       materialRequirements:
         Glass: 2
         Cable: 2
-    - type: ReverseEngineering # Nyano
-      recipes:
-        - MicrowaveMachineCircuitboard
+    - type: Tag
+      tags:
+      - MicrowaveMachineBoard
 
 - type: entity
   id: FatExtractorMachineCircuitboard
@@ -1433,7 +1433,7 @@
     materialRequirements:
       Steel: 5
       CableHV: 5
-      
+
 - type: entity
   id: ShuttleGunPerforatorCircuitboard
   parent: BaseMachineCircuitboard
@@ -1450,7 +1450,7 @@
     materialRequirements:
       Steel: 10
       CableHV: 5
-      
+
 - type: entity
   id: ShuttleGunFriendshipCircuitboard
   parent: BaseMachineCircuitboard
@@ -1466,8 +1466,8 @@
       Manipulator: 2
     materialRequirements:
       Steel: 7
-      CableHV: 5  
-      
+      CableHV: 5
+
 - type: entity
   id: ShuttleGunDusterCircuitboard
   parent: BaseMachineCircuitboard
@@ -1485,7 +1485,7 @@
       Steel: 10
       CableHV: 5
       Uranium: 2
-      
+
 - type: entity
   id: ShuttleGunKineticCircuitboard
   parent: BaseMachineCircuitboard
@@ -1502,4 +1502,16 @@
     materialRequirements:
       Steel: 5
       CableHV: 2
-      
\ No newline at end of file
+
+- type: entity
+  parent: BaseMachineCircuitboard
+  id: ReagentGrinderIndustrialMachineCircuitboard
+  name: industrial reagent grinder machine board
+  components:
+  - type: MachineBoard
+    prototype: ReagentGrinderIndustrial
+    requirements:
+      MatterBin: 1
+      Manipulator: 3
+    materialRequirements:
+      Glass: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
index fef98a457e0..b761ef7996f 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
@@ -7,12 +7,22 @@
     - type: Sprite
       sprite: Objects/Misc/module.rsi
       state: door_electronics
-    - type: AccessReader
     - type: Tag
       tags:
         - DoorElectronics
+    - type: DoorElectronics
     - type: ReverseEngineering # Nyano
       recipes:
         - DoorElectronics
     - type: StaticPrice
       price: 55
+    - type: AccessReader
+    - type: ActivatableUI
+      key: enum.DoorElectronicsConfigurationUiKey.Key
+      allowedItems:
+        tags:
+        - DoorElectronicsConfigurator
+    - type: UserInterface
+      interfaces:
+      - key: enum.DoorElectronicsConfigurationUiKey.Key
+        type: DoorElectronicsBoundUserInterface
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
new file mode 100644
index 00000000000..e3944296ea7
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
@@ -0,0 +1,296 @@
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsService
+  suffix: Service, Locked
+  components:
+  - type: AccessReader
+    access: [["Service"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsTheatre
+  suffix: Theatre, Locked
+  components:
+  - type: AccessReader
+    access: [["Theatre"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChapel
+  suffix: Chapel, Locked
+  components:
+  - type: AccessReader
+    access: [["Chapel"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsJanitor
+  suffix: Janitor, Locked
+  components:
+  - type: AccessReader
+    access: [["Janitor"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsKitchen
+  suffix: Kitchen, Locked
+  components:
+  - type: AccessReader
+    access: [["Kitchen"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsBar
+  suffix: Bar, Locked
+  components:
+  - type: AccessReader
+    access: [["Bar"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsHydroponics
+  suffix: Hydroponics, Locked
+  components:
+  - type: AccessReader
+    access: [["Hydroponics"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsLawyer
+  suffix: Lawyer, Locked
+  components:
+  - type: AccessReader
+    access: [["Lawyer"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCaptain
+  suffix: Captain, Locked
+  components:
+  - type: AccessReader
+    access: [["Captain"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsExternal
+  suffix: External, Locked
+  components:
+  - type: AccessReader
+    access: [["External"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCargo
+  suffix: Cargo, Locked
+  components:
+  - type: AccessReader
+    access: [["Cargo"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsEngineering
+  suffix: Engineering, Locked
+  components:
+  - type: AccessReader
+    access: [["Engineering"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsAtmospherics
+  suffix: Atmospherics, Locked
+  components:
+  - type: AccessReader
+    access: [["Atmospherics"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsFreezer
+  suffix: Freezer, Locked
+  components:
+  - type: AccessReader
+    access: [["Kitchen"], ["Hydroponics"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSalvage
+  suffix: Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsMedical
+  suffix: Medical, Locked
+  components:
+  - type: AccessReader
+    access: [["Medical"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChemistry
+  suffix: Chemistry, Locked
+  components:
+  - type: AccessReader
+    access: [["Chemistry"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsResearch
+  suffix: Research, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsScience
+  suffix: Science, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"], ["Medical"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCommand
+  suffix: Command, Locked
+  components:
+  - type: AccessReader
+    access: [["Command"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsCentralCommand
+  suffix: CentralCommand, Locked
+  components:
+  - type: AccessReader
+    access: [["CentralCommand"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChiefMedicalOfficer
+  suffix: ChiefMedicalOfficer, Locked
+  components:
+  - type: AccessReader
+    access: [["ChiefMedicalOfficer"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsChiefEngineer
+  suffix: ChiefEngineer, Locked
+  components:
+  - type: AccessReader
+    access: [["ChiefEngineer"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsHeadOfSecurity
+  suffix: HeadOfSecurity, Locked
+  components:
+  - type: AccessReader
+    access: [["HeadOfSecurity"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsResearchDirector
+  suffix: ResearchDirector, Locked
+  components:
+  - type: AccessReader
+    access: [["ResearchDirector"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsHeadOfPersonnel
+  suffix: HeadOfPersonnel, Locked
+  components:
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsQuartermaster
+  suffix: Quartermaster, Locked
+  components:
+  - type: AccessReader
+    access: [["Quartermaster"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSecurity
+  suffix: Security, Locked
+  components:
+  - type: AccessReader
+    access: [["Security"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSecurityLawyer
+  suffix: Security/Lawyer, Locked
+  components:
+  - type: AccessReader
+    access: [["Security"], ["Lawyer"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsDetective
+  suffix: Detective, Locked
+  components:
+  - type: AccessReader
+    access: [["Detective"]]
+
+#- type: entity
+#  parent: DoorElectronics
+#  id: DoorElectronicsBrig
+#  suffix: Brig, Locked
+#  components:
+#  - type: AccessReader
+#    access: [["Brig"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsArmory
+  suffix: Armory, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsVault
+  suffix: Vault, Locked
+  components:
+  - type: AccessReader
+    access: [["Security"], ["Command"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsMaintenance
+  suffix: Maintenance, Locked
+  components:
+  - type: AccessReader
+    access: [["Maintenance"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsSyndicateAgent
+  suffix: SyndicateAgent, Locked
+  components:
+  - type: AccessReader
+    access: [["SyndicateAgent"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsNukeop
+  suffix: Nukeop, Locked
+  components:
+  - type: AccessReader
+    access: [["NuclearOperative"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsRnDMed
+  suffix: Medical/Science, Locked
+  components:
+  - type: AccessReader
+    access: [["Research"], ["Medical"]]
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml
index 372b6891130..b2f159f4636 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml
@@ -35,6 +35,5 @@
         acts: [ "Destruction" ]
   - type: ApcPowerReceiver
     powerLoad: 15000
-    priority: High
   - type: StaticPrice
     price: 1500
diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
index ae454e43a2e..0563826a570 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -13,7 +13,7 @@
     programName: notekeeper-program-name
     icon:
       sprite:  Objects/Misc/books.rsi
-      state: book6
+      state: book_icon
   - type: NotekeeperCartridge
 
 - type: entity
@@ -90,5 +90,6 @@
         sprite: Structures/Doors/Airlocks/Standard/security.rsi
         state: closed
     - type: LogProbeCartridge
+    - type: GuideHelp
       guides:
         - Forensics
diff --git a/Resources/Prototypes/Entities/Objects/Devices/payload.yml b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
index 019f19e7118..160f0c58e79 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/payload.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
@@ -33,7 +33,6 @@
     maxIntensity: 10
     intensitySlope: 3
     totalIntensity: 120 # about a ~4 tile radius
-    flashRange: 7
   - type: ExplodeOnTrigger
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 7155be68d74..0f68afefe69 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -108,6 +108,7 @@
 - type: entity
   parent: BasePDA
   id: BaseMedicalPDA
+  abstract: true
   components:
   - type: HealthAnalyzer
     scanDelay: 1
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index e5a1d0412a0..9afef7abc71 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -22,7 +22,7 @@
           False: {state: icon}
   - type: ConfigurableNavMapBeacon
   - type: NavMapBeacon
-    text: station-beacon-general
+    defaultText: station-beacon-general
     color: "#D4D4D496"
   #- type: WarpPoint # Delta V - Removes in favor of Warp Point Markers
   - type: ActivatableUI
@@ -118,7 +118,7 @@
   suffix: Command
   components:
   - type: NavMapBeacon
-    text: station-beacon-command
+    defaultText: station-beacon-command
     color: "#FFFF00"
 
 - type: entity
@@ -127,7 +127,7 @@
   suffix: Bridge
   components:
   - type: NavMapBeacon
-    text: station-beacon-bridge
+    defaultText: station-beacon-bridge
 
 - type: entity
   parent: DefaultStationBeaconCommand
@@ -135,7 +135,7 @@
   suffix: Vault
   components:
   - type: NavMapBeacon
-    text: station-beacon-vault
+    defaultText: station-beacon-vault
 
 - type: entity
   parent: DefaultStationBeaconCommand
@@ -143,7 +143,7 @@
   suffix: Captain's Quarters
   components:
   - type: NavMapBeacon
-    text: station-beacon-captain
+    defaultText: station-beacon-captain
 
 - type: entity
   parent: DefaultStationBeaconCommand
@@ -151,7 +151,7 @@
   suffix: HOP's Office
   components:
   - type: NavMapBeacon
-    text: station-beacon-hop
+    defaultText: station-beacon-hop
 
 - type: entity
   parent: DefaultStationBeacon
@@ -159,7 +159,7 @@
   suffix: Security
   components:
   - type: NavMapBeacon
-    text: station-beacon-security
+    defaultText: station-beacon-security
     color: "#DE3A3A"
 
 - type: entity
@@ -168,7 +168,7 @@
   suffix: Brig
   components:
   - type: NavMapBeacon
-    text: station-beacon-brig
+    defaultText: station-beacon-brig
 
 - type: entity
   parent: DefaultStationBeaconSecurity
@@ -176,7 +176,7 @@
   suffix: Warden's Office
   components:
   - type: NavMapBeacon
-    text: station-beacon-warden
+    defaultText: station-beacon-warden
 
 - type: entity
   parent: DefaultStationBeaconSecurity
@@ -184,7 +184,7 @@
   suffix: HOS’s Room
   components:
   - type: NavMapBeacon
-    text: station-beacon-hos
+    defaultText: station-beacon-hos
 
 - type: entity
   parent: DefaultStationBeaconSecurity
@@ -192,7 +192,7 @@
   suffix: Armory
   components:
   - type: NavMapBeacon
-    text: station-beacon-armory
+    defaultText: station-beacon-armory
 
 - type: entity
   parent: DefaultStationBeaconSecurity
@@ -200,7 +200,7 @@
   suffix: Perma Brig
   components:
   - type: NavMapBeacon
-    text: station-beacon-perma-brig
+    defaultText: station-beacon-perma-brig
 
 - type: entity
   parent: DefaultStationBeaconSecurity
@@ -208,7 +208,7 @@
   suffix: Detective's Room
   components:
   - type: NavMapBeacon
-    text: station-beacon-detective
+    defaultText: station-beacon-detective
 
 - type: entity
   parent: DefaultStationBeaconSecurity
@@ -216,7 +216,7 @@
   suffix: Courtroom
   components:
   - type: NavMapBeacon
-    text: station-beacon-courtroom
+    defaultText: station-beacon-courtroom
 
 - type: entity
   parent: DefaultStationBeaconService #Delta V - Lawer is Service until Justice Dept is a thing
@@ -224,7 +224,7 @@
   suffix: Law Office
   components:
   - type: NavMapBeacon
-    text: station-beacon-law
+    defaultText: station-beacon-law
 
 - type: entity
   parent: DefaultStationBeaconSecurity
@@ -232,7 +232,7 @@
   suffix: Sec Checkpoint
   components:
   - type: NavMapBeacon
-    text: station-beacon-security-checkpoint
+    defaultText: station-beacon-security-checkpoint
 
 - type: entity
   parent: DefaultStationBeacon
@@ -240,7 +240,7 @@
   suffix: Medical
   components:
   - type: NavMapBeacon
-    text: station-beacon-medical
+    defaultText: station-beacon-medical
     color: "#52B4E9"
 
 - type: entity
@@ -249,7 +249,7 @@
   suffix: Medbay
   components:
   - type: NavMapBeacon
-    text: station-beacon-medbay
+    defaultText: station-beacon-medbay
 
 - type: entity
   parent: DefaultStationBeaconMedical
@@ -257,7 +257,7 @@
   suffix: Chemistry
   components:
   - type: NavMapBeacon
-    text: station-beacon-chemistry
+    defaultText: station-beacon-chemistry
 
 - type: entity
   parent: DefaultStationBeaconMedical
@@ -265,7 +265,7 @@
   suffix: Cryonics
   components:
   - type: NavMapBeacon
-    text: station-beacon-cryonics
+    defaultText: station-beacon-cryonics
 
 - type: entity
   parent: DefaultStationBeaconMedical
@@ -273,7 +273,7 @@
   suffix: CMO's room
   components:
   - type: NavMapBeacon
-    text: station-beacon-cmo
+    defaultText: station-beacon-cmo
 
 - type: entity
   parent: DefaultStationBeaconMedical
@@ -281,7 +281,7 @@
   suffix: Morgue
   components:
   - type: NavMapBeacon
-    text: station-beacon-morgue
+    defaultText: station-beacon-morgue
 
 - type: entity
   parent: DefaultStationBeaconMedical
@@ -289,7 +289,7 @@
   suffix: Surgery
   components:
   - type: NavMapBeacon
-    text: station-beacon-surgery
+    defaultText: station-beacon-surgery
 
 - type: entity
   parent: DefaultStationBeacon
@@ -297,7 +297,7 @@
   suffix: Epistemics #Delta V - Renamed
   components:
   - type: NavMapBeacon
-    text: station-beacon-epistemics #Delta V - Renamed
+    defaultText: station-beacon-epistemics #Delta V - Renamed
     color: "#D381C9"
 
 - type: entity
@@ -306,7 +306,7 @@
   suffix: Research and Development
   components:
   - type: NavMapBeacon
-    text: station-beacon-research-and-development
+    defaultText: station-beacon-research-and-development
 
 - type: entity
   parent: DefaultStationBeaconScience
@@ -314,7 +314,7 @@
   suffix: Research Server Room
   components:
   - type: NavMapBeacon
-    text: station-beacon-research-server
+    defaultText: station-beacon-research-server
 
 - type: entity
   parent: DefaultStationBeaconScience
@@ -322,7 +322,7 @@
   suffix: MG's Room
   components:
   - type: NavMapBeacon
-    text: station-beacon-mystagogue  #Delta V - Renamed
+    defaultText: station-beacon-mystagogue  #Delta V - Renamed
 
 - type: entity
   parent: DefaultStationBeaconScience
@@ -330,7 +330,7 @@
   suffix: Robotics
   components:
   - type: NavMapBeacon
-    text: station-beacon-robotics
+    defaultText: station-beacon-robotics
 
 - type: entity
   parent: DefaultStationBeaconScience
@@ -338,7 +338,7 @@
   suffix: Artifact Lab
   components:
   - type: NavMapBeacon
-    text: station-beacon-artifact-lab
+    defaultText: station-beacon-artifact-lab
 
 - type: entity
   parent: DefaultStationBeaconScience
@@ -346,7 +346,7 @@
   suffix: Anomaly Generator
   components:
   - type: NavMapBeacon
-    text: station-beacon-anomaly-gen
+    defaultText: station-beacon-anomaly-gen
 
 - type: entity
   parent: DefaultStationBeacon
@@ -354,7 +354,7 @@
   suffix: Logistics #Delta V - Renamed
   components:
   - type: NavMapBeacon
-    text: station-beacon-logistics #Delta V - Renamed
+    defaultText: station-beacon-logistics #Delta V - Renamed
     color: "#A46106"
 
 - type: entity
@@ -363,7 +363,7 @@
   suffix: Logistics Reception #Delta V - Renamed
   components:
   - type: NavMapBeacon
-    text: station-beacon-logistics-reception #Delta V - Renamed
+    defaultText: station-beacon-logistics-reception #Delta V - Renamed
 
 - type: entity
   parent: DefaultStationBeaconSupply
@@ -371,7 +371,7 @@
   suffix: Cargo Bay
   components:
   - type: NavMapBeacon
-    text: station-beacon-cargo-bay
+    defaultText: station-beacon-cargo-bay
 
 - type: entity
   parent: DefaultStationBeaconSupply
@@ -379,7 +379,7 @@
   suffix: LO #Delta V - Renamed
   components:
   - type: NavMapBeacon
-    text: station-beacon-lo #Delta V - Renamed
+    defaultText: station-beacon-lo #Delta V - Renamed
 
 - type: entity
   parent: DefaultStationBeaconSupply
@@ -387,7 +387,7 @@
   suffix: Salvage
   components:
   - type: NavMapBeacon
-    text: station-beacon-salvage
+    defaultText: station-beacon-salvage
 
 - type: entity
   parent: DefaultStationBeacon
@@ -395,7 +395,7 @@
   suffix: Engineering
   components:
   - type: NavMapBeacon
-    text: station-beacon-engineering
+    defaultText: station-beacon-engineering
     color: "#EFB341"
 
 - type: entity
@@ -404,7 +404,7 @@
   suffix: CE's Room
   components:
   - type: NavMapBeacon
-    text: station-beacon-ce
+    defaultText: station-beacon-ce
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -412,7 +412,7 @@
   suffix: AME
   components:
   - type: NavMapBeacon
-    text: station-beacon-ame
+    defaultText: station-beacon-ame
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -420,7 +420,7 @@
   suffix: Solars
   components:
   - type: NavMapBeacon
-    text: station-beacon-solars
+    defaultText: station-beacon-solars
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -428,7 +428,7 @@
   suffix: Grav Gen
   components:
   - type: NavMapBeacon
-    text: station-beacon-gravgen
+    defaultText: station-beacon-gravgen
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -436,7 +436,7 @@
   suffix: PA Control
   components:
   - type: NavMapBeacon
-    text: station-beacon-pa
+    defaultText: station-beacon-pa
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -444,7 +444,7 @@
   suffix: SMES Power Bank
   components:
   - type: NavMapBeacon
-    text: station-beacon-smes
+    defaultText: station-beacon-smes
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -452,7 +452,7 @@
   suffix: Telecoms
   components:
   - type: NavMapBeacon
-    text: station-beacon-telecoms
+    defaultText: station-beacon-telecoms
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -460,7 +460,7 @@
   suffix: Atmospherics
   components:
   - type: NavMapBeacon
-    text: station-beacon-atmos
+    defaultText: station-beacon-atmos
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -468,7 +468,7 @@
   suffix: TEG
   components:
   - type: NavMapBeacon
-    text: station-beacon-teg
+    defaultText: station-beacon-teg
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -476,7 +476,7 @@
   suffix: Tech Vault
   components:
   - type: NavMapBeacon
-    text: station-beacon-tech-vault
+    defaultText: station-beacon-tech-vault
 
 - type: entity
   parent: DefaultStationBeacon
@@ -484,7 +484,7 @@
   suffix: Service
   components:
   - type: NavMapBeacon
-    text: station-beacon-service
+    defaultText: station-beacon-service
     color: "#9FED58"
 
 - type: entity
@@ -493,7 +493,7 @@
   suffix: Kitchen
   components:
   - type: NavMapBeacon
-    text: station-beacon-kitchen
+    defaultText: station-beacon-kitchen
 
 - type: entity
   parent: DefaultStationBeaconService
@@ -501,7 +501,7 @@
   suffix: Bar
   components:
   - type: NavMapBeacon
-    text: station-beacon-bar
+    defaultText: station-beacon-bar
 
 - type: entity
   parent: DefaultStationBeaconService
@@ -509,7 +509,7 @@
   suffix: Botany
   components:
   - type: NavMapBeacon
-    text: station-beacon-botany
+    defaultText: station-beacon-botany
 
 - type: entity
   parent: DefaultStationBeaconService
@@ -517,7 +517,7 @@
   suffix: Janitor's Closet
   components:
   - type: NavMapBeacon
-    text: station-beacon-janitor-closet #Delta V - Add for closet/outpost
+    defaultText: station-beacon-janitor-closet #Delta V - Add for closet/outpost
 
 - type: entity
   parent: DefaultStationBeacon
@@ -525,7 +525,7 @@
   suffix: AI
   components:
   - type: NavMapBeacon
-    text: station-beacon-ai
+    defaultText: station-beacon-ai
     color: "#2ed2fd"
 
 - type: entity
@@ -534,7 +534,7 @@
   suffix: AI Satellite
   components:
   - type: NavMapBeacon
-    text: station-beacon-ai-sat
+    defaultText: station-beacon-ai-sat
 
 - type: entity
   parent: DefaultStationBeaconAI
@@ -542,7 +542,7 @@
   suffix: AI Core
   components:
   - type: NavMapBeacon
-    text: station-beacon-ai-core
+    defaultText: station-beacon-ai-core
 
 - type: entity
   parent: DefaultStationBeacon
@@ -550,7 +550,7 @@
   suffix: Arrivals
   components:
   - type: NavMapBeacon
-    text: station-beacon-arrivals
+    defaultText: station-beacon-arrivals
 
 - type: entity
   parent: DefaultStationBeacon
@@ -558,7 +558,7 @@
   suffix: Evac
   components:
   - type: NavMapBeacon
-    text: station-beacon-evac
+    defaultText: station-beacon-evac
 
 - type: entity
   parent: DefaultStationBeacon
@@ -566,7 +566,7 @@
   suffix: EVA Storage
   components:
   - type: NavMapBeacon
-    text: station-beacon-eva-storage
+    defaultText: station-beacon-eva-storage
 
 - type: entity
   parent: DefaultStationBeaconScience #Delta V - Chapel in Epi
@@ -574,7 +574,7 @@
   suffix: Chapel
   components:
   - type: NavMapBeacon
-    text: station-beacon-chapel
+    defaultText: station-beacon-chapel
 
 - type: entity
   parent: DefaultStationBeacon
@@ -582,7 +582,7 @@
   suffix: Library
   components:
   - type: NavMapBeacon
-    text: station-beacon-library
+    defaultText: station-beacon-library
 
 - type: entity
   parent: DefaultStationBeacon
@@ -590,7 +590,7 @@
   suffix: Theater
   components:
   - type: NavMapBeacon
-    text: station-beacon-theater
+    defaultText: station-beacon-theater
 
 - type: entity
   parent: DefaultStationBeacon
@@ -598,7 +598,7 @@
   suffix: Dorms
   components:
   - type: NavMapBeacon
-    text: station-beacon-dorms
+    defaultText: station-beacon-dorms
 
 - type: entity
   parent: DefaultStationBeacon
@@ -606,7 +606,7 @@
   suffix: Tool Room
   components:
   - type: NavMapBeacon
-    text: station-beacon-tools
+    defaultText: station-beacon-tools
 
 - type: entity
   parent: DefaultStationBeacon
@@ -614,7 +614,7 @@
   suffix: Disposals
   components:
   - type: NavMapBeacon
-    text: station-beacon-disposals
+    defaultText: station-beacon-disposals
 
 - type: entity
   parent: DefaultStationBeacon
@@ -622,7 +622,7 @@
   suffix: Cryosleep
   components:
   - type: NavMapBeacon
-    text: station-beacon-cryosleep
+    defaultText: station-beacon-cryosleep
 
 - type: entity
   parent: DefaultStationBeacon
@@ -630,4 +630,4 @@
   suffix: Escape Pod
   components:
   - type: NavMapBeacon
-    text: station-beacon-escape-pod
+    defaultText: station-beacon-escape-pod
diff --git a/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml b/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
index fc947efe9a3..7b2f40ad9dd 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/translator_implants.yml
@@ -1,132 +1,128 @@
 - type: entity
-  abstract: true
-  id: BaseTranslatorImplanter
-  parent: [ BaseItem ]
-  name: basic translator implant
-  description: Translates speech.
+  parent: BaseSubdermalImplant
+  id: BasicGalacticCommonTranslatorImplant
+  name: basic common translator implant
+  description: Provides your illiterate friends the ability to understand the common galactic tongue.
+  noSpawn: true
   components:
-  - type: Sprite
-    sprite: Objects/Specific/Medical/implanter.rsi
-    state: implanter0
-    layers:
-    - state: implanter1
-      map: [ "implantFull" ]
-      visible: true
-    - state: implanter0
-      map: [ "implantBroken" ]
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.ImplanterVisuals.Full:
-        implantFull:
-          True: {visible: true}
-          False: {visible: false}
-        implantBroken:
-          True: {visible: false}
-          False: {visible: true}
-
-- type: entity
-  id: BasicGalaticCommonTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: basic Galactic Common translator implant
-  description: An implant giving the ability to understand Galactic Common.
-  components:
-  - type: TranslatorImplanter
+  - type: TranslatorImplant
     understood:
     - GalacticCommon
 
 - type: entity
-  id: AdvancedGalaticCommonTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: advanced Galactic Common translator implant
-  description: An implant giving the ability to understand and speak Galactic Common.
+  parent: BaseSubdermalImplant
+  id: GalacticCommonTranslatorImplant
+  name: advanced common translator implant
+  description: A more advanced version of the translator implant, teaches your illiterate friends the ability to both speak and understand the galactic tongue!
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - GalacticCommon
+  - type: TranslatorImplant
     understood:
     - GalacticCommon
+    spoken:
+    - GalacticCommon
 
 - type: entity
-  id: BubblishTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Bubblish translator implant
-  description: An implant giving the ability to understand and speak Bubblish.
+  parent: BaseSubdermalImplant
+  id: BubblishTranslatorImplant
+  name: bubblish translator implant
+  description: An implant that helps you speak and understand the language of slimes! Special vocal chords not included.
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - Bubblish
+  - type: TranslatorImplant
     understood:
     - Bubblish
+    spoken:
+    - Bubblish
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: NekomimeticTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Nekomimetic translator implant
-  description: An implant giving the ability to understand and speak Nekomimetic. Nya~!
+  parent: BaseSubdermalImplant
+  id: NekomimeticTranslatorImplant
+  name: nekomimetic translator implant
+  description: A translator implant intially designed to help domestic cat owners understand their pets, now granting the ability to understand and speak to Felinids!
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - Nekomimetic
+  - type: TranslatorImplant
     understood:
     - Nekomimetic
+    spoken:
+    - Nekomimetic
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: DraconicTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Draconic translator implant
-  description: An implant giving the ability to understand and speak Draconic.
+  parent: BaseSubdermalImplant
+  id: DraconicTranslatorImplant
+  name: draconic translator implant
+  description: A translator implant giving the ability to speak to dragons! Subsequently, also allows to communicate with the Unathi.
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - Draconic
+  - type: TranslatorImplant
     understood:
     - Draconic
+    spoken:
+    - Draconic
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: CanilunztTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: Canilunzt translator implant
-  description: An implant giving the ability to understand and speak Canilunzt. Yeeps!
+  parent: BaseSubdermalImplant
+  id: CanilunztTranslatorImplant
+  name: canilunzt translator implant
+  description: A translator implant that helps you communicate with your local yeepers. Yeep!
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - Canilunzt
+  - type: TranslatorImplant
     understood:
     - Canilunzt
+    spoken:
+    - Canilunzt
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: SolCommonTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: SolCommon translator implant
+  parent: BaseSubdermalImplant
+  id: SolCommonTranslatorImplant
+  name: sol-common translator implant
   description: An implant giving the ability to understand and speak SolCommon. Raaagh!
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - SolCommon
+  - type: TranslatorImplant
     understood:
     - SolCommon
+    spoken:
+    - SolCommon
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: RootSpeakTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
-  name: RootSpeak translator implant
-  description: An implant giving the ability to understand and speak RootSpeak.
+  parent: BaseSubdermalImplant
+  id: RootSpeakTranslatorImplant
+  name: root-speak translator implant
+  description: An implant that lets you speak for the trees. Or to the trees.
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - RootSpeak
+  - type: TranslatorImplant
     understood:
     - RootSpeak
+    spoken:
+    - RootSpeak
+    requires:
+    - GalacticCommon
 
 - type: entity
-  id: MofficTranslatorImplanter
-  parent: [ BaseTranslatorImplanter ]
+  parent: BaseSubdermalImplant
+  id: MofficTranslatorImplant
   name: Moffic translator implant
-  description: An implant giving the ability to understand and speak Moffic.
+  description: An implant designed to help domesticate mothroaches. Subsequently, allows you to communicate with the moth people.
+  noSpawn: true
   components:
-  - type: TranslatorImplanter
-    spoken:
-    - Moffic
+  - type: TranslatorImplant
     understood:
     - Moffic
+    spoken:
+    - Moffic
+    requires:
+    - GalacticCommon
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/translators.yml b/Resources/Prototypes/Entities/Objects/Devices/translators.yml
index e5ad824c5d9..d75b7af7fd6 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/translators.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/translators.yml
@@ -1,7 +1,8 @@
+# Translator that doesn't need power to work
 - type: entity
-  abstract: true
+  noSpawn: true
   id: TranslatorUnpowered
-  parent: [ BaseItem ]
+  parent: BaseItem
   name: translator
   description: Translates speech.
   components:
@@ -23,33 +24,46 @@
           False: { visible: false }
   - type: HandheldTranslator
     enabled: false
+  - type: Clothing # To allow equipping translators on the neck slot
+    slots: [neck]
+    equipDelay: 0.3
+    unequipDelay: 0.3
+    quickEquip: false # Would conflict
 
+# Base translator that uses a power cell. Starts with an empty slot.
 - type: entity
-  abstract: true
-  id: Translator
+  noSpawn: true
+  id: TranslatorPoweredBase
   parent: [ TranslatorUnpowered, PowerCellSlotMediumItem ]
-  suffix: Powered
   components:
   - type: PowerCellDraw
     drawRate: 1
-
-- type: entity
-  abstract: true
-  id: TranslatorEmpty
-  parent: [ Translator ]
-  suffix: Empty
-  components:
   - type: ItemSlots
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default
 
+# Normal translator with medium power cell in it
+- type: entity
+  noSpawn: true
+  id: Translator
+  parent: [ PowerCellSlotMediumItem, TranslatorPoweredBase ]
+  suffix: Powered
+
+# Normal translator with a high power cell and special appearance
+- type: entity
+  noSpawn: true
+  id: TranslatorForeigner
+  parent: [ PowerCellSlotHighItem, TranslatorPoweredBase ]
+  name: foreigner's translator
+  description: A special-issue translator that helps foreigner's speak and understand this station's primary language.
+
 
 - type: entity
   id: CanilunztTranslator
-  parent: [ TranslatorEmpty ]
+  parent: [ TranslatorPoweredBase ]
   name: Canilunzt translator
-  description: Translates speech between Canilunzt and Galactic Common.
+  description: Translates speech between Canilunzt and Galactic Common, allowing your local yeepers to communicate with the locals and vice versa!
   components:
   - type: HandheldTranslator
     spoken:
@@ -64,9 +78,9 @@
 
 - type: entity
   id: BubblishTranslator
-  parent: [ TranslatorEmpty ]
+  parent: [ TranslatorPoweredBase ]
   name: Bubblish translator
-  description: Translates speech between Bubblish and Galactic Common.
+  description: Translates speech between Bubblish and Galactic Common, helping communicate with slimes and slime people.
   components:
   - type: HandheldTranslator
     spoken:
@@ -81,9 +95,9 @@
 
 - type: entity
   id: NekomimeticTranslator
-  parent: [ TranslatorEmpty ]
+  parent: [ TranslatorPoweredBase ]
   name: Nekomimetic translator
-  description: Translates speech between Nekomimetic and Galactic Common. Why would you want that?
+  description: Translates speech between Nekomimetic and Galactic Common, enabling you to communicate with your pet cats.
   components:
   - type: HandheldTranslator
     spoken:
@@ -98,9 +112,9 @@
 
 - type: entity
   id: DraconicTranslator
-  parent: [ TranslatorEmpty ]
+  parent: [ TranslatorPoweredBase ]
   name: Draconic translator
-  description: Translates speech between Draconic and Galactic Common.
+  description: Translates speech between Draconic and Galactic Common, making it easier to understand your local Uniathi.
   components:
   - type: HandheldTranslator
     spoken:
@@ -115,7 +129,7 @@
 
 - type: entity
   id: SolCommonTranslator
-  parent: [ TranslatorEmpty ]
+  parent: [ TranslatorPoweredBase ]
   name: Sol Common translator
   description: Translates speech between Sol Common and Galactic Common. Like a true Earthman!
   components:
@@ -132,9 +146,9 @@
 
 - type: entity
   id: RootSpeakTranslator
-  parent: [ TranslatorEmpty ]
+  parent: [ TranslatorPoweredBase ]
   name: RootSpeak translator
-  description: Translates speech between RootSpeak and Galactic Common. Like a true plant?
+  description: Translates speech between RootSpeak and Galactic Common. You may now speak for the trees.
   components:
   - type: HandheldTranslator
     spoken:
@@ -149,9 +163,9 @@
 
 - type: entity
   id: MofficTranslator
-  parent: [ TranslatorEmpty ]
+  parent: [ TranslatorPoweredBase ]
   name: Moffic translator
-  description: Translates speech between Moffic and Galactic Common. Like a true moth... or bug?
+  description: Translates speech between Moffic and Galactic Common, helping you understand the buzzes of your pet mothroach!
   components:
   - type: HandheldTranslator
     spoken:
@@ -166,9 +180,9 @@
 
 - type: entity
   id: XenoTranslator
-  parent: [ TranslatorEmpty ]
+  parent: [ TranslatorPoweredBase ]
   name: Xeno translator
-  description: Translates speech between Xeno and Galactic Common. Not sure if that will help.
+  description: Translates speech between Xeno and Galactic Common. This will probably not help you survive an encounter, though.
   components:
   - type: HandheldTranslator
     spoken:
@@ -182,9 +196,9 @@
 
 - type: entity
   id: AnimalTranslator
-  parent: [ TranslatorEmpty ]
+  parent: [ TranslatorPoweredBase ]
   name: Animal translator
-  description: Translates all the cutes noises that animals make into a more understandable form!
+  description: Translates all the cutes noises that most animals make into a more understandable form!
   components:
   - type: HandheldTranslator
     understood:
@@ -203,3 +217,4 @@
     - Kobold
     requires:
     - GalacticCommon
+    setLanguageOnInteract: 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..fab8b56b06f 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -183,6 +183,13 @@
   - type: Tag
     tags:
     - StringInstrument
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/SimpleStation14/Weapons/Melee/banjohit.ogg
+    damage:
+      types:
+        Blunt: 7
+    bluntStaminaDamageFactor: 1.5
 
 - type: entity
   parent: BaseHandheldInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
index ad4d2eac8a5..191bb75e50e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
@@ -163,9 +163,6 @@
   - type: Appearance
   - type: WiresVisuals
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-dawinstrument
-    layoutId: DawInstrument
   - type: Machine
     board: DawInstrumentMachineCircuitboard
   - type: Instrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 391823dc52f..4c7ae68420b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -53,10 +53,10 @@
     solution: melee
   - type: InjectableSolution
     solution: melee
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 2
+    solution: melee
     blockSlots: OUTERCLOTHING
-    fixtureId: "throw-fixture"
   - type: SolutionTransfer
     maxTransferAmount: 2
   - type: Damageable
@@ -124,10 +124,9 @@
     solutions:
       melee:
         maxVol: 7
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 7
-    blockSlots: NONE
-    fixtureId: "throw-fixture"
+    solution: melee
   - type: SolutionTransfer
     maxTransferAmount: 7
 
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
index 81a9c173c7f..852a1c2699c 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -120,7 +120,6 @@
         - ItemMask
   - type: StepTrigger
     intersectRatio: 0.2
-    requiredTriggeredSpeed: 0
   - type: TriggerOnStepTrigger
   - type: ShoesRequiredStepTrigger
   - type: Slippery
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index 6a5d3c36f55..d8932bc0e5d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -322,7 +322,7 @@
   parent: BaseFigurine
   id: ToyFigurineNukieElite
   name: elite syndicate operative figure
-  description: A figurine depicting someone in an elite blood-red hardsuit, similar to what the medic of a nuclear operative team might wear.
+  description: A figurine depicting someone in an elite blood-red hardsuit, similar to what someone on a nuclear operative team might wear.
   components:
   - type: Sprite
     state: nukie_elite
diff --git a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
index 466e433e8b5..7ff6c43e29b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
@@ -11,8 +11,6 @@
     state: icon
     noRot: false
   - type: ImmovableRod
-  - type: TimedDespawn
-    lifetime: 30.0
   - type: Physics
     bodyType: Dynamic
     linearDamping: 0
@@ -36,8 +34,15 @@
     location: immovable rod
 
 - type: entity
+  id: ImmovableRodDespawn
   parent: ImmovableRod
+  components:
+  - type: TimedDespawn
+    lifetime: 30.0
+
+- type: entity
   id: ImmovableRodSlow
+  parent: ImmovableRodDespawn
   suffix: Slow
   components:
   - type: ImmovableRod
@@ -45,7 +50,7 @@
     maxSpeed: 5
 
 - type: entity
-  parent: ImmovableRod
+  parent: ImmovableRodDespawn
   id: ImmovableRodKeepTiles
   suffix: Keep Tiles
   components:
@@ -53,6 +58,33 @@
     destroyTiles: false
     hitSoundProbability: 1.0
 
+# For Wizard Polymorph
+- type: entity
+  parent: ImmovableRod
+  id: ImmovableRodWizard
+  suffix: Wizard
+  components:
+  - type: ImmovableRod
+    minSpeed: 35
+    destroyTiles: false
+    randomizeVelocity: false
+    shouldGib: false
+    damage:
+      types:
+        Blunt: 200
+  - type: MovementIgnoreGravity
+    gravityState: true
+  - type: InputMover
+  - type: MovementSpeedModifier
+    weightlessAcceleration: 5
+    weightlessModifier: 2
+    weightlessFriction: 0
+    friction: 0
+    frictionNoInput: 0
+  - type: CanMoveInAir
+  - type: MovementAlwaysTouching
+  - type: NoSlip
+
 - type: entity
   parent: ImmovableRodKeepTiles
   id: ImmovableRodKeepTilesStill
diff --git a/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml b/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml
deleted file mode 100644
index 1b417f6cde0..00000000000
--- a/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml
+++ /dev/null
@@ -1,292 +0,0 @@
-# Base Paints
-- type: entity
-  parent: BaseItem
-  id: PaintBase
-  name: spray paint
-  description: A tin of spray paint.
-  noSpawn: true
-  components:
-  - type: Appearance
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: clown_cap
-    layers:
-      - state: clown_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: Paint
-    consumptionUnit: 10
-    blacklist:
-      tags:
-        - NoPaint
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: spray
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 50
-        reagents:
-        - ReagentId: SpaceGlue
-          Quantity: 50
-  - type: TrashOnSolutionEmpty
-    solution: drink
-  - type: Sealable
-  - type: Openable
-    sound:
-      path: /Audio/Effects/pop_high.ogg
-    closeable: true
-    closeSound:
-      path: /Audio/Effects/pop_high.ogg
-
-# Paints
-
-# funnypaint
-- type: entity
-  parent: PaintBase
-  id: FunnyPaint
-  name: funny paint
-  description:  A tin of funny paint, manufactured by Honk! Co.
-  components:
-  - type: Paint
-    color: "#fa74df"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: clown
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "clown"}
-          False: {state: "clown_cap"}
-
-- type: entity
-  parent: PaintBase
-  id: FunnyPaintYellow
-  name: funny paint
-  description:  A tin of funny paint, manufactured by Honk! Co.
-  components:
-  - type: Paint
-    color: "#d5e028"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: clown
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: clown2_cap
-    layers:
-      - state: clown2_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "clown2"}
-          False: {state: "clown2_cap"}
-
-#death paint
-- type: entity
-  parent: PaintBase
-  id: DeathPaint
-  components:
-  - type: Paint
-    color: "#ff20c8"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: spray
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: death_cap
-    layers:
-      - state: death_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "death"}
-          False: {state: "death_cap"}
-
-- type: entity
-  parent: PaintBase
-  id: DeathPaintTwo
-  components:
-  - type: Paint
-    color: "#ff2020"
-  - type: Item
-    sprite: Objects/Fun/spraycans.rsi
-    heldPrefix: spray
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    state: death2_cap
-    layers:
-      - state: death2_cap
-        map: ["enum.OpenableVisuals.Layer"]
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "death2"}
-          False: {state: "death2_cap"}
-
-#Sprays
-
-#Blue
-- type: entity
-  parent: PaintBase
-  id: SprayPaintBlue
-  suffix: Blue
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#5890f7"
-  - type: Paint
-    color: "#5890f7"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#5890f7"}
-          False: {state: "spray_cap_colors" , color: "#5890f7"}
-
-#Red
-- type: entity
-  parent: PaintBase
-  id: SprayPaintRed
-  suffix: Red
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#ff3b3b"
-  - type: Paint
-    color: "#ff3b3b"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#ff3b3b"}
-          False: {state: "spray_cap_colors" , color: "#ff3b3b"}
-
-#Green
-- type: entity
-  parent: PaintBase
-  id: SprayPaintGreen
-  suffix: Green
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#73f170"
-  - type: Paint
-    color: "#73f170"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#73f170"}
-          False: {state: "spray_cap_colors" , color: "#73f170"}
-
-#Black
-- type: entity
-  parent: PaintBase
-  id: SprayPaintBlack
-  suffix: Black
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#3a3a3a"
-  - type: Paint
-    color: "#3a3a3a"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#3a3a3a"}
-          False: {state: "spray_cap_colors" , color: "#3a3a3a"}
-
-#Orange
-- type: entity
-  parent: PaintBase
-  id: SprayPaintOrange
-  suffix: Orange
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#f6a44b"
-  - type: Paint
-    color: "#f6a44b"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#f6a44b"}
-          False: {state: "spray_cap_colors" , color: "#f6a44b"}
-
-#Purple
-- type: entity
-  parent: PaintBase
-  id: SprayPaintPurple
-  suffix: Purple
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#c063f5"
-  - type: Paint
-    color: "#c063f5"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#c063f5"}
-          False: {state: "spray_cap_colors" , color: "#c063f5"}
-
-#White
-- type: entity
-  parent: PaintBase
-  id: SprayPaintWhite
-  suffix: White
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/spraycans.rsi
-    layers:
-      - state: spray
-        map: ["Base"]
-      - state: spray_cap_colors
-        map: ["enum.OpenableVisuals.Layer"]
-        color: "#f2f2f2"
-  - type: Paint
-    color: "#f2f2f2"
-  - type: GenericVisualizer
-    visuals:
-      enum.OpenableVisuals.Opened:
-        enum.OpenableVisuals.Layer:
-          True: {state: "spray_colors" , color: "#f2f2f2"}
-          False: {state: "spray_cap_colors" , color: "#f2f2f2"}
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 67c6e1194b7..094f434c39c 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -750,6 +750,34 @@
     sound:
       path: /Audio/Voice/Human/malescream_5.ogg
 
+- type: entity
+  parent: BasePlushie
+  id: PlushieArachne
+  name: Arachne plushie
+  description: A plushie of an Arachne, a half human, half spider creature. Why does it look familiar?
+  components:
+  - type: Sprite
+    state: plushie_arachne
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Voice/Human/womanlaugh.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Voice/Human/female_sigh.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Voice/Human/womanlaugh.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Voice/Human/femalescream_4.ogg
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Voice/Human/femalescream_2.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Voice/Human/femalescream_5.ogg
+
 - type: entity
   parent: BasePlushie
   id: PlushieMoth
@@ -1184,7 +1212,6 @@
   description: New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing!
   components:
     - type: EnergySword
-      isSharp: false
       colorOptions:
         - DodgerBlue
     - type: ItemToggle
@@ -1318,9 +1345,7 @@
   components:
     - type: Sprite
       sprite: Objects/Fun/rubber_hammer.rsi
-      layers:
-        - state: icon
-          shader: unshaded
+      state: icon
     - type: WeaponRandom
       damageBonus:
           types:
@@ -1432,6 +1457,9 @@
         reagents:
         - ReagentId: Nothing
           Quantity: 100
+  - type: Tag
+    tags:
+    - Banana
 
 - type: entity
   parent: DrinkBase
diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml
index 89acd9e7dab..6202767ff12 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -7,11 +7,23 @@
     - type: Sprite
       sprite: Objects/Misc/books.rsi
       layers:
-        - state: book_demonomicon
+      - state: paper_blood
+      - state: cover_strong
+        color: "#645a5a" 
+      - state: decor_wingette_flat
+        color: "#4d0303"
+      - state: icon_pentagramm
+        color: "#f7e19f"
     - type: Spellbook
     - type: Tag
       tags:
       - Spellbook
+    - type: EmitSoundOnPickup
+      sound: /Audio/SimpleStation14/Items/Handling/book_pickup.ogg
+    - type: EmitSoundOnDrop
+      sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg
+    - type: EmitSoundOnLand
+      sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg
 
 - type: entity
   id: SpawnSpellbook
@@ -28,9 +40,19 @@
   parent: BaseSpellbook
   components:
     - type: Sprite
-      sprite: Objects/Magic/spellbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: bookforcewall
+      - state: paper
+      - state: cover_strong
+        color: "#366ed6"
+      - state: decor_vertical_middle
+        color: "#95ffff"
+      - state: decor_wingette_circle
+        color: "#95ffff"
+      - state: icon_magic_forcewall
+        shader: unshaded
+      - state: detail_rivets
+        color: gold
     - type: Spellbook
       spells:
         ActionForceWall: -1
@@ -41,9 +63,17 @@
   parent: BaseSpellbook
   components:
     - type: Sprite
-      sprite: Objects/Magic/spellbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: spellbook
+      - state: paper
+      - state: cover_old
+        color: "#657e9c"
+      - state: icon_text3
+      - state: decor_wingette_circle
+        color: gold
+      - state: icon_magic
+      - state: detail_rivets
+        color: gold
     - type: Spellbook
       spells:
         ActionBlink: -1
@@ -53,13 +83,23 @@
   name: smite spellbook
   parent: BaseSpellbook
   components:
-  - type: Sprite
-    sprite: Objects/Magic/spellbooks.rsi
-    layers:
-    - state: spellbook
-  - type: Spellbook
-    spells:
-      ActionSmite: -1
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_old
+        color: "#c42b40"
+      - state: decor_wingette_circle
+        color: gold
+      - state: icon_magic
+      - state: detail_rivets
+        color: gold
+      - state: detail_bookmark
+        color: red
+      - state: overlay_blood
+    - type: Spellbook
+      spells:
+        ActionSmite: -1
 
 - type: entity
   id: KnockSpellbook
@@ -67,9 +107,18 @@
   parent: BaseSpellbook
   components:
     - type: Sprite
-      sprite: Objects/Magic/spellbooks.rsi
+      sprite: Objects/Misc/books.rsi
       layers:
-        - state: bookknock
+      - state: paper
+      - state: cover_strong
+        color: "#117045"
+      - state: decor_wingette_circle
+        color: gold
+      - state: icon_magic_knock
+      - state: detail_rivets
+        color: gold
+      - state: detail_bookmark
+        color: "#98c495"
     - type: Spellbook
       spells:
         ActionKnock: -1
@@ -79,13 +128,24 @@
   name: fireball spellbook
   parent: BaseSpellbook
   components:
-  - type: Sprite
-    sprite: Objects/Magic/spellbooks.rsi
-    layers:
-    - state: bookfireball
-  - type: Spellbook
-    spells:
-      ActionFireball: -1
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_old
+        color: "#ba5a14"
+      - state: decor_wingette_circle
+        color: gold
+      - state: detail_rivets
+        color: gold
+      - state: detail_bookmark
+        color: "#e89b3c"
+      - state: overlay_blood
+      - state: icon_magic_fireball
+        shader: unshaded
+    - type: Spellbook
+      spells:
+        ActionFireball: -1
 
 - type: entity
   id: ScrollRunes
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
index 2e0eec7a658..59d8ed19220 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -15,7 +15,6 @@
   - type: Tag
     tags:
     - Sheet
-    - NoPaint
   - type: Material
   - type: Damageable
     damageContainer: Inorganic
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
index 3a887848bf5..82b9f62837a 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -15,7 +15,6 @@
     tags:
     - Sheet
     - Metal
-    - NoPaint
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index 9dc87a9117d..dfb51336289 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -12,7 +12,6 @@
   - type: Tag
     tags:
     - Sheet
-    - NoPaint
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -111,7 +110,6 @@
   - type: Tag
     tags:
     - Sheet
-    - NoPaint
 
 - type: entity
   parent: SheetPlasma
@@ -134,7 +132,6 @@
     tags:
     - Plastic
     - Sheet
-    - NoPaint
   - type: Material
   - type: PhysicalComposition
     materialComposition:
diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
index 884a5531e7f..8f522abce42 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
@@ -134,3 +134,18 @@
     tags:
       - Trash
       - CrystalRed
+
+- type: entity
+  parent: ShardCrystalBase
+  id: ShardCrystalRandom
+  name: random crystal shard
+  components:
+  - type: RandomSpawner
+    prototypes:
+      - ShardCrystalGreen
+      - ShardCrystalPink
+      - ShardCrystalOrange
+      - ShardCrystalBlue
+      - ShardCrystalCyan
+      - ShardCrystalRed
+    chance: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 6601181a91f..890ea529aca 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -12,7 +12,6 @@
   - type: Tag
     tags:
       - RawMaterial
-      - NoPaint
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 6a3ba22abcf..5fcb006cfa5 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -65,7 +65,6 @@
         acts: [ "Destruction" ]
   - type: StepTrigger
     intersectRatio: 0.2
-    requiredTriggeredSpeed: 0
   - type: ShoesRequiredStepTrigger
   - type: Slippery
     slipSound:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml b/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
deleted file mode 100644
index 70d984240ea..00000000000
--- a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
+++ /dev/null
@@ -1,403 +0,0 @@
-- type: entity
-  parent: BookBase
-  id: BookNarsieLegend
-  name: the legend of nar'sie
-  description: The book is an old, leather-bound tome with intricate engravings on the cover. The pages are yellowed and fragile with age, with the ink of the text faded in some places. It appears to have been well-read and well-loved, with dog-eared pages and marginalia scrawled in the margins. Despite its aged appearance, the book still exudes a sense of mystical power and wonder, hinting at the secrets and knowledge contained within its pages.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_narsie_legend
-    - type: Paper
-      content: book-text-narsielegend
-
-- type: entity
-  parent: BookBase
-  id: BookTruth
-  name: exploring different philosophical perspectives on truth and the complexity of lying
-  description: A book exploring the different philosophical perspectives on truth and lying has a worn cover, with creases and marks indicating frequent use and thoughtful contemplation. The spine shows signs of wear from being pulled off the shelf again and again. The pages themselves are filled with underlines, notes in the margins, and highlighted passages as readers grapple with the nuances and complexities of the topic.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_truth
-    - type: Paper
-      content: book-text-truth
-
-- type: entity
-  parent: BookBase
-  id: BookWorld
-  name: shaping the state of the world - interplay of forces and choices
-  description: The book is a well-preserved hardcover with a simple, elegant design on the cover, depicting the image of a world in motion. The pages are crisp and clean, with no signs of wear or tear, suggesting that it has been well-cared for and valued by its previous owner. The text is printed in a clear, legible font, and the chapters are organized in a logical and easy-to-follow manner, making it accessible to readers of all levels of expertise.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_world
-    - type: Paper
-      content: book-text-world
-
-- type: entity
-  parent: BookBase
-  id: BookIanAntarctica
-  name: adventures of robert & ian - exploring antarctica
-  description: The book is a small paperback in good condition, with an illustration of Ian the corgi and the colony of penguins on the cover. The title, "Ian and Robert's Antarctic Adventure", is written in bold white letters against a blue background. The back cover features a brief summary of the story, highlighting the themes of humility, resilience, and the beauty of nature.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_ian_antarctica
-    - type: Paper
-      content: book-text-ian-antarctica
-
-- type: entity
-  parent: BookBase
-  id: BookSlothClownSSS
-  name: the sloth and the clown - space station shenanigans
-  description: The book looks new, with a glossy cover featuring Chuckles the clown and Snuggles the sloth floating in space with a backdrop of stars and planets. Chuckles is dressed in his banana costume and Snuggles is sleeping on a hammock made of space ropes. The title "The Sloth and the Clown - Space Station Shenanigans" is written in bold and colorful letters.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_scsss
-    - type: Paper
-      content: book-text-sloth-clown-sss
-
-- type: entity
-  parent: BookBase
-  id: BookSlothClownPranks
-  name: the sloth and the clown - pranks on zorgs
-  description: The book is in excellent condition, with crisp pages and a bright cover. The cover of the book features Chuckles and Snuggles, surrounded by the different species they encountered during their adventures in space. In the background, the Zorgs can be seen peeking out from behind a spaceship.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_scpz
-    - type: Paper
-      content: book-text-sloth-clown-pz
-
-- type: entity
-  parent: BookBase
-  id: BookSlothClownMMD
-  name: the sloth and the clown - maze maze danger
-  description: The book looks new and vibrant, with an image of Chuckles and Snuggles standing in front of the changing maze on the cover. The title "The Sloth and the Clown - Maze Maze Danger" is written in bold, colorful letters that pop against a background of space and stars.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_scmmd
-    - type: Paper
-      content: book-text-sloth-clown-mmd
-
-- type: entity
-  parent: BookBase
-  id: BookStruck
-  name: the humbling and transformative experience of being struck by lightning
-  description: The cover of the book is an electrifying image of lightning striking the ground, with a silhouette of a person standing in the midst of it. The title is written in bold letters in white against a black background, conveying the power and intensity of the experience. The subtitle is written in smaller letters below the title, providing a hint of the philosophical and spiritual themes explored within.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_struck
-    - type: Paper
-      content: book-text-struck
-
-- type: entity
-  parent: BookBase
-  id: BookSun
-  name: reaching for the sun - a plant's quest for life
-  description: The book is new, with a bright and vibrant cover featuring a plant stretching its leaves towards the sun. The title, "Reaching for the Sun - A Plant's Quest for Life," is written in bold, green letters, with an image of the sun rising behind the plant. The cover evokes a sense of growth, energy, and the beauty of nature.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_sun
-    - type: Paper
-      content: book-text-sun
-
-- type: entity
-  parent: BookBase
-  id: BookPossum
-  name: fallen ambitions - the tragic tale of morty the possum
-  description: The book is in good condition, with a hardcover and a dark green forest background. In the center of the cover, there is a sad looking possum sitting on a branch, with a distant and lonely expression on its face. The title, "Fallen Ambitions - The Tragic Tale of Morty the Possum," is written in bold, gold letters above the possum.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_possum
-    - type: Paper
-      content: book-text-possum
-
-- type: entity
-  parent: BookBase
-  id: BookCafe
-  name: the cafe possum
-  description: The book is in new condition, with a vibrant and whimsical cover that features a charming illustration of a tiny possum peeking out from behind a coffee cup, with a colorful and bustling cafe scene in the background. The title "The Cafe Possum" is written in bold, playful lettering, and the author's name is printed in a smaller font below it.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_cafe
-    - type: Paper
-      content: book-text-cafe
-
-- type: entity
-  parent: BookBase
-  id: BookFeather
-  name: a feather of magic - the wandering bird's journey to belonging
-  description: The book would be in new condition, with a glossy cover depicting the wandering bird surrounded by a glowing forest, with the magical feather at the center. The title, "A Feather of Magic," would be written in bold, glittering letters, while the subtitle, "The Wandering Bird's Journey to Belonging," would be written in smaller print underneath. The back cover would feature a brief summary of the story, along with reviews from critics praising the book's themes of hope and renewal.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book4
-    - type: Paper
-      content: book-text-feather
-
-- type: entity
-  parent: BookBase
-  id: BookIanLostWolfPup
-  name: the adventures of ian and renault - finding the lost wolf pup
-  description: The book is a new condition with a colorful cover, depicting Ian the corgi and Renault the fox on a journey through the forest, with the lost wolf pup to their feet. The title "The Adventures of Ian and Renault - Finding the Lost Wolf Pup" is prominently displayed at the top, with the author's name below. The cover has a whimsical and adventurous feel to it, attracting readers of all ages.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_ian_wolfpup
-    - type: Paper
-      content: book-text-ian-wolfpup
-
-- type: entity
-  parent: BookBase
-  id: BookIanRanch
-  name: the adventures of ian and renault - ranch expedition
-  description: The book appears to be new, with crisp pages and an unblemished cover. The cover features a colorful illustration of Ian and Renault, surrounded by various animals they encountered on the ranch, including horses, cows, and chickens. The title, "The Adventures of Ian and Renault - Ranch Expedition," is written in bold letters above the image, with the subtitle, "Helping Animals in Need," written below.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_ian_ranch
-    - type: Paper
-      content: book-text-ian-ranch
-
-- type: entity
-  parent: BookBase
-  id: BookIanOcean
-  name: the adventures of ian and renault - an ocean adventure
-  description: The book is new and in excellent condition. The cover shows Ian and Renault running and playing on the beach, with the blue ocean and golden sand in the background. The title is written in bold, playful letters, and the subtitle reads "An Ocean Adventure."
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_ian_ocean
-    - type: Paper
-      content: book-text-ian-ocean
-
-- type: entity
-  parent: BookBase
-  id: BookIanMountain
-  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
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_ian_mountain
-    - type: Paper
-      content: book-text-ian-mountain
-
-- type: entity
-  parent: BookBase
-  id: BookIanCity
-  name: the adventures of ian and renault - exploring the city
-  description: The book is in new condition, with crisp pages and a glossy cover. The cover features a colorful illustration of Ian and Renault exploring the city, with tall buildings and bustling streets in the background. Ian is leading the way, with his tail wagging excitedly, while Renault follows close behind, her ears perked up and her eyes wide with wonder. The title, "The Adventures of Ian and Renault," is written in bold, playful letters, with the subtitle, "Exploring the City," written below in smaller font.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_ian_city
-    - type: Paper
-      content: book-text-ian-city
-
-- type: entity
-  parent: BookBase
-  id: BookIanArctic
-  name: the adventures of ian and renault - an arctic journey of courage and friendship
-  description: The book looks new and adventurous, with a picture of Ian and Renault standing in front of an icy landscape with snowflakes falling all around them. The title, "The Adventures of Ian and Renault," is written in bold letters at the top, with a subtitle that reads, "An Arctic Journey of Courage and Friendship."
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_ian_arctic
-    - type: Paper
-      content: book-text-ian-arctic
-
-- type: entity
-  parent: BookBase
-  id: BookIanDesert
-  name: the adventures of ian and renault - exploring the mysterious desert
-  description: The book is in new condition and would have a colorful cover depicting Ian and Renault against a desert backdrop. The cover would feature images of various animals and plants that the two encountered on their adventure, such as a rattlesnake, coyotes, sand dunes, and an oasis. The title, "The Adventures of Ian and Renault" is prominently displayed on the cover in bold letters, while the subtitle "Exploring the Mysterious Desert" is written in smaller letters underneath.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_ian_desert
-    - type: Paper
-      content: book-text-ian-desert
-
-- type: entity
-  parent: BookBase
-  id: BookNames
-  name: the power of names - a philosophical exploration
-  description: The book is a gently used philosophy text, with a cover that features a close-up of a person's mouth, with the word "names" written on their lips. The title is "The Power of Names - A Philosophical Exploration," and the author's name is prominently displayed underneath. The overall design is simple and elegant, with the focus on the text rather than any flashy graphics or images.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_names
-    - type: Paper
-      content: book-text-names
-
-- type: entity
-  parent: BookBase
-  id: BookEarth
-  name: earthly longing
-  description: The book is in good condition, with a slightly faded cover due to exposure to sunlight.  The cover of the book depicts a panoramic view of the Earth from space, with a bright blue ocean and green landmasses. In the foreground, a lone astronaut is seen sitting in front of a window, gazing wistfully at the Earth. The title of the book, "Earthly Longing," is written in bold white letters against a black background at the top of the cover.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_earth
-    - type: Paper
-      content: book-text-earth
-
-- type: entity
-  parent: BookBase
-  id: BookAurora
-  name: journey beyond - the starship aurora mission
-  description: The book is in excellent condition, with a shiny cover depicting a spaceship hovering above a planet, perhaps with the Earth in the background. The title "Journey Beyond - The Starship Aurora Mission" is written in bold, silver letters. The cover also features a quote from a review, "A breathtaking tale of human achievement and exploration" to entice potential readers.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_aurora
-    - type: Paper
-      content: book-text-aurora
-
-- type: entity
-  parent: BookBase
-  id: BookTemple
-  name: the nature of the divine - embracing the many gods
-  description: The book appears new with crisp pages and an uncreased spine. The cover features an image of a temple with a glowing, multicolored aura around it, symbolizing the various gods discussed in the book. The title is displayed prominently in gold lettering, with the author's name and a brief summary of the book written in smaller text below.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_temple
-    - type: Paper
-      content: book-text-temple
-
-- type: entity
-  parent: BookBase
-  id: BookWatched
-  name: watched
-  description: The book is in good condition, with a slightly worn cover that features a dark and ominous space station looming in the background. The title "Watched" is written in bold letters that seem to be staring back at the reader, conveying the feeling of being constantly observed. The blurb on the back cover hints at a thrilling and suspenseful tale of paranoia and danger in a confined setting.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_watched
-    - type: Paper
-      content: book-text-watched
-
-- type: entity
-  parent: BookBase
-  id: BookMedicalOfficer
-  name: horizon's battle - a medical officer's tale of trust and survival
-  description: The cover features Smith, the medical officer, in his uniform, looking determined and ready to face any challenge. The backdrop shows the SS Horizon under attack, with explosions and smoke filling the space station. In the foreground, a wizard with a staff can be seen, adding an element of mystery and intrigue to the scene. The title is prominently displayed in bold letters, with the author's name and a tagline indicating the book's action-packed and suspenseful nature.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_medical
-    - type: Paper
-      content: book-text-medical-officer
-
-- type: entity
-  parent: BookBase
-  id: BookMorgue
-  name: the ghostly residents of the abandoned morgue
-  description: The book looks old and worn, with faded lettering on the cover. The cover depicts a dark and eerie morgue, with a full moon casting an ominous glow over the scene. In the foreground are Morty the possum and Morticia the raccoon, with mischievous expressions on their faces, peeking out from behind a metal shelf. The title is written in bold, spooky letters, with the subtitle "A Tale of Animal Spirits" written in smaller font below.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_morgue
-    - type: Paper
-      content: book-text-morgue
-
-- type: entity
-  parent: BookBase
-  id: BookRufus
-  name: rufus and the mischievous fairy
-  description: The book is in new condition, with vibrant colors and illustrations on the cover. The cover shows Rufus on his bicycle, with Blossom flying beside him in a playful manner. The title is written in bold, whimsical font, with the characters' names highlighted in a contrasting color. The overall aesthetic is charming and inviting, appealing to children and adults alike.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_rufus
-    - type: Paper
-      content: book-text-rufus
-
-- type: entity
-  parent: BookBase
-  id: BookMap
-  name: the map of adventure
-  description: The book is in a good condition, with a glossy cover depicting a jungle scene with vibrant colors and intricate details. The title "The Map of Adventure," is written in bold, gold lettering. The cover also features an image of a mysterious suitcase with the map spilling out of it.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_map
-    - type: Paper
-      content: book-text-map
-
-- type: entity
-  parent: BookBase
-  id: BookJourney
-  name: a journey of music, mountains, and self-discovery
-  description: The book is in excellent condition, with crisp pages and a glossy cover. The cover features a striking image of a mountain range, with a silhouette of a climber with a guitar on their back in the foreground. The title is bold and eye-catching, with the subtitle "A Journey of Music, Mountains, and Self-Discovery."
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/authorbooks.rsi
-      layers:
-        - state: book_journ_mount
-    - type: Paper
-      content: book-text-journ-mount
-
-- type: entity
-  parent: BookBase
-  id: BookInspiration
-  name: finding inspiration - a writer's journey through the woods
-  description: The book is in a new condition with a cover depicting a serene forest scene with a waterfall and colorful wildflowers. The title of the book "Finding Inspiration - A Writer's Journey Through the Woods" and the author's name are prominently displayed at the bottom.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book6
-    - type: Paper
-      content: book-text-inspiration
-
-- type: entity
-  parent: BookBase
-  id: BookJanitorTale
-  name: the tales of a tired janitor
-  description: A clean looking book, smelling vaguely of soap and bleach. 
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book0 
-  - type: Paper
-    content: book-text-janitor
-
diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
index 209d0b8cc2d..0b9f00be65c 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -20,6 +20,9 @@
     - neck
   - type: StaticPrice
     price: 100
+  - type: Tag
+    tags:
+    - Bedsheet
 
 - type: entity
   id: BedsheetBlack
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index ab6beb70af1..043ea4b0fe8 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -7,8 +7,17 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0
-      map: [ "enum.DamageStateVisualLayers.Base" ]
+    - state: paper
+    - state: cover_base
+      color: "#332d27"
+      map: [ "cover" ]
+    - state: decor_wingette
+      color: "#453f3a"
+      map: [ "decor" ]
+    - state: icon_text
+      map: [ "icon" ]
+    - state: overlay_null
+      map: [ "overlay" ]
   - type: Paper
     contentSize: 12000
   - type: ActivatableUI
@@ -25,6 +34,12 @@
     backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png"
     backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0
     contentMargin: 20.0, 20.0, 20.0, 20.0
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/book_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg
 
 - type: entity
   id: BookSpaceEncyclopedia
@@ -35,7 +50,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # placeholder(?). if only we have a better sprite that fits this.
+    - state: paper
+    - state: cover_base
+      color: "#0a2a6b"
+    - state: decor_wingette
+      color: "#082561"
+    - state: icon_text 
+      color: gold
+    - state: icon_planet
+      color: "#42b6f5"
   - type: Tag
     tags:
     - Book
@@ -53,7 +76,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book7
+    - state: paper
+    - state: cover_base
+      color: black
+    - state: decor_wingette
+      color: "#bbbbbb"
+    - state: icon_glow
+      color: red
+    - state: icon_corner
+      color: red
   - type: Tag
     tags:
     - Book
@@ -71,7 +102,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_bar
+    - state: paper
+    - state: cover_base
+      color: "#004848"
+    - state: decor_wingette
+      color: "#006666"
+    - state: icon_bar
   - type: Tag
     tags:
     - Book
@@ -89,7 +125,11 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_cooking
+    - state: paper
+    - state: cover_base
+      color: "#e22541"
+    - state: decor_wingette
+    - state: icon_apple
   - type: Tag
     tags:
     - Book
@@ -107,7 +147,14 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_hydroponics_pod_people
+    - state: paper
+    - state: cover_base
+      color: "#0e5a24"
+    - state: decor_wingette
+      color: "#2fa151"
+    - state: icon_cabbage
+    - state: icon_corner
+      color: gold
   - type: Tag
     tags:
     - Book
@@ -125,7 +172,14 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_engineering
+    - state: paper
+    - state: cover_base
+      color: "#6c4718"
+    - state: decor_wingette
+      color: "#b5913c"
+    - state: icon_wrench
+    - state: icon_corner
+      color: gold
   - type: Tag
     tags:
     - Book
@@ -143,7 +197,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_science
+    - state: paper
+    - state: cover_base
+      color: "#542485"
+    - state: decor_wingette_circle
+      color: "#be69f0"
+    - state: icon_dna
   - type: Tag
     tags:
     - Book
@@ -161,7 +220,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_security
+    - state: paper
+    - state: cover_base
+      color: "#ab1515"
+    - state: decor_wingette
+      color: "#e05334"
+    - state: icon_stunbaton
   - type: Tag
     tags:
     - Book
@@ -184,7 +248,11 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # no janitorial book sprite so this is a placeholder
+    - state: paper
+    - state: cover_base
+      color: "#550c82"
+    - state: decor_wingette
+    - state: icon_bucket
   - type: Tag
     tags:
     - Book
@@ -202,7 +270,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # no salvage book sprite so this is a placeholder
+    - state: paper
+    - state: cover_base
+      color: "#52320b"
+    - state: decor_wingette
+      color: "#e69a3e"
+    - state: icon_glow
+    - state: icon_diamond
+    - state: icon_text
+      color: "#fcdf74"
   - type: Tag
     tags:
     - Book
@@ -220,7 +296,13 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_medical
+    - state: paper
+    - state: cover_base
+      color: "#cccccc"
+    - state: decor_wingette
+      color: "#f7f7f7"
+    - state: icon_medical
+      color: "#58abcc"
   - type: Tag
     tags:
     - Book
@@ -238,7 +320,15 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_engineering
+    - state: paper
+    - state: cover_old
+      color: "#6c4718"
+    - state: decor_wingette
+      color: "#b5913c"
+    - state: icon_glow
+      color: red
+    - state: icon_wrench
+    - state: overlay_blood
   - type: Tag
     tags:
     - Book
@@ -256,7 +346,12 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_chemistry
+    - state: paper
+    - state: cover_base
+      color: "#2a7b74"
+    - state: decor_wingette
+      color: "#2a7b74"
+    - state: icon_chemical
   - type: Tag
     tags:
     - Book
@@ -268,69 +363,120 @@
 - type: entity
   parent: BookBase
   id: BookRandom
-  suffix: random
+  suffix: random visual
+  description: Each book is unique! What is hidden in this one?
   components:
+  - type: RandomMetadata
+    nameSegments: 
+    - book_hint_appearance
+    - book_type
   - type: RandomSprite
     available:
-      - enum.DamageStateVisualLayers.Base:
-          book0: ""
-          book1: ""
-          book2: ""
-          book3: ""
-          book4: ""
-          book5: ""
-          book6: ""
-          book7: ""
-          book8: ""
+      - cover:
+          cover_base: Sixteen
+          cover_old: Sixteen
+          cover_strong: Sixteen
+        decor:
+          decor_wingette: Sixteen
+          decor_wingette_circle: Sixteen
+          decor_bottom: Sixteen
+          decor_middle: Sixteen
+          decor_spine: Sixteen
+          decor_diagonal: Sixteen
+          decor_vertical_middle: Sixteen
+          icon_corner: Sixteen
+          icon_mount: ""
+        icon:
+          icon_biohazard: Sixteen
+          icon_borg: ""
+          icon_banana: ""
+          icon_glow: Sixteen
+          icon_hacking: ""
+          icon_law: Sixteen
+          icon_magnifier: ""
+          icon_nuclear: ""
+          icon_time: Sixteen
+          icon_aurora: Sixteen
+          icon_briefcase: ""
+          icon_eye: ""
+          icon_letter_N: ""
+          icon_letter_P: ""
+          icon_lightning: ""
+          icon_planet: ""
+          icon_possum: ""
+          icon_question: Sixteen
+          icon_scmmd: ""
+          icon_stars: Sixteen
+          icon_stars2: Sixteen
+          icon_temple: Sixteen
+          icon_tree: ""
+          icon_pentagramm: Sixteen
+          icon_fish: ""
+          icon_origami: ""
+          icon_skull: ""
+          icon_text: ""
+          icon_text2: ""
+          icon_text3: "" 
+        overlay:
+          overlay_blood: ""
+          overlay_dirt: Sixteen
+          detail_bookmark: Sixteen
+          detail_rivets: Sixteen
+          overlay_null: ""
 
 - type: entity
-  parent: BookBase
-  id: BookEscalation
-  name: Robert's Rules of Escalation
-  description: The book is stained with blood. It seems to have been used more as a weapon than reading material.
-  components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book2
-    - type: MeleeWeapon
-      wideAnimationRotation: 180
-      damage:
-        types:
-          Blunt: 6
-    - type: Paper
-      content: book-text-escalation
-
-- type: entity
-  parent: BookBase
-  id: BookEscalationSecurity
-  name: "Robert's Rules of Escalation: Security Edition"
-  description: The book is stained with blood. It seems to have been used more as a weapon than reading material.
+  parent: BookRandom
+  id: BookRandomStory
+  suffix: random visual, random story
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book2
-    - type: MeleeWeapon
-      wideAnimationRotation: 180
-      damage:
-        types:
-          Blunt: 6
-    - type: Paper
-      content: book-text-escalation-security
-
+  - type: PaperRandomStory
+    storySegments:
+    - "This is a "
+    - book_genre
+    - " about a "
+    - book_character_trait
+    - " "
+    - book_character
+    - " and "
+    - book_character_trait
+    - " "
+    - book_character
+    - ". Due to "
+    - book_event
+    - ", they "
+    - book_action_trait
+    - " "
+    - book_action
+    - " "
+    - book_character
+    - " "
+    - book_location
+    - ". \n\n"
+    - book_story_element
+    - " is "
+    - book_story_element_trait
+    - "."
+    storySeparator: ""
+    
 - type: entity
   parent: BookBase
   id: BookAtmosDistro
   name: "Newton's Guide to Atmos: The Distro"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-distro
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#366ed6"
+    - state: decor_wingette
+      color: "#2739b0"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-distro
 
 - type: entity
   parent: BookBase
@@ -338,12 +484,19 @@
   name: "Newton's Guide to Atmos: Waste"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-waste
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#db233f"
+    - state: decor_wingette
+      color: "#ab0730"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-waste
 
 - type: entity
   parent: BookBase
@@ -351,12 +504,19 @@
   name: "Newton's Guide to Atmos: Air Alarms"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-alarms
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#bfb328"
+    - state: decor_wingette
+      color: "#9c7c14"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-alarms
 
 - type: entity
   parent: BookBase
@@ -364,9 +524,16 @@
   name: "Newton's Guide to Atmos: Vents and More"
   description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks.
   components:
-    - type: Sprite
-      sprite: Objects/Misc/books.rsi
-      layers:
-        - state: book5
-    - type: Paper
-      content: book-text-atmos-vents
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#3ec78e"
+    - state: decor_wingette
+      color: "#28a15a"
+    - state: icon_atmos
+    - state: icon_corner
+      color: gold
+  - type: Paper
+    content: book-text-atmos-vents
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books_author.yml b/Resources/Prototypes/Entities/Objects/Misc/books_author.yml
new file mode 100644
index 00000000000..9adb14f4ebe
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/books_author.yml
@@ -0,0 +1,659 @@
+- type: entity
+  parent: BookBase
+  id: BookNarsieLegend
+  name: the legend of nar'sie
+  description: The book is an old, leather-bound tome with intricate engravings on the cover. The pages are yellowed and fragile with age, with the ink of the text faded in some places. It appears to have been well-read and well-loved, with dog-eared pages and marginalia scrawled in the margins. Despite its aged appearance, the book still exudes a sense of mystical power and wonder, hinting at the secrets and knowledge contained within its pages.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_old
+        color: "#a6161d"
+      - state: decor_bottom
+        color: "#6e1022"
+      - state: decor_wingette
+        color: "#4a101b"
+      - state: icon_pentagramm
+        color: "#911129"
+      - state: detail_bookmark
+        color: red 
+    - type: Paper
+      content: book-text-narsielegend
+
+- type: entity
+  parent: BookBase
+  id: BookTruth
+  name: exploring different philosophical perspectives on truth and the complexity of lying
+  description: A book exploring the different philosophical perspectives on truth and lying has a worn cover, with creases and marks indicating frequent use and thoughtful contemplation. The spine shows signs of wear from being pulled off the shelf again and again. The pages themselves are filled with underlines, notes in the margins, and highlighted passages as readers grapple with the nuances and complexities of the topic.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_strong
+        color: "#c9752a"
+      - state: decor_diagonal
+        color: "#cf792d"
+      - state: decor_wingette_circle
+        color: gold
+      - state: icon_question
+      - state: detail_bookmark
+        color: "#cf792d"
+    - type: Paper
+      content: book-text-truth
+
+- type: entity
+  parent: BookBase
+  id: BookWorld
+  name: shaping the state of the world - interplay of forces and choices
+  description: The book is a well-preserved hardcover with a simple, elegant design on the cover, depicting the image of a world in motion. The pages are crisp and clean, with no signs of wear or tear, suggesting that it has been well-cared for and valued by its previous owner. The text is printed in a clear, legible font, and the chapters are organized in a logical and easy-to-follow manner, making it accessible to readers of all levels of expertise.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#215e9e"
+      - state: icon_planet
+      - state: icon_text
+      - state: detail_bookmark
+        color: "#2dab24"
+    - type: Paper
+      content: book-text-world
+
+- type: entity
+  parent: BookBase
+  id: BookIanAntarctica
+  name: adventures of robert & ian - exploring antarctica
+  description: The book is a small paperback in good condition, with an illustration of Ian the corgi and the colony of penguins on the cover. The title, "Ian and Robert's Antarctic Adventure", is written in bold white letters against a blue background. The back cover features a brief summary of the story, highlighting the themes of humility, resilience, and the beauty of nature.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#5779c9"
+      - state: icon_stars2
+      - state: decor_bottom
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
+    - type: Paper
+      content: book-text-ian-antarctica
+
+- type: entity
+  parent: BookBase
+  id: BookSlothClownSSS
+  name: the sloth and the clown - space station shenanigans
+  description: The book looks new, with a glossy cover featuring Chuckles the clown and Snuggles the sloth floating in space with a backdrop of stars and planets. Chuckles is dressed in his banana costume and Snuggles is sleeping on a hammock made of space ropes. The title "The Sloth and the Clown - Space Station Shenanigans" is written in bold and colorful letters.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#e838b9"
+      - state: decor_wingette
+        color: "#ab22ba"
+      - state: decor_spine
+        color: "#f7cc2f"
+      - state: icon_banana
+      - state: detail_bookmark
+        color: "#f7cc2f"
+    - type: Paper
+      content: book-text-sloth-clown-sss
+
+- type: entity
+  parent: BookBase
+  id: BookSlothClownPranks
+  name: the sloth and the clown - pranks on zorgs
+  description: The book is in excellent condition, with crisp pages and a bright cover. The cover of the book features Chuckles and Snuggles, surrounded by the different species they encountered during their adventures in space. In the background, the Zorgs can be seen peeking out from behind a spaceship.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#f7cc2f"
+      - state: decor_wingette
+        color: "#ab22ba"
+      - state: decor_spine
+        color: "#e838b9"
+      - state: icon_banana
+      - state: detail_bookmark
+        color: "#ab22ba"
+    - type: Paper
+      content: book-text-sloth-clown-pz
+
+- type: entity
+  parent: BookBase
+  id: BookSlothClownMMD
+  name: the sloth and the clown - maze maze danger
+  description: The book looks new and vibrant, with an image of Chuckles and Snuggles standing in front of the changing maze on the cover. The title "The Sloth and the Clown - Maze Maze Danger" is written in bold, colorful letters that pop against a background of space and stars.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#e838b9"
+      - state: decor_wingette
+        color: "#ab22ba"
+      - state: decor_spine
+        color: "#f7cc2f"
+      - state: icon_scmmd
+      - state: detail_bookmark
+        color: "#ab22ba"
+    - type: Paper
+      content: book-text-sloth-clown-mmd
+
+- type: entity
+  parent: BookBase
+  id: BookStruck
+  name: the humbling and transformative experience of being struck by lightning
+  description: The cover of the book is an electrifying image of lightning striking the ground, with a silhouette of a person standing in the midst of it. The title is written in bold letters in white against a black background, conveying the power and intensity of the experience. The subtitle is written in smaller letters below the title, providing a hint of the philosophical and spiritual themes explored within.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_strong
+        color: "#2c384d"
+      - state: decor_wingette
+        color: "#3a4a66"
+      - state: decor_wingette_circle
+        color: "#6d7c9c"
+      - state: icon_glow
+        color: "#f7bb2f"
+      - state: icon_lightning
+        color: "#f7bb2f"
+      - state: detail_bookmark
+        color: "#f7bb2f"
+    - type: Paper
+      content: book-text-struck
+
+- type: entity
+  parent: BookBase
+  id: BookSun
+  name: reaching for the sun - a plant's quest for life
+  description: The book is new, with a bright and vibrant cover featuring a plant stretching its leaves towards the sun. The title, "Reaching for the Sun - A Plant's Quest for Life," is written in bold, green letters, with an image of the sun rising behind the plant. The cover evokes a sense of growth, energy, and the beauty of nature.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#255c8a"
+      - state: decor_bottom
+        color: "#2d2e12"
+      - state: icon_glow
+        color: "#f7bb2f"
+      - state: icon_cabbage
+      - state: detail_bookmark
+        color: "#f7bb2f"
+      - state: detail_rivets
+        color: "#f7bb2f"
+    - type: Paper
+      content: book-text-sun
+
+- type: entity
+  parent: BookBase
+  id: BookPossum
+  name: fallen ambitions - the tragic tale of morty the possum
+  description: The book is in good condition, with a hardcover and a dark green forest background. In the center of the cover, there is a sad looking possum sitting on a branch, with a distant and lonely expression on its face. The title, "Fallen Ambitions - The Tragic Tale of Morty the Possum," is written in bold, gold letters above the possum.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_old
+        color: "#a3bfae"
+      - state: icon_possum
+      - state: detail_bookmark
+        color: "#2b593d"
+      - state: overlay_blood
+    - type: Paper
+      content: book-text-possum
+
+- type: entity
+  parent: BookBase
+  id: BookCafe
+  name: the cafe possum
+  description: The book is in new condition, with a vibrant and whimsical cover that features a charming illustration of a tiny possum peeking out from behind a coffee cup, with a colorful and bustling cafe scene in the background. The title "The Cafe Possum" is written in bold, playful lettering, and the author's name is printed in a smaller font below it.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_strong
+        color: "#e8ab6d"
+      - state: icon_possum
+      - state: detail_bookmark
+        color: "#2b593d"
+    - type: Paper
+      content: book-text-cafe
+
+- type: entity
+  parent: BookBase
+  id: BookFeather
+  name: a feather of magic - the wandering bird's journey to belonging
+  description: The book would be in new condition, with a glossy cover depicting the wandering bird surrounded by a glowing forest, with the magical feather at the center. The title, "A Feather of Magic," would be written in bold, glittering letters, while the subtitle, "The Wandering Bird's Journey to Belonging," would be written in smaller print underneath. The back cover would feature a brief summary of the story, along with reviews from critics praising the book's themes of hope and renewal.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_strong
+        color: "#abebed"
+      - state: decor_wingette
+        color: "#a081cc"
+      - state: icon_atmos
+      - state: icon_magic
+      - state: detail_bookmark
+        color: "#7396f5"
+    - type: Paper
+      content: book-text-feather
+
+- type: entity
+  parent: BookBase
+  id: BookIanLostWolfPup
+  name: the adventures of ian and renault - finding the lost wolf pup
+  description: The book is a new condition with a colorful cover, depicting Ian the corgi and Renault the fox on a journey through the forest, with the lost wolf pup to their feet. The title "The Adventures of Ian and Renault - Finding the Lost Wolf Pup" is prominently displayed at the top, with the author's name below. The cover has a whimsical and adventurous feel to it, attracting readers of all ages.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#3a9e57"
+      - state: decor_bottom
+        color: "#1c6330"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
+    - type: Paper
+      content: book-text-ian-wolfpup
+
+- type: entity
+  parent: BookBase
+  id: BookIanRanch
+  name: the adventures of ian and renault - ranch expedition
+  description: The book appears to be new, with crisp pages and an unblemished cover. The cover features a colorful illustration of Ian and Renault, surrounded by various animals they encountered on the ranch, including horses, cows, and chickens. The title, "The Adventures of Ian and Renault - Ranch Expedition," is written in bold letters above the image, with the subtitle, "Helping Animals in Need," written below.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#ccab64"
+      - state: decor_bottom
+        color: "#946e38"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
+    - type: Paper
+      content: book-text-ian-ranch
+
+- type: entity
+  parent: BookBase
+  id: BookIanOcean
+  name: the adventures of ian and renault - an ocean adventure
+  description: The book is new and in excellent condition. The cover shows Ian and Renault running and playing on the beach, with the blue ocean and golden sand in the background. The title is written in bold, playful letters, and the subtitle reads "An Ocean Adventure."
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#567cd6"
+      - state: decor_bottom
+        color: "#272782"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
+    - type: Paper
+      content: book-text-ian-ocean
+
+- type: entity
+  parent: BookBase
+  id: BookIanMountain
+  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
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#86b4d9"
+      - state: icon_mount
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
+    - type: Paper
+      content: book-text-ian-mountain
+
+- type: entity
+  parent: BookBase
+  id: BookIanCity
+  name: the adventures of ian and renault - exploring the city
+  description: The book is in new condition, with crisp pages and a glossy cover. The cover features a colorful illustration of Ian and Renault exploring the city, with tall buildings and bustling streets in the background. Ian is leading the way, with his tail wagging excitedly, while Renault follows close behind, her ears perked up and her eyes wide with wonder. The title, "The Adventures of Ian and Renault," is written in bold, playful letters, with the subtitle, "Exploring the City," written below in smaller font.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#9a9b9c"
+      - state: decor_bottom
+        color: "#5f6061"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
+    - type: Paper
+      content: book-text-ian-city
+
+- type: entity
+  parent: BookBase
+  id: BookIanArctic
+  name: the adventures of ian and renault - an arctic journey of courage and friendship
+  description: The book looks new and adventurous, with a picture of Ian and Renault standing in front of an icy landscape with snowflakes falling all around them. The title, "The Adventures of Ian and Renault," is written in bold letters at the top, with a subtitle that reads, "An Arctic Journey of Courage and Friendship."
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#5779c9"
+      - state: icon_stars2
+      - state: decor_bottom
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
+    - type: Paper
+      content: book-text-ian-arctic
+
+- type: entity
+  parent: BookBase
+  id: BookIanDesert
+  name: the adventures of ian and renault - exploring the mysterious desert
+  description: The book is in new condition and would have a colorful cover depicting Ian and Renault against a desert backdrop. The cover would feature images of various animals and plants that the two encountered on their adventure, such as a rattlesnake, coyotes, sand dunes, and an oasis. The title, "The Adventures of Ian and Renault" is prominently displayed on the cover in bold letters, while the subtitle "Exploring the Mysterious Desert" is written in smaller letters underneath.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#507bad"
+      - state: decor_bottom
+        color: "#bd9a55"
+      - state: icon_ian
+      - state: detail_bookmark
+        color: "#ab5e24"
+    - type: Paper
+      content: book-text-ian-desert
+
+- type: entity
+  parent: BookBase
+  id: BookNames
+  name: the power of names - a philosophical exploration
+  description: The book is a gently used philosophy text, with a cover that features a close-up of a person's mouth, with the word "names" written on their lips. The title is "The Power of Names - A Philosophical Exploration," and the author's name is prominently displayed underneath. The overall design is simple and elegant, with the focus on the text rather than any flashy graphics or images.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#8c8c8c"
+      - state: decor_wingette_circle
+      - state: icon_letter_N
+      - state: detail_bookmark
+      - state: overlay_dirt
+    - type: Paper
+      content: book-text-names
+
+- type: entity
+  parent: BookBase
+  id: BookEarth
+  name: earthly longing
+  description: The book is in good condition, with a slightly faded cover due to exposure to sunlight.  The cover of the book depicts a panoramic view of the Earth from space, with a bright blue ocean and green landmasses. In the foreground, a lone astronaut is seen sitting in front of a window, gazing wistfully at the Earth. The title of the book, "Earthly Longing," is written in bold white letters against a black background at the top of the cover.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_strong
+        color: "#0f204f"
+      - state: decor_wingette_circle
+        color: "#2c5491"
+      - state: decor_vertical_middle
+        color: "#3c6ab0"
+      - state: icon_planet
+      - state: icon_text3
+      - state: detail_bookmark
+        color: "#2c5491"
+    - type: Paper
+      content: book-text-earth
+
+- type: entity
+  parent: BookBase
+  id: BookAurora
+  name: journey beyond - the starship aurora mission
+  description: The book is in excellent condition, with a shiny cover depicting a spaceship hovering above a planet, perhaps with the Earth in the background. The title "Journey Beyond - The Starship Aurora Mission" is written in bold, silver letters. The cover also features a quote from a review, "A breathtaking tale of human achievement and exploration" to entice potential readers.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#0f204f"
+      - state: decor_vertical_middle
+        color: "#3c6ab0" 
+      - state: decor_spine
+        color: "#3c6ab0" 
+      - state: icon_stars2
+      - state: icon_aurora
+      - state: detail_bookmark
+        color: "#2c5491"
+      - state: detail_rivets
+        color: "#799dd4"
+    - type: Paper
+      content: book-text-aurora
+
+- type: entity
+  parent: BookBase
+  id: BookTemple
+  name: the nature of the divine - embracing the many gods
+  description: The book appears new with crisp pages and an uncreased spine. The cover features an image of a temple with a glowing, multicolored aura around it, symbolizing the various gods discussed in the book. The title is displayed prominently in gold lettering, with the author's name and a brief summary of the book written in smaller text below.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#542e80"
+      - state: decor_vertical_middle
+        color: "#39205e"
+      - state: decor_wingette_circle
+        color: "#914fb8"
+      - state: icon_temple
+      - state: detail_bookmark
+        color: "#bfbfbf"
+    - type: Paper
+      content: book-text-temple
+
+- type: entity
+  parent: BookBase
+  id: BookWatched
+  name: watched
+  description: The book is in good condition, with a slightly worn cover that features a dark and ominous space station looming in the background. The title "Watched" is written in bold letters that seem to be staring back at the reader, conveying the feeling of being constantly observed. The blurb on the back cover hints at a thrilling and suspenseful tale of paranoia and danger in a confined setting.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#611e10"
+      - state: overlay_dirt
+        color: "#4f1206"
+      - state: decor_wingette_circle
+        color: "#241e1d"
+      - state: icon_eye
+      - state: detail_bookmark
+        color: "#bfbfbf"
+    - type: Paper
+      content: book-text-watched
+
+- type: entity
+  parent: BookBase
+  id: BookMedicalOfficer
+  name: horizon's battle - a medical officer's tale of trust and survival
+  description: The cover features Smith, the medical officer, in his uniform, looking determined and ready to face any challenge. The backdrop shows the SS Horizon under attack, with explosions and smoke filling the space station. In the foreground, a wizard with a staff can be seen, adding an element of mystery and intrigue to the scene. The title is prominently displayed in bold letters, with the author's name and a tagline indicating the book's action-packed and suspenseful nature.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#d7dadb"
+      - state: decor_wingette_circle
+        color: "#55b0d4"
+      - state: icon_medical_cross
+        color: "#55b0d4"
+      - state: detail_bookmark
+        color: "#55b0d4"
+    - type: Paper
+      content: book-text-medical-officer
+
+- type: entity
+  parent: BookBase
+  id: BookMorgue
+  name: the ghostly residents of the abandoned morgue
+  description: The book looks old and worn, with faded lettering on the cover. The cover depicts a dark and eerie morgue, with a full moon casting an ominous glow over the scene. In the foreground are Morty the possum and Morticia the raccoon, with mischievous expressions on their faces, peeking out from behind a metal shelf. The title is written in bold, spooky letters, with the subtitle "A Tale of Animal Spirits" written in smaller font below.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_old
+        color: "#d7dadb"
+      - state: icon_text2
+        color: "#61363d"
+      - state: overlay_dirt
+      - state: detail_bookmark
+        color: "#61363d"
+    - type: Paper
+      content: book-text-morgue
+
+- type: entity
+  parent: BookBase
+  id: BookRufus
+  name: rufus and the mischievous fairy
+  description: The book is in new condition, with vibrant colors and illustrations on the cover. The cover shows Rufus on his bicycle, with Blossom flying beside him in a playful manner. The title is written in bold, whimsical font, with the characters' names highlighted in a contrasting color. The overall aesthetic is charming and inviting, appealing to children and adults alike.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#6597c9"
+      - state: decor_bottom
+        color: "#113a63"
+      - state: decor_diagonal
+        color: "#113a63"
+      - state: icon_text3
+        color: "#ffde7d"
+      - state: detail_bookmark
+        color: "#61363d"
+      - state: detail_rivets
+        color: "#ffde7d"
+    - type: Paper
+      content: book-text-rufus
+
+- type: entity
+  parent: BookBase
+  id: BookMap
+  name: the map of adventure
+  description: The book is in a good condition, with a glossy cover depicting a jungle scene with vibrant colors and intricate details. The title "The Map of Adventure," is written in bold, gold lettering. The cover also features an image of a mysterious suitcase with the map spilling out of it.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#56c463"
+      - state: icon_briefcase
+      - state: decor_wingette
+        color: "#298033"
+      - state: icon_briefcase
+      - state: detail_bookmark
+        color: "#61363d"
+      - state: detail_rivets
+        color: "#ffde7d"
+    - type: Paper
+      content: book-text-map
+
+- type: entity
+  parent: BookBase
+  id: BookJourney
+  name: a journey of music, mountains, and self-discovery
+  description: The book is in excellent condition, with crisp pages and a glossy cover. The cover features a striking image of a mountain range, with a silhouette of a climber with a guitar on their back in the foreground. The title is bold and eye-catching, with the subtitle "A Journey of Music, Mountains, and Self-Discovery."
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#9bc1c9"
+      - state: icon_briefcase
+      - state: icon_mount
+      - state: detail_bookmark
+        color: "#61363d"
+      - state: detail_rivets
+        color: "#ffde7d"
+    - type: Paper
+      content: book-text-journ-mount
+
+- type: entity
+  parent: BookBase
+  id: BookInspiration
+  name: finding inspiration - a writer's journey through the woods
+  description: The book is in a new condition with a cover depicting a serene forest scene with a waterfall and colorful wildflowers. The title of the book "Finding Inspiration - A Writer's Journey Through the Woods" and the author's name are prominently displayed at the bottom.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#1d662c"
+      - state: decor_spine
+        color: "#2a8c58"
+      - state: icon_glow
+        color: "#b9edc4"
+      - state: icon_tree
+      - state: detail_bookmark
+        color: "#61363d"
+    - type: Paper
+      content: book-text-inspiration
+
+- type: entity
+  parent: BookBase
+  id: BookJanitorTale
+  name: the tales of a tired janitor
+  description: A clean looking book, smelling vaguely of soap and bleach. 
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_old
+      color: "#c526de"
+    - state: decor_wingette
+    - state: icon_bucket
+    - state: detail_bookmark
+      color: "#61363d"
+    - state: overlay_dirt
+  - type: Paper
+    content: book-text-janitor
+
diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
index aa8823d70d8..762204701cb 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
@@ -1,8 +1,8 @@
 - type: entity
   parent: BaseStorageItem
-  abstract: true
   id: BriefcaseBase
   description: Useful for carrying items in your hands.
+  abstract: true
   components:
   - type: Item
     size: Ginormous
@@ -14,10 +14,9 @@
     - Briefcase
 
 - type: entity
-  name: brown briefcase
   parent: BriefcaseBase
   id: BriefcaseBrown
-  description: A handy briefcase.
+  name: brown briefcase
   components:
   - type: Sprite
     sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
@@ -26,23 +25,9 @@
     sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
 
 - type: entity
-  parent: BriefcaseBase
-  abstract: true
-  id: BriefcaseSyndieBase
+  parent: BriefcaseBrown
+  id: BriefcaseSyndie
   suffix: Syndicate, Empty
-  description: Useful for carrying items in your hands.
   components:
   - type: Item
     size: Huge
-
-- type: entity
-  name: brown briefcase
-  parent: BriefcaseSyndieBase
-  id: BriefcaseSyndie
-  description: A handy briefcase.
-  components:
-  - type: Sprite
-    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/cds.yml b/Resources/Prototypes/Entities/Objects/Misc/cds.yml
new file mode 100644
index 00000000000..a80a7d1d586
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/cds.yml
@@ -0,0 +1,19 @@
+- type: entity
+  name: coordinates disk
+  parent: BaseItem
+  id: CoordinatesDisk
+  description: A disk containing the coordinates to a location in space. Necessary for any FTL-traversing vessel to reach their destination. Fits inside shuttle consoles.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/cd.rsi
+    state: icon
+  - type: StaticPrice
+    price: 100
+  - type: Tag
+    tags:
+    - CoordinatesDisk
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 1
+  - type: ShuttleDestinationCoordinates
diff --git a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
index e389bc6b378..f4b4f4c96cd 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
@@ -22,6 +22,12 @@
     - HighRiskItem
   - type: StealTarget
     stealGroup: NukeDisk
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/disk_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg
 
 - type: entity
   name: nuclear authentication disk
@@ -35,3 +41,9 @@
     state: icon
   - type: StaticPrice
     price: 1 # it's worth even less than normal items. Perfection.
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/disk_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml b/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
index 1fe3b8a271c..f170aa899e6 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
@@ -14,9 +14,9 @@
     successChance: 1
     interactSuccessSound:
       collection: DeskBell
-    params:
-      variation: 0.03
-      volume: 3
+      params:
+        variation: 0.03
+        volume: 3
     onActivate: true
   - type: EmitSoundOnUse
     sound:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/diskcases.yml b/Resources/Prototypes/Entities/Objects/Misc/diskcases.yml
new file mode 100644
index 00000000000..da86d7a00db
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/diskcases.yml
@@ -0,0 +1,21 @@
+- type: entity
+  name: diskcase
+  parent: BaseStorageItem
+  id: DiskCase
+  description: Case for storing a coordinates disk.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/diskcases.rsi
+    state: icon_base
+  - type: Storage
+    grid:
+    - 0,0,0,1
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - Document
+        - CoordinatesDisk
+    storageOpenSound: /Audio/Machines/screwdriveropen.ogg
+    storageCloseSound: /Audio/Machines/screwdriverclose.ogg
+    storageInsertSound: /Audio/Items/crowbar.ogg
+    storageRemoveSound: /Audio/Items/crowbar.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index 5f970da1840..527233920d5 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -52,6 +52,7 @@
       path: /Audio/Items/Handcuffs/rope_breakout.ogg
     startBreakoutSound:
       path: /Audio/Items/Handcuffs/rope_takeoff.ogg
+    uncuffEasierWhenLarge: true
   - type: Construction
     graph: makeshifthandcuffs
     node: cuffscable
@@ -93,6 +94,7 @@
       path: /Audio/Items/Handcuffs/rope_breakout.ogg
     startBreakoutSound:
       path: /Audio/Items/Handcuffs/rope_takeoff.ogg
+    uncuffEasierWhenLarge: true
   - type: Sprite
     sprite: Objects/Misc/zipties.rsi
     state: cuff
diff --git a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
index bc3488aaf43..43c4568e70a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
@@ -48,6 +48,5 @@
         types:
           Heat: 5
       coldDamage: {}
-      ColdDamageThreshold: 0
+      coldDamageThreshold: 0
     - type: FrictionContacts
-      
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 0b86677a8e5..9f8eb8402ae 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -35,7 +35,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idpassenger
+    - state: department
+      color: "#878787"
+    - state: subdepartment
+      color: "#878787"
+    - state: passenger
   - type: PresetIdCard
     job: Passenger
 
@@ -49,7 +53,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idintern-tech
+    - state: department
+      color: "#F39F27"
+    - state: subdepartment
+      color: "#F39F27"
+    - state: assistant
 
 - type: entity
   parent: PassengerIDCard
@@ -61,7 +69,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idintern-med
+    - state: department
+      color: "#5B97BC"
+    - state: subdepartment
+      color: "#5B97BC"
+    - state: assistant
 
 - type: entity
   parent: PassengerIDCard
@@ -73,7 +85,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idintern-sci
+    - state: department
+      color: "#C96DBF"
+    - state: subdepartment
+      color: "#C96DBF"
+    - state: assistant
 
 - type: entity
   parent: PassengerIDCard
@@ -85,7 +101,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idintern-cadet
+    - state: department
+      color: "#CB0000"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: assistant
 
 - type: entity
   parent: PassengerIDCard
@@ -97,7 +117,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idintern-service
+    - state: department
+      color: "#58C800"
+    - state: subdepartment
+      color: "#58C800"
+    - state: assistant
 
 - type: entity
   parent: IDCardStandard
@@ -107,7 +131,11 @@
   - type: Sprite
     layers:
     - state: gold
-    - state: idcaptain
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: captain
   - type: Item
     heldPrefix: gold
   - type: PresetIdCard
@@ -128,7 +156,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idsecurityofficer
+    - state: department
+      color: "#CB0000"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: securityofficer
   - type: PresetIdCard
     job: SecurityOfficer
 
@@ -137,12 +169,16 @@
   id: WardenIDCard
   name: warden ID card
   components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idwarden
-    - type: PresetIdCard
-      job: Warden
+  - type: Sprite
+    layers:
+    - state: default
+    - state: department
+      color: "#CB0000"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: warden
+  - type: PresetIdCard
+    job: Warden
 
 - type: entity
   parent: IDCardStandard
@@ -152,7 +188,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idstationengineer
+    - state: department
+      color: "#F39F27"
+    - state: subdepartment
+      color: "#F39F27"
+    - state: stationengineer
   - type: PresetIdCard
     job: StationEngineer
 
@@ -164,7 +204,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idmedicaldoctor
+    - state: department
+      color: "#5B97BC"
+    - state: subdepartment
+      color: "#5B97BC"
+    - state: medicaldoctor
   - type: PresetIdCard
     job: MedicalDoctor
 
@@ -176,7 +220,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idparamedic
+    - state: department
+      color: "#5B97BC"
+    - state: subdepartment
+      color: "#5B97BC"
+    - state: paramedic
   - type: PresetIdCard
     job: Paramedic
 
@@ -188,7 +236,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idchemist
+    - state: department
+      color: "#5B97BC"
+    - state: subdepartment
+      color: "#5B97BC"
+    - state: chemist
   - type: PresetIdCard
     job: Chemist
 
@@ -200,7 +252,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idcargotechnician
+    - state: department
+      color: "#B18644"
+    - state: subdepartment
+      color: "#B18644"
+    - state: cargotechnician
   - type: PresetIdCard
     job: CargoTechnician
 
@@ -212,7 +268,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idshaftminer
+    - state: department
+      color: "#B18644"
+    - state: subdepartment
+      color: "#C96DBF"
+    - state: shaftminer
   - type: PresetIdCard
     job: SalvageSpecialist
 
@@ -221,14 +281,18 @@
   id: QuartermasterIDCard
   name: logistics officer ID card # DeltaV - Logistics Department replacing Cargo
   components:
-    - type: Sprite
-      layers:
-        - state: silver
-        - state: idquartermaster
-    - type: Item
-      heldPrefix: silver
-    - type: PresetIdCard
-      job: Quartermaster
+  - type: Sprite
+    layers:
+      - state: silver
+      - state: departmenthead
+        color: "#1B67A5"
+      - state: subdepartment
+        color: "#B18644"
+      - state: cargotechnician
+  - type: Item
+    heldPrefix: silver
+  - type: PresetIdCard
+    job: Quartermaster
 
 - type: entity
   parent: IDCardStandard
@@ -238,7 +302,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idscientist
+    - state: department
+      color: "#C96DBF"
+    - state: subdepartment
+      color: "#C96DBF"
+    - state: scientist
   - type: PresetIdCard
     job: Scientist
 
@@ -249,8 +317,12 @@
   components:
   - type: Sprite
     layers:
-    - state: default
-    - state: idclown
+    - state: rainbow
+    - state: department
+      color: "#FF00FF"
+    - state: subdepartment
+      color: "#58C800"
+    - state: clown
   - type: PresetIdCard
     job: Clown
 
@@ -262,7 +334,10 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idmime
+    - state: department
+      color: "#878787"
+    - state: subdepartment
+    - state: mime
   - type: PresetIdCard
     job: Mime
 
@@ -271,11 +346,14 @@
   id: ChaplainIDCard
   name: chaplain ID card
   components:
-    - type: Sprite
-      layers:
-        - state: default
-        - sprite: DeltaV/Objects/Misc/id_cards.rsi # DeltaV - Give Chaplain ID Epistemics colors
-          state: idchaplain
+  - type: Sprite
+    layers:
+    - state: default
+    - state: department
+      color: "#C96DBF"
+    - state: subdepartment
+      color: "#58C800"
+    - state: chaplain
     - type: PresetIdCard
       job: Chaplain
 
@@ -287,7 +365,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idjanitor
+    - state: department
+      color: "#58C800"
+    - state: subdepartment
+      color: "#58C800"
+    - state: janitor
   - type: PresetIdCard
     job: Janitor
 
@@ -299,22 +381,22 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idbartender
+    - state: department
+      color: "#58C800"
+    - state: subdepartment
+      color: "#58C800"
+    - state: bartender
   - type: PresetIdCard
     job: Bartender
 
 - type: entity
-  parent: IDCardStandard
+  parent: BartenderIDCard
   id: PunPunIDCard
   name: pun pun ID card
   components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idbartender
-    - type: PresetIdCard
-      job: Bartender
-      name: Pun Pun
+  - type: PresetIdCard
+    job: Bartender
+    name: Pun Pun
 
 - type: entity
   parent: IDCardStandard
@@ -324,7 +406,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idcook
+    - state: department
+      color: "#58C800"
+    - state: subdepartment
+      color: "#58C800"
+    - state: cook
   - type: PresetIdCard
     job: Chef
 
@@ -333,36 +419,48 @@
   id: BotanistIDCard
   name: botanist ID card
   components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idbotanist
-    - type: PresetIdCard
-      job: Botanist
+  - type: Sprite
+    layers:
+    - state: default
+    - state: department
+      color: "#58C800"
+    - state: subdepartment
+      color: "#58C800"
+    - state: botanist
+  - type: PresetIdCard
+    job: Botanist
 
 - type: entity
   parent: IDCardStandard
   id: LibrarianIDCard
   name: librarian ID card
   components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idcurator
-    - type: PresetIdCard
-      job: Librarian
+  - type: Sprite
+    layers:
+    - state: default
+    - state: department
+      color: "#58C800"
+    - state: subdepartment
+      color: "#58C800"
+    - state: curator
+  - type: PresetIdCard
+    job: Librarian
 
 - type: entity
   parent: IDCardStandard
   id: LawyerIDCard
   name: lawyer ID card
   components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idlawyer
-    - type: PresetIdCard
-      job: Lawyer
+  - type: Sprite
+    layers:
+    - state: default
+    - state: department
+      color: "#878787"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: lawyer
+  - type: PresetIdCard
+    job: Lawyer
 
 - type: entity
   parent: IDCardStandard
@@ -372,7 +470,11 @@
   - type: Sprite
     layers:
     - state: silver
-    - state: idheadofpersonnel
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#58C800"
+    - state: headofpersonnel
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
@@ -386,7 +488,11 @@
   - type: Sprite
     layers:
     - state: silver
-    - state: idchiefengineer
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#F39F27"
+    - state: stationengineer
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
@@ -400,7 +506,11 @@
   - type: Sprite
     layers:
     - state: silver
-    - state: idchiefmedicalofficer
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#5B97BC"
+    - state: medicaldoctor
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
@@ -414,7 +524,11 @@
   - type: Sprite
     layers:
     - state: silver
-    - state: idresearchdirector
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#C96DBF"
+    - state: scientist
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
@@ -428,7 +542,11 @@
   - type: Sprite
     layers:
     - state: silver
-    - state: idheadofsecurity
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: securityofficer
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
@@ -442,7 +560,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idbrigmedic
+    - state: department
+      color: "#CB0000"
+    - state: subdepartment
+      color: "#5B97BC"
+    - state: medicaldoctor
   - type: PresetIdCard # Delta V - Brigmedic, see Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
     job: Brigmedic
 
@@ -454,7 +576,11 @@
   - type: Sprite
     layers:
     - state: centcom
-    - state: idcentcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: Item
     heldPrefix: blue
   - type: IdCard
@@ -473,8 +599,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_commander
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: captain
   - type: IdCard
     jobTitle: ERT Company Commander
   - type: Item
@@ -487,8 +617,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now.
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#C96DBF"
+    - state: chaplain
   - type: IdCard
     jobTitle: ERT Soul Officer
   - type: Item
@@ -501,8 +635,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_engineer
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#F39F27"
+    - state: stationengineer
   - type: IdCard
     jobTitle: ERT Field Engineer
 
@@ -513,8 +651,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_janitor
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#58C800"
+    - state: janitor
   - type: IdCard
     jobTitle: ERT Custodian
 
@@ -525,8 +667,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_medic
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#5B97BC"
+    - state: medicaldoctor
   - type: IdCard
     jobTitle: ERT Medical Doctor
 
@@ -537,8 +683,12 @@
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_security
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: securityofficer
   - type: IdCard
     jobTitle: ERT Field Officer
 
@@ -551,7 +701,11 @@
   - type: Sprite
     layers:
     - state: centcom
-    - state: idcentcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: Item
     heldPrefix: blue
   - type: IdCard
@@ -565,12 +719,16 @@
   id: MusicianIDCard
   name: musician ID card
   components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idmusician
-    - type: PresetIdCard
-      job: Musician
+  - type: Sprite
+    layers:
+    - state: default
+    - state: department
+      color: "#878787"
+    - state: subdepartment
+      color: "#878787"
+    - state: musician
+  - type: PresetIdCard
+    job: Musician
 
 - type: entity
   parent: CentcomIDCard
@@ -580,6 +738,11 @@
   - type: Sprite
     layers:
     - state: centcom
+    - state: departmenthead
+      color: "#CB0000"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: death
   - type: Item
     heldPrefix: blue
   - type: IdCard
@@ -600,7 +763,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idpassenger
+    - state: department
+      color: "#878787"
+    - state: subdepartment
+      color: "#878787"
+    - state: passenger
   - type: AgentIDCard
     icons:
     # TODO figure out a better way of doing this.
@@ -691,8 +858,12 @@
   components:
   - type: Sprite
     layers:
-    - state: orange
-    - state: idatmospherictechnician
+    - state: default
+    - state: department
+      color: "#F39F27"
+    - state: subdepartment
+      color: "#F39F27"
+    - state: atmospherictechnician
   - type: PresetIdCard
     job: AtmosphericTechnician
 
@@ -703,7 +874,12 @@
   components:
   - type: Sprite
     layers:
-    - state: syndie
+    - state: black
+    - state: department
+      color: "#CB0000"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: syndicate
   - type: Access
     tags:
     - NuclearOperative
@@ -716,7 +892,12 @@
   components:
   - type: Sprite
     layers:
-    - state: pirate
+    - state: black
+    - state: department
+      color: "#878787"
+    - state: subdepartment
+      color: "#878787"
+    - state: death
   - type: Access
     tags:
     - NuclearOperative
@@ -730,7 +911,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idpsychologist
+    - state: department
+      color: "#5B97BC"
+    - state: subdepartment
+      color: "#5B97BC"
+    - state: psychologist
   - type: PresetIdCard
     job: Psychologist
 
@@ -742,7 +927,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idreporter
+    - state: department
+      color: "#58C800"
+    - state: subdepartment
+      color: "#58C800"
+    - state: headofpersonnel
   - type: PresetIdCard
     job: Reporter
 
@@ -754,7 +943,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idboxer
+    - state: department
+      color: "#878787"
+    - state: subdepartment
+      color: "#878787"
+    - state: boxer
   - type: PresetIdCard
     job: Boxer
 
@@ -766,7 +959,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idzookeeper
+    - state: department
+      color: "#58C800"
+    - state: subdepartment
+      color: "#58C800"
+    - state: zookeeper
   - type: PresetIdCard
     job: Zookeeper
 
@@ -778,7 +975,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: iddetective
+    - state: department
+      color: "#CB0000"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: detective
   - type: PresetIdCard
     job: Detective
 
@@ -791,6 +992,11 @@
   - type: Sprite
     layers:
     - state: centcom
+    - state: departmenthead
+      color: "#CB0000"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: cc
   - type: Item
     heldPrefix: blue
   - type: IdCard
@@ -804,8 +1010,13 @@
   components:
   - type: Sprite
     layers:
-    - state: default
-    - state: idcluwne
+    - state: rainbow
+    - state: department
+      color: "#5DC574"
+    - state: subdepartment
+      color: "#5DC574"
+    - state: clown
+      color: "#7C0A0A"
   - type: IdCard
     jobTitle: Cluwne
   - type: Unremoveable
@@ -818,7 +1029,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idseniorengineer
+    - state: department
+      color: "#F39F27"
+    - state: subdepartment
+      color: "#F39F27"
+    - state: senior
   - type: PresetIdCard
     job: SeniorEngineer
 
@@ -830,7 +1045,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idseniorresearcher
+    - state: department
+      color: "#C96DBF"
+    - state: subdepartment
+      color: "#C96DBF"
+    - state: senior
   - type: PresetIdCard
     job: SeniorResearcher
 
@@ -842,7 +1061,11 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idseniorphysician
+    - state: department
+      color: "#5B97BC"
+    - state: subdepartment
+      color: "#5B97BC"
+    - state: senior
   - type: PresetIdCard
     job: SeniorPhysician
 
@@ -854,6 +1077,10 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idseniorofficer
+    - state: department
+      color: "#CB0000"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: senior
   - type: PresetIdCard
-    job: SeniorOfficer
+    job: SeniorOfficer
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 657201912e8..a1005004946 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -58,11 +58,9 @@
         types:
           Heat: 5
       coldDamage: {}
-      ColdDamageThreshold: 0
+      coldDamageThreshold: 0
     - type: Flammable
       fireSpread: true #If you walk into incredibly dense, flaming vines, you can expect to burn.
-      cold:
-        types: {}
       damage:
         types:
           Heat: 3
@@ -75,11 +73,12 @@
         methods: [Touch]
         effects:
         - !type:HealthChange
-          scaled: true
+          scaleByQuantity: true
           damage:
             types:
               Heat: 10
     - type: AtmosExposed
+    - type: Kudzu
       growthTickChance: 0.3
       spreadChance: 0.4
     - type: SpeedModifierContacts
@@ -235,7 +234,6 @@
       damage:
        types:
          Heat: 3
-      growthTickChance: 0.3
     - type: AtmosExposed
     - type: SpeedModifierContacts
       walkSpeedModifier: 0.3
diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
index 592f8be693b..341acb52f0b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -7,8 +7,17 @@
   components:
     - type: Sprite
       sprite: Objects/Misc/stock_parts.rsi
+      scale: 0.8, 0.8
     - type: Item
       size: Tiny
+    - type: EmitSoundOnPickup
+      sound: /Audio/SimpleStation14/Items/Handling/component_pickup.ogg
+    - type: EmitSoundOnDrop
+      sound: /Audio/SimpleStation14/Items/Handling/component_drop.ogg
+    - type: EmitSoundOnLand
+      sound: /Audio/SimpleStation14/Items/Handling/component_drop.ogg
+
+# Rating 1
 
 - type: entity
   id: CapacitorStockPart
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index c1a5d9a1bfd..d1527ceff58 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -15,6 +15,7 @@
       map: ["enum.PaperVisualLayers.Stamp"]
       visible: false
   - type: Paper
+  - type: PaperLabelType
   - type: ActivatableUI
     key: enum.PaperUiKey.Key
     closeOnHandDeselect: false
@@ -70,6 +71,12 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 1
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/paper_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/paper_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/paper_drop.ogg
 
 - type: entity
   name: paper scrap
@@ -143,6 +150,8 @@
     - state: paper_stamp-generic
       map: ["enum.PaperVisualLayers.Stamp"]
       visible: false
+  - type: PaperLabelType
+    paperType: CaptainsPaper
   - type: PaperVisuals
     headerImagePath: "/Textures/Interface/Paper/paper_heading_captains_thoughts.svg.96dpi.png"
     backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png"
@@ -160,19 +169,21 @@
     sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: paper
-      color: "#f7e574"
+      color: "#9ef5ff"
     - state: paper_words
       map: ["enum.PaperVisualLayers.Writing"]
-      color: "#f7e574"
+      color: "#9ef5ff"
       visible: false
     - state: paper_stamp-generic
       map: ["enum.PaperVisualLayers.Stamp"]
       visible: false
+  - type: PaperLabelType
+    paperType: Invoice
   - type: PaperVisuals
     backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png"
     contentImagePath: "/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png"
-    backgroundModulate: "#f7e574"
-    contentImageModulate: "#f7e574"
+    backgroundModulate: "#9ef5ff"
+    contentImageModulate: "#9ef5ff"
     backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0
     contentMargin: 16.0, 16.0, 16.0, 16.0
     headerImagePath: "/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png"
@@ -184,6 +195,29 @@
   name: bounty manifest
   description: A paper label designating a crate as containing a bounty. Selling a crate with this label will fulfill the bounty.
   components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: paper
+      color: "#f7e574"
+    - state: paper_words
+      map: ["enum.PaperVisualLayers.Writing"]
+      color: "#f7e574"
+      visible: false
+    - state: paper_stamp-generic
+      map: ["enum.PaperVisualLayers.Stamp"]
+      visible: false
+  - type: PaperLabelType
+    paperType: Bounty
+  - type: PaperVisuals
+    backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png"
+    contentImagePath: "/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png"
+    backgroundModulate: "#f7e574"
+    contentImageModulate: "#f7e574"
+    backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0
+    contentMargin: 16.0, 16.0, 16.0, 16.0
+    headerImagePath: "/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png"
+    headerMargin: 0.0, 12.0, 0.0, 0.0
   - type: CargoBountyLabel
   - type: StaticPrice
     price: 0
@@ -336,6 +370,8 @@
     damage:
       types:
         Piercing: 15
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
   - type: Tool
     qualities:
       - Screwing
diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
index e1f4d086d45..9561fa3538f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
@@ -59,11 +59,9 @@
         types:
           Heat: 5
       coldDamage: {}
-      ColdDamageThreshold: 0
+      coldDamageThreshold: 0
     - type: Flammable
       fireSpread: true
-      cold:
-        types: {}
       damage:
         types:
           Heat: 5
@@ -146,11 +144,9 @@
         types:
           Heat: 5
       coldDamage: {}
-      ColdDamageThreshold: 0
+      coldDamageThreshold: 0
     - type: Flammable
       fireSpread: true
-      cold:
-        types: {}
       damage:
         types:
           Heat: 5
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index dcdb316b7ec..2336945f171 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -189,7 +189,6 @@
       implantAction: ActionActivateScramImplant
     - type: TriggerImplantAction
     - type: ScramImplant
-      teleportAttempts: 10 # small amount of risk of being teleported into space and lets you teleport off shuttles
 
 - type: entity
   parent: BaseSubdermalImplant
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 99f9ccaa874..78bbd32f174 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -17,9 +17,6 @@
     sound: /Audio/Weapons/star_hit.ogg
   - type: Stack
     count: 1
-  - type: Tag
-    tags:
-      - NoPaint
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
diff --git a/Resources/Prototypes/Entities/Objects/Misc/translator_implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/translator_implanters.yml
new file mode 100644
index 00000000000..8b5b262ff8a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/translator_implanters.yml
@@ -0,0 +1,77 @@
+- type: entity
+  id: BaseTranslatorImplanter
+  abstract: true
+  parent: BaseImplantOnlyImplanter
+  name: basic translator implanter
+
+- type: entity
+  id: BasicGalaticCommonTranslatorImplanter
+  parent: BaseTranslatorImplanter
+  name: basic common translator implanter
+  components:
+  - type: Implanter
+    implant: BasicGalacticCommonTranslatorImplant
+
+- type: entity
+  id: AdvancedGalaticCommonTranslatorImplanter
+  parent: BaseTranslatorImplanter
+  name: advanced common translator implanter
+  components:
+  - type: Implanter
+    implant: GalacticCommonTranslatorImplant
+
+- type: entity
+  id: BubblishTranslatorImplanter
+  parent: BaseTranslatorImplanter
+  name: bubblish translator implant
+  components:
+  - type: Implanter
+    implant: BubblishTranslatorImplant
+
+- type: entity
+  id: NekomimeticTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: nekomimetic translator implant
+  components:
+  - type: Implanter
+    implant: NekomimeticTranslatorImplant
+
+- type: entity
+  id: DraconicTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: draconic translator implant
+  components:
+  - type: Implanter
+    implant: DraconicTranslatorImplant
+
+- type: entity
+  id: CanilunztTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: canilunzt translator implant
+  components:
+  - type: Implanter
+    implant: CanilunztTranslatorImplant
+
+- type: entity
+  id: SolCommonTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: sol-common translator implant
+  components:
+  - type: Implanter
+    implant: SolCommonTranslatorImplant
+
+- type: entity
+  id: RootSpeakTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: root-speak translator implant
+  components:
+  - type: Implanter
+    implant: RootSpeakTranslatorImplant
+
+- type: entity
+  id: MofficTranslatorImplanter
+  parent: [ BaseTranslatorImplanter ]
+  name: moffic translator implant
+  components:
+  - type: Implanter
+    implant: MofficTranslatorImplant
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index 748ab123185..1162a3ec71b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -52,6 +52,12 @@
     - Book
   - type: StealTarget
     stealGroup: Bible
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/book_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg
 
 - type: entity
   parent: Bible
@@ -73,7 +79,6 @@
     failChance: 0
     locPrefix: "necro"
     healSound: "/Audio/Effects/lightburn.ogg"
-    cooldownTime: 1.3
   - type: Summonable
     specialItem: SpawnPointGhostCerberus
     respawnTime: 300
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 2ddb21b9e6c..b192401c8b8 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -11,6 +11,8 @@
     damage:
       types:
         Blunt: 10
+    soundHit:
+      collection: MetalThud
   - type: Spillable
     solution: absorbed
   - type: Wieldable
@@ -49,6 +51,8 @@
       damage:
         types:
           Blunt: 10
+      soundHit:
+         collection: MetalThud
     - type: Spillable
       solution: absorbed
     - type: Wieldable
@@ -83,123 +87,6 @@
         - Mop
         - MopAdv
 
-- type: entity
-  name: mop bucket
-  id: MopBucket
-  description: Holds water and the tears of the janitor.
-  components:
-  - type: Clickable
-  - type: Sprite
-    sprite: Objects/Specific/Janitorial/janitorial.rsi
-    noRot: true
-    layers:
-    - state: mopbucket
-    - state: mopbucket_water-1
-      map: ["enum.SolutionContainerLayers.Fill"]
-      visible: false
-    drawdepth: Objects
-  - type: InteractionOutline
-  - type: SolutionContainerManager
-    solutions:
-      bucket:
-        maxVol: 600
-  - type: Spillable
-    solution: bucket
-    spillDelay: 3.0
-  - type: DrainableSolution
-    solution: bucket
-  - type: RefillableSolution
-    solution: bucket
-  - type: ExaminableSolution
-    solution: bucket
-  - type: Tag
-    tags:
-      - Wringer
-  - type: ItemMapper
-    mapLayers:
-      mopbucket_shark_blue:
-        whitelist:
-          tags:
-            - PlushieSharkBlue
-      mopbucket_shark_pink:
-        whitelist:
-          tags:
-            - PlushieSharkPink
-      mopbucket_shark_grey:
-        whitelist:
-          tags:
-            - PlushieSharkGrey
-    sprite: Objects/Fun/sharkplush.rsi
-  - type: Physics
-    bodyType: Dynamic
-  - type: Transform
-    noRot: true
-  - type: ItemSlots
-    slots:
-      shark_slot:
-        name: mop-bucket-slot-component-slot-name-shark
-        whitelist:
-          tags:
-            - PlushieSharkBlue
-            - PlushieSharkPink
-            - PlushieSharkGrey
-        priority: 3 # Higher than drinking priority
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.40,0.25,0.25"
-        density: 60
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
-  - type: Pullable
-  - type: Drink
-    solution: bucket
-  - type: Appearance
-  - type: SolutionContainerVisuals
-    maxFillLevels: 3
-    fillBaseName: mopbucket_water-
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-        ents: []
-      shark_slot: !type:ContainerSlot {}
-  - type: GuideHelp
-    guides:
-    - Janitorial
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 70
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-
-- type: entity
-  name: mop bucket
-  id: MopBucketFull
-  parent: MopBucket
-  suffix: full
-  components:
-    - type: Sprite
-      layers:
-        - state: mopbucket
-        - state: mopbucket_water-3
-          map: [ "enum.SolutionContainerLayers.Fill" ]
-    - type: SolutionContainerManager
-      solutions:
-        bucket:
-          maxVol: 600
-          reagents:
-            - ReagentId: Water
-              Quantity: 600
-
 - type: entity
   name: wet floor sign
   id: WetFloorSign
@@ -275,291 +162,6 @@
     tags: # ignore "WhitelistChameleon" tag
       - WetFloorSign
 
-- type: entity
-  name: janitorial trolley
-  id: JanitorialTrolley
-  parent: BaseStructureDynamic
-  description: This is the alpha and omega of sanitation.
-  components:
-    - type: Sprite
-      noRot: true
-      sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
-      layers:
-        - state: cart
-        - state: cart_water-1
-          map: ["enum.SolutionContainerLayers.Fill"]
-          visible: false
-    - type: Rotatable
-    - type: InteractionOutline
-    # Removing storage until OnInteractUsing logic resolved
-    #- type: Storage
-    #  popup: false
-    #  capacity: 80
-    #  blacklist: # there is exclusive item slots for that
-    #    tags:
-    #      - Mop
-    #      - TrashBag
-    #      - Bucket
-    - type: ItemSlots
-      slots:
-        mop_slot:
-          name: janitorial-trolley-slot-component-slot-name-mop
-          whitelist:
-            tags:
-              - Mop
-          insertOnInteract: false # or it conflicts with bucket logic
-          priority: 9 # Higher than bucket slot
-        plunger_slot:
-          name: janitorial-trolley-slot-component-slot-name-plunger
-          whitelist:
-            tags:
-              - Plunger
-          priority: 8
-        wetfloorsign_slot4:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        wetfloorsign_slot3:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        wetfloorsign_slot2:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        wetfloorsign_slot1:
-          name: janitorial-trolley-slot-component-slot-name-sign
-          whitelist:
-            tags:
-              - WetFloorSign
-          priority: 7
-        lightreplacer_slot:
-          name: janitorial-trolley-slot-component-slot-name-lightreplacer
-          whitelist:
-            components:
-              - LightReplacer
-          priority: 6
-        spraybottle_slot:
-          name: janitorial-trolley-slot-component-slot-name-spray
-          whitelist:
-            tags:
-              - Spray
-          insertOnInteract: false # or it conflicts with bucket logic
-          priority: 5 # Higher than bucket slot
-        bucket_slot:
-          name: janitorial-trolley-slot-component-slot-name-bucket
-          whitelist:
-            tags:
-              - Bucket
-          insertOnInteract: false # or it also conflicts with bucket logic
-          priority: 4 # Higher than trash bag slot
-        trashbag_slot:
-          name: janitorial-trolley-slot-component-slot-name-trashbag
-          whitelist:
-            tags:
-              - TrashBag
-          priority: 3 # Higher than drinking priority
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape:
-            !type:PhysShapeCircle
-            radius: 0.3
-          density: 250
-          layer:
-          - MobLayer
-          mask:
-          - MobMask
-    - type: Spillable
-      solution: bucket
-      spillDelay: 3.0
-    - type: SolutionContainerManager
-      solutions:
-        bucket:
-          maxVol: 800
-          reagents:
-            - ReagentId: Water
-              Quantity: 600 # 3 quarters full at roundstart to make it more appealing
-    - type: DrainableSolution
-      solution: bucket
-    - type: RefillableSolution
-      solution: bucket
-    - type: ExaminableSolution
-      solution: bucket
-    - type: Tag
-      tags:
-        - Wringer
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 400
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 200
-          behaviors:
-            - !type:EmptyAllContainersBehaviour
-            - !type:DoActsBehavior
-              acts: ["Destruction"]
-            - !type:PlaySoundBehavior
-              sound:
-                collection: MetalBreak
-    - type: ItemMapper
-      mapLayers:
-        cart_plunger:
-          whitelist:
-            tags:
-              - Plunger
-        cart_mop:
-          whitelist:
-            tags:
-              - MopBasic
-        cart_advmop:
-          whitelist:
-            tags:
-              - MopAdv
-        cart_garbage:
-          whitelist:
-            tags:
-              - TrashBag
-        cart_replacer:
-          whitelist:
-            components:
-              - LightReplacer
-        cart_spray:
-          whitelist:
-            tags:
-              - Spray
-        cart_sign1: # this is like stack of floor signs
-          minCount: 1
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_sign2:
-          minCount: 2
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_sign3:
-          minCount: 3
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_sign4:
-          minCount: 4
-          whitelist:
-            tags:
-              - WetFloorSign
-        cart_bucket:
-          whitelist:
-            tags:
-              - Bucket
-      sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
-    - type: Appearance
-    - type: SolutionContainerVisuals
-      maxFillLevels: 3
-      fillBaseName: cart_water-
-    - type: UserInterface
-      interfaces:
-      - key: enum.StorageUiKey.Key
-        type: StorageBoundUserInterface
-    - type: Drink
-      solution: bucket
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          ents: []
-        mop_slot: !type:ContainerSlot {}
-        trashbag_slot: !type:ContainerSlot {}
-        bucket_slot: !type:ContainerSlot {}
-        plunger_slot: !type:ContainerSlot {}
-        wetfloorsign_slot4: !type:ContainerSlot {}
-        wetfloorsign_slot3: !type:ContainerSlot {}
-        wetfloorsign_slot2: !type:ContainerSlot {}
-        wetfloorsign_slot1: !type:ContainerSlot {}
-        lightreplacer_slot: !type:ContainerSlot {}
-        spraybottle_slot:  !type:ContainerSlot {}
-    - type: GuideHelp
-      guides:
-      - Janitorial
-    - type: TileFrictionModifier
-      modifier: 0.4 # makes it slide
-
-- type: entity
-  id: FloorDrain
-  name: drain
-  description: Drains puddles around it. Useful for dumping mop buckets or keeping certain rooms clean.
-  placement:
-    mode: SnapgridCenter
-  components:
-    - type: Sprite
-      drawdepth: FloorObjects
-      sprite: Objects/Specific/Janitorial/drain.rsi
-      layers:
-      - state: icon
-      - map: [ "enum.SolutionContainerLayers.Fill" ]
-        state: fill-1
-        visible: false
-    - type: InteractionOutline
-    - type: Clickable
-    - type: Transform
-      anchored: true
-    - type: Physics
-      bodyType: Static
-      canCollide: false
-    - type: AmbientSound
-      enabled: false
-      volume: -8
-      range: 8
-      sound:
-        path: /Audio/Ambience/Objects/drain.ogg
-    - type: Drain
-    - type: DumpableSolution
-      solution: drainBuffer
-    - type: Appearance
-    - type: SolutionContainerVisuals
-      maxFillLevels: 1
-      fillBaseName: fill-
-      solutionName: drainBuffer
-    - type: SolutionContainerManager
-      solutions:
-        drainBuffer:
-          maxVol: 1000
-    - type: DrainableSolution
-      solution: drainBuffer
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 200
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 100
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-            - !type:PlaySoundBehavior
-              sound:
-                collection: MetalBreak
-
 - type: entity
   name: plunger
   id: Plunger
@@ -618,6 +220,15 @@
     damage:
       types:
         Blunt: 3
+  - type: Plunger
+
+- type: weightedRandomEntity
+  id: PlungerLoot
+  weights:
+    RandomSpawner100: 56
+    SpacemenFigureSpawner: 28
+    SpawnMobCockroach: 5
+    MaintenanceToolSpawner: 5
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 56786057d57..5678de6bafc 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -62,7 +62,6 @@
     solution: soap
   - type: DeleteOnSolutionEmpty
     solution: soap
-  - type: PaintRemover
   - type: FlavorProfile
     flavors:
       - clean
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index 5a2587ff710..471801f3a1f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -66,9 +66,6 @@
     bodyType: KinematicController
   - type: Clickable
   - type: WiresPanel
-  - type: Wires #we just want the panel
-    boardName: wires-board-name-mech
-    layoutId: Mech
   - type: Fixtures
     fixtures:
       fix1:
@@ -95,6 +92,7 @@
   - type: GuideHelp
     guides:
     - Robotics
+  - type: CanWalk
 
 - type: entity
   id: MechRipley
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
index 0f03c6d8ea6..ab6cdfc4e3b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
@@ -19,6 +19,27 @@
   # - Virology (when it's back)
     - Botany
 
+- type: entity
+  parent: BaseAmmoProvider # this is for cycling swabs out and not spawning 30 entities, trust
+  id: BoxMouthSwab
+  name: sterile swab dispenser
+  description: Dispenses 30 sterile swabs, extremely useful for botany.
+  components:
+  - type: Sprite
+    layers:
+    - state: boxwide
+    - state: swab
+  - type: BallisticAmmoProvider
+    whitelist:
+      components:
+      - BotanySwab
+    proto: DiseaseSwab
+    capacity: 30
+  - type: GuideHelp
+    guides:
+  # - Virology (when it's back)
+    - Botany
+
 - type: entity
   parent: BaseItem
   id: Vaccine
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 9fde67afb44..252f2f48eae 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -711,6 +711,10 @@
   parent: Pill
   id: PillAmbuzolPlus
   components:
+    - type: Pill
+      pillType: 2
+    - type: Sprite
+      state: pill3
     - type: SolutionContainerManager
       solutions:
         food:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 3d28487d68e..d6f3ee75fa6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -18,7 +18,7 @@
   - type: ExaminableSolution
     solution: hypospray
   - type: Hypospray
-    onlyMobs: false
+    onlyAffectsMobs: false
   - type: UseDelay
     delay: 0.5
   - type: StaticPrice
@@ -49,7 +49,7 @@
   - type: ExaminableSolution
     solution: hypospray
   - type: Hypospray
-    onlyMobs: false
+    onlyAffectsMobs: false
   - type: UseDelay
     delay: 0.5
 
@@ -73,6 +73,7 @@
   - type: ExaminableSolution
     solution: hypospray
   - type: Hypospray
+    onlyAffectsMobs: false
   - type: UseDelay
     delay: 0.5
 
@@ -113,6 +114,8 @@
   - type: Hypospray
     solutionName: pen
     transferAmount: 15
+    onlyAffectsMobs: false
+    injectOnly: true
   - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 1
@@ -202,6 +205,8 @@
   - type: Hypospray
     solutionName: pen
     transferAmount: 20
+    onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -232,6 +237,8 @@
   - type: Hypospray
     solutionName: pen
     transferAmount: 20
+    onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -262,6 +269,9 @@
   - type: Hypospray
     solutionName: pen
     transferAmount: 20
+    onlyAffectsMobs: false
+    injectOnly: true
+
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -293,6 +303,8 @@
   - type: Hypospray
     solutionName: pen
     transferAmount: 30
+    onlyAffectsMobs: false
+    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -330,6 +342,8 @@
   - type: Hypospray
     solutionName: pen
     transferAmount: 30
+    onlyAffectsMobs: false
+    injectOnly: true
   - type: StaticPrice
     price: 500
   - type: Tag
@@ -389,6 +403,8 @@
   - type: Hypospray
     solutionName: pen
     transferAmount: 30
+    onlyAffectsMobs: false
+    injectOnly: true
   - type: StaticPrice
     price: 500
   - type: Tag
@@ -409,8 +425,9 @@
     solution: hypospray
   - type: ExaminableSolution
     solution: hypospray
+    heldOnly: true # Allow examination only when held in hand.
   - type: Hypospray
-    onlyMobs: false
+    onlyAffectsMobs: false
   - type: UseDelay
     delay: 0.5
   - type: StaticPrice # A new shitcurity meta
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index f664c3a811c..8f54bb8059c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: BodyBag_Container
+  id: BodyBag
   parent: BaseFoldable
   name: body bag
   description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition.
@@ -17,8 +17,8 @@
       visible: false
     - state: open_overlay
       map: ["enum.StorageVisualLayers.Door"]
-    - state: label_overlay
-      map: ["enum.BodyBagVisualLayers.Label"]
+    - state: paper
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: Icon
     sprite: Objects/Specific/Medical/Morgue/bodybags.rsi
     state: bag
@@ -62,9 +62,15 @@
   - type: GenericVisualizer
     visuals:
       enum.PaperLabelVisuals.HasLabel:
-        enum.BodyBagVisualLayers.Label:
+        enum.PaperLabelVisuals.Layer:
           True: {visible: true}
           False: {visible: false}
+      enum.PaperLabelVisuals.LabelType:
+        enum.PaperLabelVisuals.Layer:
+          Paper: { state: paper }
+          Bounty: { state: bounty }
+          CaptainsPaper: { state: captains_paper }
+          Invoice: { state: invoice }
       enum.FoldedVisuals.State:
         foldedLayer:
           True: {visible: true}
@@ -83,10 +89,10 @@
     price: 50
 
 - type: entity
-  id: BodyBag_Folded
+  id: BodyBagFolded
   name: body bag
   description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition.
-  parent: BodyBag_Container
+  parent: BodyBag
   suffix: folded
   components:
   - type: Foldable
@@ -120,6 +126,8 @@
   - type: SolutionSpiker
     sourceSolution: food
     ignoreEmpty: true
+  - type: ScoopableSolution
+    solution: food
   - type: Extractable
     grindableSolutionName: food
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml
index 0cb605cee64..fa1b75530b6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml
@@ -11,6 +11,12 @@
   - type: GuideHelp
     guides:
     - Science
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/disk_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg
 
 - type: entity
   parent: ResearchDisk
@@ -69,3 +75,9 @@
   components:
   - type: TechnologyDisk
     tierWeightPrototype: RareTechDiskTierWeights
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/disk_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index e14f29746dc..d37523bd735 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -222,7 +222,6 @@
   - type: ItemBorgModule
     items:
     - WeaponGrapplingGun
-    - WeaponCrusherDagger
     - HandheldGPSBasic
 
 # engineering modules
@@ -517,13 +516,13 @@
   components:
     - type: Sprite
       layers:
-        - state: syndicate
-        - state: icon-tools
+      - state: syndicate
+      - state: icon-syndicate
     - type: ItemBorgModule
       items:
-        - Crowbar
-        - Emag
-        - PinpointerSyndicateNuclear
+      - Crowbar
+      - Emag
+      - PinpointerSyndicateNuclear
 
 - type: entity
   id: BorgModuleEsword
@@ -533,12 +532,12 @@
   components:
     - type: Sprite
       layers:
-        - state: syndicate
-        - state: icon-tools
+      - state: syndicate
+      - state: icon-syndicate
     - type: ItemBorgModule
       items:
-        - EnergySwordDouble
-        - PinpointerSyndicateNuclear
+      - EnergySwordDouble
+      - PinpointerSyndicateNuclear
 
 - type: entity
   id: BorgModuleL6C
@@ -548,9 +547,9 @@
   components:
     - type: Sprite
       layers:
-        - state: syndicate
-        - state: icon-tools
+      - state: syndicate
+      - state: icon-syndicate
     - type: ItemBorgModule
       items:
-        - WeaponLightMachineGunL6C
-        - PinpointerSyndicateNuclear
+      - WeaponLightMachineGunL6C
+      - PinpointerSyndicateNuclear
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml
index adbb7cde40b..a17c892169d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml
@@ -9,6 +9,7 @@
     noRot: true
   - type: Repairable
   - type: DamagePopup
+    allowTypeChange: true
     damagePopupType: Combined
   - type: Fixtures
     fixtures:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
index 4abeea38128..c38868b3997 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: CrateArtifactContainer
   parent: BaseStructureDynamic
   name: artifact container
@@ -24,6 +24,8 @@
       - state: locked
         map: ["enum.LockVisualLayers.Lock"]
         shader: unshaded
+      - state: paper
+        map: ["enum.PaperLabelVisuals.Layer"]
     - type: InteractionOutline
     - type: Physics
     - type: Fixtures
@@ -73,6 +75,23 @@
     - type: EntityStorageVisuals
       stateDoorOpen: artifact_container_open
       stateDoorClosed: artifact_container_door
+    - type: GenericVisualizer
+      visuals:
+        enum.PaperLabelVisuals.HasLabel:
+          enum.PaperLabelVisuals.Layer:
+            True: { visible: true }
+            False: { visible: false }
+        enum.PaperLabelVisuals.LabelType:
+          enum.PaperLabelVisuals.Layer:
+            Paper: { state: paper }
+            Bounty: { state: bounty }
+            CaptainsPaper: { state: captains_paper }
+            Invoice: { state: invoice }
+        enum.StorageVisuals.Open:
+          enum.PaperLabelVisuals.Layer:
+            True: { offset: "0.0,0.3125" }
+            False: { offset: "0.0,0.0" }
+            
     - type: LockVisuals
     - type: ItemSlots
     - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index ae4aaed7d21..9e68879fb49 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -475,7 +475,6 @@
       behaviors:
       - !type:SpillBehavior
         solution: food
-        transferForensics: true
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index 631e2a247ea..d03cc725efe 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -142,8 +142,12 @@
     predictable: false
     soundActivate:
       path: /Audio/Items/Lighters/zippo_open.ogg
+      params:
+        volume: -5
     soundDeactivate:
       path: /Audio/Items/Lighters/zippo_close.ogg
+      params:
+        volume: -5
   - type: ItemToggleMeleeWeapon
     activatedDamage:
         types:
@@ -201,6 +205,9 @@
     netsync: false
     radius: 1.2 #slightly stronger than the other lighters
     color: orange
+  - type: UseDelay
+  - type: IgnitionSource
+    ignited: false
 
 - type: entity
   name: flippo engraved lighter
diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index e8601fcf355..561e478d93a 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -59,6 +59,10 @@
   id: Matchbox
   description: A small box of Almost But Not Quite Plasma Premium Matches.
   components:
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/matchbox_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/matchbox_drop.ogg
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Items/matchbox_drop.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index 667d8559971..9e35443cd4b 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -7,6 +7,10 @@
     layers:
       - map: [ base ]
         state: icon
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/toolbox_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/toolbox_drop.ogg
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Items/toolbox_drop.ogg
@@ -154,7 +158,6 @@
     sprite: Objects/Tools/Toolboxes/toolbox_thief.rsi
     state: icon
   - type: ThiefUndeterminedBackpack
-    transformAfterSelect: AlwaysPoweredWallLight
     possibleSets:
     # - TO DO Thief pinpointer needed
     - ChemistrySet
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index f1bf2ff98e7..9ac46dbe305 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -4,6 +4,10 @@
   id: Wirecutter
   description: This kills the wire.
   components:
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/wirecutter_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/wirecutter_drop.ogg
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Items/wirecutter_drop.ogg
@@ -50,6 +54,10 @@
   id: Screwdriver
   description: Industrial grade torque in a small screwdriving package.
   components:
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/screwdriver_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/screwdriver_drop.ogg
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Items/screwdriver_drop.ogg
@@ -94,6 +102,10 @@
   id: Wrench
   description: 'A common tool for assembly and disassembly. Remember: righty tighty, lefty loosey.'
   components:
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/wrench_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/wrench_drop.ogg
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Items/wrench_drop.ogg
@@ -133,6 +145,10 @@
   id: Crowbar
   description: A multipurpose tool to pry open doors and fight interdimensional invaders.
   components:
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/crowbar_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/crowbar_drop.ogg
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Items/crowbar_drop.ogg
@@ -191,6 +207,10 @@
   id: Multitool
   description: An advanced tool to copy, store, and send electrical pulses and signals through wires and machines
   components:
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/multitool_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/multitool_drop.ogg
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Items/multitool_drop.ogg
@@ -225,6 +245,7 @@
   - type: Tag
     tags:
       - Multitool
+      - DoorElectronicsConfigurator
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
@@ -266,6 +287,9 @@
     - type: ActivatableUI
       key: enum.NetworkConfiguratorUiKey.List
       inHandsOnly: true
+    - type: Tag
+      tags:
+        - DoorElectronicsConfigurator
     - type: UserInterface
       interfaces:
         - key: enum.NetworkConfiguratorUiKey.List
@@ -343,15 +367,35 @@
       path: "/Audio/Items/drill_hit.ogg"
 
 - type: entity
-  name: RCD
-  parent: BaseItem
   id: RCD
-  description: An advanced construction device which can place/remove walls, floors, and airlocks quickly.
+  parent: BaseItem
+  name: RCD
+  description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function.
   components:
   - type: RCD
+    availablePrototypes:
+    - WallSolid
+    - FloorSteel
+    - Plating
+    - Catwalk
+    - Grille
+    - Window
+    - WindowDirectional
+    - WindowReinforcedDirectional
+    - ReinforcedWindow
+    - Airlock
+    - AirlockGlass
+    - Firelock
+    - TubeLight
+    - BulbLight
+    - LVCable
+    - MVCable
+    - HVCable
+    - CableTerminal
+    - Deconstruct
   - type: LimitedCharges
-    maxCharges: 5
-    charges: 5
+    maxCharges: 30
+    charges: 30
   - type: UseDelay
   - type: Sprite
     sprite: Objects/Tools/rcd.rsi
@@ -369,6 +413,12 @@
       Plastic: 100
   - type: StaticPrice
     price: 100
+  - type: UserInterface
+    interfaces:
+    - key: enum.RcdUiKey.Key
+      type: RCDMenuBoundUserInterface
+  - type: ActivatableUI
+    key: enum.RcdUiKey.Key
 
 - type: entity
   id: RCDEmpty
@@ -376,37 +426,50 @@
   suffix: Empty
   components:
   - type: LimitedCharges
-    maxCharges: 5
     charges: 0
+  - type: RCD
+    availablePrototypes:
+    - WallSolid
+    - FloorSteel
+    - Plating
+    - Catwalk
+    - Grille
+    - Window
+    - WindowDirectional
+    - WindowReinforcedDirectional
+    - ReinforcedWindow
+    - Airlock
+    - AirlockGlass
+    - Firelock
 
 - type: entity
   id: RCDRecharging
   parent: RCD
-  name: experimental rcd
-  description: A bluespace-enhanced RCD that regenerates charges passively.
+  name: experimental RCD
+  description: A bluespace-enhanced rapid construction device that passively generates its own compressed matter.
   suffix: AutoRecharge
   components:
   - type: LimitedCharges
-    maxCharges: 3
-    charges: 3
+    maxCharges: 20
+    charges: 20
   - type: AutoRecharge
-    rechargeDuration: 30
+    rechargeDuration: 10
 
 - type: entity
   id: RCDExperimental
   parent: RCD
   suffix: Admeme
-  name: experimental rcd
-  description: A bluespace-enhanced RCD that regenerates charges passively.
+  name: experimental RCD
+  description: A bluespace-enhanced rapid construction device that passively generates its own compressed matter.
   components:
   - type: AutoRecharge
-    rechargeDuration: 5
+    rechargeDuration: 1
 
 - type: entity
-  name: RCD Ammo
+  name: compressed matter
   parent: BaseItem
   id: RCDAmmo
-  description: Ammo cartridge for an RCD.
+  description: A cartridge of raw matter compacted by bluespace technology. Used in rapid construction devices.
   components:
   - type: RCDAmmo
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index 9bf3f2e2cb9..e141f35caeb 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -4,6 +4,10 @@
   id: Welder
   description: "Melts anything as long as it's fueled, don't forget your eye protection!"
   components:
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/welder_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/welder_drop.ogg
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Items/welder_drop.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
index 4aff7363a45..630354f23d9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -117,3 +117,6 @@
     - id: TrashBananaPeelExplosive
     sound:
       path: /Audio/Effects/unwrap.ogg
+  - type: Tag
+    tags:
+    - Banana
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/base_ammo.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/base_ammo.yml
new file mode 100644
index 00000000000..eceec8ac3e8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/base_ammo.yml
@@ -0,0 +1,11 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: BaseMagazineBox
+  components:
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/ammobox_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/ammobox_drop.ogg
+  - type: EmitSoundOnLand
+    sound: /Audio/SimpleStation14/Items/Handling/ammobox_drop.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
index 063268d8b53..f1550cf9a8f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: BaseMagazineBox
   id: BaseMagazineBoxCaselessRifle
   name: ammunition box (.25 caseless)
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
index 0670e376360..22eeeff859d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: BaseMagazineBox
   id: BaseMagazineBoxLightRifle
   name: ammunition box (.30 rifle)
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
index 65f6bff00eb..c304f0af111 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: BaseMagazineBox
   id: BaseMagazineBoxMagnum
   components:
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
index 9f6a8e8257d..b78551b99bd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: BaseMagazineBox
   id: BaseMagazineBoxPistol
   name: ammunition box (.35 auto)
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
index c321b77d10b..8e6c79dfe57 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: BaseMagazineBox
   id: BaseMagazineBoxRifle
   components:
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
index 11649f3db3c..a3b1855a746 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: BaseMagazineBox
   id: BoxDonkSoftBase
   name: foamdart box
   components:
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 7f0507d686d..36d41e391ac 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
@@ -50,7 +50,7 @@
         Blunt: 1
         Heat: 2
   - type: IgniteOnCollide
-    fireStacks: 3
+    fireStacks: 1
     count: 10
   - type: TimedDespawn
     lifetime: 0.25
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 757b8934d43..e119a846c9c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -86,8 +86,8 @@
     damage:
       types:
         Piercing: 3
-        Slash: 3 
-        
+        Slash: 3
+
 
 - type: entity
   id: PelletShotgunTranquilizer
@@ -110,9 +110,9 @@
     solution: ammo
   - type: DrainableSolution
     solution: ammo
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnProjectileHit
     transferAmount: 15
-    blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask
+    solution: ammo
   - type: InjectableSolution
     solution: ammo
 
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 bf0c51849a3..fb2f56a6ed6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -229,7 +229,7 @@
   name: practice laser rifle
   parent: WeaponLaserCarbine
   id: WeaponLaserCarbinePractice
-  description: This modified laser rifle fires harmless beams in the 40-watt range, for target practice.
+  description: This modified laser rifle fires nearly harmless beams in the 40-watt range, for target practice.
   components:
   - type: HitscanBatteryAmmoProvider
     proto: RedLaserPractice
@@ -489,7 +489,7 @@
   name: practice disabler
   parent: WeaponDisabler
   id: WeaponDisablerPractice
-  description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets.
+  description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets making it mostly harmless.
   components:
     - type: Sprite
       sprite: Objects/Weapons/Guns/Battery/practice_disabler.rsi
@@ -644,6 +644,7 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Revolvers/chimp.rsi
   - type: Gun
+    projectileSpeed: 4
     fireRate: 1.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
@@ -658,6 +659,8 @@
       fireCost: 100
     - proto: AnomalousParticleZetaStrong
       fireCost: 100
+    - proto: AnomalousParticleSigmaStrong
+      fireCost: 100
   - type: Construction
     graph: UpgradeWeaponPistolCHIMP
     node: start
@@ -680,6 +683,8 @@
       fireCost: 100
     - proto: AnomalousParticleZetaStrong
       fireCost: 100
+    - proto: AnomalousParticleSigmaStrong
+      fireCost: 100
 
 - type: entity
   name: eye of a behonker
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
index 8dbcf2b3033..52c5dc8a9db 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
@@ -50,9 +50,9 @@
     solution: ammo
   - type: InjectableSolution
     solution: ammo
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 2
-    blockSlots: NONE
+    solution: ammo
   - type: SolutionTransfer
     maxTransferAmount: 2
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index 163e21431ca..46b9fc8edd3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -35,7 +35,7 @@
   id: RedLaserPractice
   damage:
     types:
-      Heat: 0
+      Heat: 1
   muzzleFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: muzzle_laser
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 31c1b2e471a..388b16f7bfd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -102,7 +102,7 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 2
+        Blunt: 1
 
 - type: entity
   id: BaseBulletRubber
@@ -288,7 +288,7 @@
       fly-by: *flybyfixture
   - type: Ammo
   - type: StaminaDamageOnCollide
-    damage: 5
+    damage: 1
   - type: Projectile
     impactEffect: BulletImpactEffectDisabler
     damage:
@@ -487,6 +487,11 @@
   name: delta particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#c2385d"
+    radius: 2.0
+    energy: 7.0
   - type: AnomalousParticle
     particleType: Delta
   - type: Sprite
@@ -513,6 +518,9 @@
         Heat: 5
   - type: TimedDespawn
     lifetime: 3
+  - type: Reflective
+    reflective:
+    - Energy
 
 
 - type: entity
@@ -533,6 +541,11 @@
   name: epsilon particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#38c296"
+    radius: 2.0
+    energy: 7.0
   - type: Sprite
     layers:
       - state: magicm_cyan
@@ -558,6 +571,11 @@
   name: zeta particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#b9c238"
+    radius: 2.0
+    energy: 7.0
   - type: Sprite
     layers:
       - state: magicm_yellow
@@ -583,6 +601,11 @@
   name: omega particles
   noSpawn: true
   components:
+  - type: PointLight
+    enabled: true
+    color: "#38c24f"
+    radius: 2.0
+    energy: 7.0
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
     layers:
@@ -601,6 +624,33 @@
       types:
         Heat: 20
 
+- type: entity
+  parent: AnomalousParticleDelta
+  id: AnomalousParticleSigma
+  name: sigma particles
+  noSpawn: true
+  components:
+  - type: PointLight
+    enabled: true
+    color: "#8d38c2"
+    radius: 2.0
+    energy: 7.0
+  - type: Sprite
+    layers:
+      - state: magicm
+        shader: unshaded
+  - type: AnomalousParticle
+    particleType: Sigma
+
+- type: entity
+  parent: AnomalousParticleSigma
+  id: AnomalousParticleSigmaStrong
+  name: sigma particles
+  noSpawn: true
+  components:
+  - type: AnomalousParticle
+    particleType: Sigma
+
 # Launcher projectiles (grenade / rocket)
 - type: entity
   id: BulletRocket
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 2dfc833badf..3962f6e1f57 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -20,7 +20,7 @@
     maxAngle: 16
     fireRate: 8
     angleIncrease: 3
-    angleDecay: 16
+    angleDecay: 16  
     selectedMode: FullAuto
     availableModes:
     - SemiAuto
@@ -95,6 +95,11 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
   - type: Gun
+    shotsPerBurst: 5
+    availableModes:
+    - SemiAuto
+    - Burst
+    - FullAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg
     fireOnDropChance: 0.3
@@ -225,9 +230,16 @@
   - type: ChamberMagazineAmmoProvider
     boltClosed: null
   - type: Gun
-    fireRate: 5
+    fireRate: 5.5
+    minAngle: 1
+    maxAngle: 6
+    angleIncrease: 1.5
+    angleDecay: 6  
     selectedMode: FullAuto
+    shotsPerBurst: 5
     availableModes:
+    - SemiAuto
+    - Burst
     - FullAuto
     fireOnDropChance: 0.1
   - type: ItemSlots
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index 8ba643a1155..834d35a5297 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -40,6 +40,21 @@
     tags:
     - BaseballBat
 
+- type: entity
+  name: incomplete baseball bat
+  parent: BaseItem
+  id: IncompleteBaseBallBat
+  description: A few planks of wood stuck together.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/incomplete_bat.rsi
+    state: icon
+  - type: Item
+    size: Normal
+  - type: Construction
+    graph: WoodenBat
+    node: incompleteBat
+
 - type: entity
   name: knockback stick
   parent: BaseBallBat
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index ccbbcc2de84..bc376df5eab 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -78,9 +78,6 @@
     malus: 0
   - type: Reflect
     enabled: false
-  - type: Tag
-    tags:
-      - NoPaint
   - type: IgnitionSource
     temperature: 700
 
@@ -159,7 +156,6 @@
   - type: Tag
     tags:
     - Write
-    - NoPaint
   - type: DisarmMalus
     malus: 0
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 03654061ced..9cd1bb29408 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -263,6 +263,7 @@
     tags:
     - CombatKnife
     - Knife
+    - CannonRestrict
   - type: Sprite
     sprite: Objects/Weapons/Melee/throwing_knife.rsi
     state: icon
@@ -275,6 +276,7 @@
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
   - type: DamageOtherOnHit
+    ignoreResistances: true
     damage:
       types:
         Slash: 10
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index 8da4af799fe..3e9589b1a98 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -52,6 +52,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: Construction
     graph: Spear
     node: spear
@@ -65,10 +66,9 @@
     solution: melee
   - type: InjectableSolution
     solution: melee
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnEmbed
     transferAmount: 2
-    fixtureId: "throw-fixture"
-    blockSlots: NONE
+    solution: melee
   - type: SolutionTransfer
     maxTransferAmount: 2
   - type: Wieldable
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 426be1386a9..17e31e5893c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -11,11 +11,11 @@
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: 1.5
+    soundHit:
+      path: /Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg
     damage:
       types:
         Slash: 17 #cmon, it has to be at least BETTER than the rest.
-    soundHit:
-        path: /Audio/Weapons/bladeslice.ogg
   - type: Reflect
     enabled: true
     reflectProb: .5
@@ -43,11 +43,11 @@
     state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -135
+    soundHit:
+      path: /Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg
     damage:
       types:
         Slash: 15
-    soundHit:
-        path: /Audio/Weapons/bladeslice.ogg
   - type: Item
     size: Normal
     sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml
index 366aabd2f27..240a17a0a44 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml
@@ -17,3 +17,5 @@
     damage:
       types:
         Blunt: 20
+    soundHit:
+      path: "/Audio/Weapons/smash.ogg"
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index 2502243e0ce..0bf0f7f9159 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -4,6 +4,12 @@
   components:
     - type: StationData
 
+- type: entity
+  id: BaseRandomStation
+  abstract: true
+  components:
+    - type: StationRandomTransform
+
 - type: entity
   id: BaseStationCargo
   abstract: true
@@ -147,4 +153,4 @@
   id: BaseStationAllEventsEligible
   abstract: true
   components:
-    - type: StationEventEligible # For when someone makes this more granular in the future.
+    - type: StationEventEligible # For when someone makes this more granular in the future.
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
index 6adbeae529c..d34e4b3f872 100644
--- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
@@ -6,47 +6,48 @@
       factions:
         - NanoTrasen
 
-- type: entity
-  id: StandardNanotrasenStation
-  parent:
-    - BaseStation
-    - BaseStationNews
-    - BaseStationCargo
-    - BaseStationJobsSpawning
-    - BaseStationRecords
-    - BaseStationArrivals
-    - BaseStationGateway
-    - BaseStationShuttles
-    - BaseStationCentcomm
-    - BaseStationEvacuation
-    - BaseStationAlertLevels
-    - BaseStationMagnet
-    - BaseStationExpeditions
-    - BaseStationSiliconLawCrewsimov
-    - BaseStationAllEventsEligible
-    - BaseStationNanotrasen
-    - BaseStationMail # Nyano component, required for station mail to function
-  noSpawn: true
-  components:
-    - type: Transform
+# - type: entity
+  # id: StandardNanotrasenStation
+  # parent:
+    # - BaseStation
+    # - BaseStationNews
+    # - BaseStationCargo
+    # - BaseStationJobsSpawning
+    # - BaseStationRecords
+    # - BaseStationArrivals
+    # - BaseStationGateway
+    # - BaseStationShuttles
+    # - BaseStationCentcomm
+    # - BaseStationEvacuation
+    # - BaseStationAlertLevels
+    # - BaseStationMagnet
+    # - BaseStationExpeditions
+    # - BaseStationSiliconLawCrewsimov
+    # - BaseStationAllEventsEligible
+    # - BaseStationNanotrasen
+    # - BaseRandomStation
+    # - BaseStationMail # Nyano component, required for station mail to function
+  # noSpawn: true
+  # components:
+    # - type: Transform
 
-- type: entity
-  id: NanotrasenCentralCommand
-  parent:
-    - BaseStation
-    - BaseStationAlertLevels
-    - BaseStationNanotrasen
-  noSpawn: true
-  components:
-    - type: Transform
+# - type: entity
+  # id: NanotrasenCentralCommand
+  # parent:
+    # - BaseStation
+    # - BaseStationAlertLevels
+    # - BaseStationNanotrasen
+  # noSpawn: true
+  # components:
+    # - type: Transform
 
-- type: entity
-  id: StandardStationArena
-  parent:
-  - BaseStation
-  - BaseStationJobsSpawning
-  - BaseStationRecords
-  - BaseStationNanotrasen
-  noSpawn: true
-  components:
-    - type: Transform
+# - type: entity
+  # id: StandardStationArena
+  # parent:
+  # - BaseStation
+  # - BaseStationJobsSpawning
+  # - BaseStationRecords
+  # - BaseStationNanotrasen
+  # noSpawn: true
+  # components:
+    # - type: Transform
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
index 49f9ea514e4..bf6a9a93904 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
@@ -24,17 +24,14 @@
           !type:DamageTrigger
           damage: 50
         behaviors:
-          - !type:DoActsBehavior
-        acts: [ "Destruction" ]
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
   - type: AmbientSound
     volume: -5
     range: 5
     sound:
       path: /Audio/Ambience/Objects/fireplace.ogg
   - type: AlwaysHot
-  - type: Tag
-    tags:
-      - NoPaint
 
 - type: entity
   id: LegionnaireBonfire
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
index fa814e8ed3a..1b660c0cf07 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -71,5 +71,4 @@
       beakerSlot: !type:ContainerSlot
   - type: StaticPrice
     price: 1000
-  - type: Wires
   - type: WiresPanel
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
index 1583bc451de..7bc12ca966e 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -19,9 +19,6 @@
     noRot: false
   - type: Machine
     board: BoozeDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-booze
-    layoutId: BoozeDispenser
   - type: GuideHelp
     guides:
     - Bartender
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
index 6c70cf9bcac..681f0a390c8 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
@@ -31,9 +31,6 @@
         acts: ["Destruction"]
   - type: Machine
     board: ChemDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-chemdispenser
-    layoutId: ChemDispenser
   - type: GuideHelp
     guides:
     - Chemicals
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
index 323480506fa..72468973ee4 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -19,9 +19,6 @@
     noRot: false
   - type: Machine
     board: SodaDispenserMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-soda
-    layoutId: SodaDispenser
   - type: GuideHelp
     guides:
     - Bartender
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index fc310a3742b..64155fccc2e 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -5,32 +5,31 @@
   suffix: Service, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Service"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsService ]
   - type: Wires
     layoutId: AirlockService
 
 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
   id: AirlockLawyerLocked
   suffix: Lawyer, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsLawyer ]
 
 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
   id: AirlockTheatreLocked
   suffix: Theatre, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Theatre"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsTheatre ]
 
 - type: entity
   parent: AirlockScience # DeltaV - Chapel is in Epistemics
@@ -38,65 +37,59 @@
   suffix: Chapel, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Chapel"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChapel ]
 
 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
   id: AirlockJanitorLocked
   suffix: Janitor, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Janitor"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJanitor ]
 
 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
   id: AirlockKitchenLocked
   suffix: Kitchen, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsKitchen ]
 
 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
   id: AirlockBarLocked
   suffix: Bar, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Bar"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBar ]
 
 - type: entity
-  parent: Airlock
+  parent: AirlockServiceLocked
   id: AirlockHydroponicsLocked
   suffix: Hydroponics, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHydroponics ]
 
 - type: entity
-  parent: Airlock
+  parent: AirlockCommandLocked
   id: AirlockServiceCaptainLocked
   suffix: Captain, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCaptain ]
 
 - type: entity
   parent: AirlockExternal
@@ -104,8 +97,9 @@
   suffix: External, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["External"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockExternal
@@ -113,10 +107,9 @@
   suffix: External, Logistics, Locked # DeltaV - Logistics Department replacing Cargo
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCargo ]
 
 - type: entity
   parent: AirlockExternal
@@ -124,10 +117,9 @@
   suffix: External, Engineering, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
 
 - type: entity
   parent: AirlockExternal
@@ -135,10 +127,9 @@
   suffix: External, Atmospherics, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAtmospherics ]
 
 - type: entity
   parent: AirlockExternal
@@ -146,8 +137,9 @@
   suffix: External, Syndicate, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]
 
 - type: entity
   parent: AirlockExternal
@@ -155,8 +147,9 @@
   suffix: External, Nukeop, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]
 
 - type: entity
   parent: AirlockFreezer
@@ -164,10 +157,9 @@
   suffix: Kitchen, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsKitchen ]
 
 - type: entity
   parent: AirlockFreezer
@@ -175,10 +167,9 @@
   suffix: Kitchen/Hydroponics, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Kitchen"], ["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsFreezer ]
 
 - type: entity
   parent: AirlockFreezer
@@ -186,10 +177,9 @@
   suffix: Hydroponics, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHydroponics ]
 
 - type: entity
   parent: AirlockEngineering
@@ -197,10 +187,9 @@
   suffix: Engineering, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
 
 - type: entity
   parent: AirlockAtmospherics
@@ -208,10 +197,9 @@
   suffix: Atmospherics, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAtmospherics ]
 
 - type: entity
   parent: AirlockCargo
@@ -219,10 +207,9 @@
   suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCargo ]
 
 - type: entity
   parent: AirlockCargo
@@ -230,10 +217,9 @@
   suffix: Salvage, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSalvage ]
 
 - type: entity
   parent: AirlockMining
@@ -241,10 +227,9 @@
   suffix: Mining(Salvage), Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSalvage ]
 
 - type: entity
   parent: AirlockMedical
@@ -252,10 +237,9 @@
   suffix: Medical, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMedical ]
 
 - type: entity
   parent: AirlockMedical
@@ -272,10 +256,9 @@
   suffix: Virology, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMedical ]
 
 - type: entity
   parent: AirlockChemistry
@@ -283,10 +266,9 @@
   suffix: Chemistry, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Chemistry"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChemistry ]
 
 - type: entity
   parent: AirlockScience
@@ -294,10 +276,9 @@
   suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Research"]]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearch ]
 
 - type: entity
   parent: AirlockScience
@@ -305,10 +286,9 @@
   suffix: Medical/Epistemics, Locked # DeltaV - Epistemics Department replacing Science
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Research"], ["Medical"]]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsScience ]
 
 - type: entity
   parent: AirlockCentralCommand
@@ -316,10 +296,9 @@
   suffix: Central Command, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["CentralCommand"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]
 
 - type: entity
   parent: AirlockCommand
@@ -327,10 +306,9 @@
   suffix: Command, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Command"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
 
 - type: entity
   parent: AirlockCommand
@@ -338,10 +316,9 @@
   suffix: Captain, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCaptain ]
 
 - type: entity
   parent: AirlockCommand
@@ -349,10 +326,9 @@
   suffix: ChiefMedicalOfficer, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["ChiefMedicalOfficer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefMedicalOfficer ]
 
 - type: entity
   parent: AirlockCommand
@@ -360,10 +336,9 @@
   suffix: ChiefEngineer, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["ChiefEngineer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefEngineer ]
 
 - type: entity
   parent: AirlockCommand
@@ -371,10 +346,9 @@
   suffix: HeadOfSecurity, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["HeadOfSecurity"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfSecurity ]
 
 - type: entity
   parent: AirlockCommand
@@ -382,10 +356,9 @@
   suffix: ResearchDirector, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["ResearchDirector"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearchDirector ]
 
 - type: entity
   parent: AirlockCommand
@@ -393,10 +366,9 @@
   suffix: HeadOfPersonnel, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["HeadOfPersonnel"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfPersonnel ]
 
 - type: entity
   parent: AirlockCommand
@@ -404,10 +376,9 @@
   suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Quartermaster"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsQuartermaster ]
 
 - type: entity
   parent: AirlockSecurity
@@ -415,10 +386,9 @@
   suffix: Security, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Security"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
 
 - type: entity
   parent: AirlockSecurity
@@ -426,10 +396,9 @@
   suffix: Detective, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Detective"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsDetective ]
 
 #Delta V: Removed Brig Access
 #- type: entity
@@ -437,10 +406,9 @@
 #  id: AirlockBrigLocked
 #  suffix: Brig, Locked
 #  components:
-#  - type: AccessReader
-#    access: [["Brig"]]
-#  - type: Wires
-#    layoutId: AirlockSecurity
+#  - type: ContainerFill
+#    containers:
+#      board: [ DoorElectronicsBrig ]
 
 - type: entity
   parent: AirlockSecurity
@@ -448,10 +416,9 @@
   suffix: Security/Lawyer, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Security"], ["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurityLawyer ]
 
 - type: entity
   parent: AirlockSecurity
@@ -459,8 +426,9 @@
   suffix: Armory, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Armory"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsArmory ]
   - type: Wires
     layoutId: AirlockArmory
 
@@ -470,10 +438,9 @@
   suffix: Vault, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Security", "Command"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsVault ]
 
 - type: entity
   parent: AirlockCommand
@@ -481,10 +448,9 @@
   suffix: EVA, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["External"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 # Glass Airlocks
 - type: entity
@@ -493,32 +459,31 @@
   suffix: Service, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Service"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsService ]
   - type: Wires
     layoutId: AirlockService
 
 - type: entity
-  parent: AirlockGlass
+  parent: AirlockServiceGlassLocked
   id: AirlockLawyerGlassLocked
   suffix: Lawyer, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsLawyer ]
 
 - type: entity
-  parent: AirlockGlass
+  parent: AirlockServiceGlassLocked
   id: AirlockTheatreGlassLocked
   suffix: Theatre, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Theatre"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsTheatre ]
 
 - type: entity
   parent: AirlockGlass
@@ -526,10 +491,9 @@
   suffix: Bar, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Bar"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBar ]
 
 - type: entity
   parent: AirlockExternalGlass
@@ -537,8 +501,9 @@
   suffix: External, Glass, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["External"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockExternalGlass
@@ -546,10 +511,9 @@
   suffix: External, Glass, Logistics, Locked # DeltaV - Logistics Department replacing Cargo
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCargo ]
 
 - type: entity
   parent: AirlockExternalGlass
@@ -557,8 +521,9 @@
   suffix: External, Glass, Syndicate, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]
 
 - type: entity
   parent: AirlockExternalGlass
@@ -566,8 +531,9 @@
   suffix: External, Glass, Nukeop, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]
 
 - type: entity
   parent: AirlockExternalGlass
@@ -575,10 +541,9 @@
   suffix: External, Glass, Engineering, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
 
 - type: entity
   parent: AirlockExternalGlass
@@ -586,43 +551,39 @@
   suffix: External, Glass, Atmospherics, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAtmospherics ]
 
 - type: entity
-  parent: AirlockGlass
+  parent: AirlockServiceGlassLocked
   id: AirlockKitchenGlassLocked
   suffix: Kitchen, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsKitchen ]
 
 - type: entity
-  parent: AirlockGlass
+  parent: AirlockServiceGlassLocked
   id: AirlockJanitorGlassLocked
   suffix: Janitor, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Janitor"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJanitor ]
 
 - type: entity
-  parent: AirlockGlass
+  parent: AirlockServiceGlassLocked
   id: AirlockHydroGlassLocked
   suffix: Hydroponics, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHydroponics ]
 
 - type: entity
   parent: AirlockScienceGlass  # DeltaV - Chapel is in Epistemics
@@ -630,10 +591,9 @@
   suffix: Chapel, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Chapel"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChapel ]
 
 - type: entity
   parent: AirlockEngineeringGlass
@@ -641,10 +601,9 @@
   suffix: Engineering, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
 
 - type: entity
   parent: AirlockAtmosphericsGlass
@@ -652,10 +611,9 @@
   suffix: Atmospherics, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAtmospherics ]
 
 - type: entity
   parent: AirlockCargoGlass
@@ -663,10 +621,9 @@
   suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCargo ]
 
 - type: entity
   parent: AirlockCargoGlass
@@ -674,10 +631,9 @@
   suffix: Salvage, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSalvage ]
 
 - type: entity
   parent: AirlockMiningGlass
@@ -685,10 +641,9 @@
   suffix: Mining(Salvage), Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSalvage ]
 
 - type: entity
   parent: AirlockChemistryGlass
@@ -696,10 +651,9 @@
   suffix: Chemistry, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Chemistry"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChemistry ]
 
 - type: entity
   parent: AirlockMedicalGlass
@@ -707,10 +661,9 @@
   suffix: Medical, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMedical ]
 
 - type: entity
   parent: AirlockMedicalGlass
@@ -727,10 +680,9 @@
   suffix: Virology, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Medical"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMedical ]
 
 - type: entity
   parent: AirlockScienceGlass
@@ -738,10 +690,9 @@
   suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Research"]]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearch ]
 
 - type: entity
   parent: AirlockScienceGlass
@@ -749,10 +700,9 @@
   suffix: Medical/Epistemics, Locked # DeltaV - Epistemics Department replacing Science
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Research"], ["Medical"]]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsScience ]
 
 - type: entity
   parent: AirlockCentralCommandGlass
@@ -760,10 +710,9 @@
   suffix: Central Command, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["CentralCommand"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]
 
 - type: entity
   parent: AirlockCommandGlass
@@ -771,10 +720,9 @@
   suffix: Command, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Command"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
 
 - type: entity
   parent: AirlockCommandGlass
@@ -782,10 +730,9 @@
   suffix: Captain, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCaptain ]
 
 - type: entity
   parent: AirlockCommandGlass
@@ -793,10 +740,9 @@
   suffix: ChiefMedicalOfficer, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["ChiefMedicalOfficer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefMedicalOfficer ]
 
 - type: entity
   parent: AirlockCommandGlass
@@ -804,10 +750,9 @@
   suffix: ChiefEngineer, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["ChiefEngineer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefEngineer ]
 
 - type: entity
   parent: AirlockCommandGlass
@@ -815,10 +760,9 @@
   suffix: HeadOfSecurity, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["HeadOfSecurity"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfSecurity ]
 
 - type: entity
   parent: AirlockCommandGlass
@@ -826,10 +770,9 @@
   suffix: ResearchDirector, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["ResearchDirector"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearchDirector ]
 
 - type: entity
   parent: AirlockCommandGlass
@@ -837,10 +780,9 @@
   suffix: HeadOfPersonnel, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["HeadOfPersonnel"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfPersonnel ]
 
 - type: entity
   parent: AirlockCommandGlass
@@ -848,10 +790,9 @@
   suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Quartermaster"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsQuartermaster ]
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -859,10 +800,9 @@
   suffix: Security, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Security"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -870,20 +810,18 @@
   suffix: Detective, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Detective"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsDetective ]
 
 #- type: entity
 #  parent: AirlockSecurityGlass
 #  id: AirlockBrigGlassLocked
 #  suffix: Brig, Locked
 #  components:
-#  - type: AccessReader
-#    access: [["Brig"]]
-#  - type: Wires
-#    layoutId: AirlockCommand
+#  - type: ContainerFill
+#    containers:
+#      board: [ DoorElectronicsBrig ]
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -891,10 +829,9 @@
   suffix: Security/Lawyer, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Security"], ["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurityLawyer ]
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -902,10 +839,9 @@
   suffix: Armory, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Armory"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsArmory ]
 
 - type: entity
   parent: AirlockCommandGlassLocked
@@ -913,8 +849,9 @@
   suffix: EVA, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["External"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockSyndicateGlass
@@ -922,8 +859,9 @@
   suffix: Syndicate, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]
 
 - type: entity
   parent: AirlockSyndicateGlass
@@ -931,8 +869,9 @@
   suffix: Nukeop, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]
 
 # Maintenance Hatches
 - type: entity
@@ -941,8 +880,9 @@
   suffix: Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Maintenance"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMaintenance ]
 
 - type: entity
   parent: AirlockMaintGlass
@@ -950,8 +890,9 @@
   suffix: Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Maintenance"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMaintenance ]
 
 - type: entity
   parent: AirlockMaint
@@ -959,10 +900,9 @@
   suffix: Salvage, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Salvage"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSalvage ]
 
 - type: entity
   parent: AirlockMaint
@@ -970,10 +910,9 @@
   suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Cargo"]]
-  - type: Wires
-    layoutId: AirlockCargo
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCargo ]
 
 - type: entity
   parent: AirlockMaint
@@ -981,10 +920,9 @@
   suffix: Command, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Command"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
 
 - type: entity
   parent: AirlockMaint
@@ -992,8 +930,9 @@
   suffix: Common, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Maintenance"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMaintenance ]
 
 - type: entity
   parent: AirlockMaint
@@ -1001,10 +940,9 @@
   suffix: Engineering, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Engineering"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
 
 - type: entity
   parent: AirlockMaint
@@ -1012,65 +950,59 @@
   suffix: Atmospherics, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Atmospherics"]]
-  - type: Wires
-    layoutId: AirlockEngineering
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAtmospherics ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
   id: AirlockMaintBarLocked
   suffix: Bar, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Bar"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBar ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
   id: AirlockMaintChapelLocked
   suffix: Chapel, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Chapel"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChapel ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
   id: AirlockMaintHydroLocked
   suffix: Hydroponics, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Hydroponics"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHydroponics ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
   id: AirlockMaintJanitorLocked
   suffix: Janitor, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Janitor"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJanitor ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
   id: AirlockMaintLawyerLocked
   suffix: Lawyer, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Lawyer"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsLawyer ]
 
 - type: entity
   parent: AirlockMaint
@@ -1078,32 +1010,31 @@
   suffix: Service, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Service"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsService ]
   - type: Wires
     layoutId: AirlockService
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
   id: AirlockMaintTheatreLocked
   suffix: Theatre, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Theatre"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsTheatre ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintServiceLocked
   id: AirlockMaintKitchenLocked
   suffix: Kitchen, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Kitchen"]]
-  - type: Wires
-    layoutId: AirlockService
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsKitchen ]
 
 - type: entity
   parent: AirlockMaint
@@ -1111,8 +1042,9 @@
   suffix: Interior, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Maintenance"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMaintenance ]
 
 - type: entity
   parent: AirlockMaint
@@ -1120,21 +1052,21 @@
   suffix: Medical, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Medical"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMedical ]
   - type: Wires
     layoutId: AirlockMedical
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintMedLocked
   id: AirlockMaintChemLocked
   suffix: Chemistry, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Chemistry"]]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChemistry ]
 
 - type: entity
   parent: AirlockMaint
@@ -1142,21 +1074,21 @@
   suffix: Epistemics, Locked # DeltaV - Epistemics Department replacing Science
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Research"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearch ]
   - type: Wires
     layoutId: AirlockScience
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintRnDLocked
   id: AirlockMaintRnDMedLocked
   suffix: Medical/Epistemics, Locked # DeltaV - Epistemics Department replacing Science
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Research"], ["Medical"]]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsRnDMed ]
 
 - type: entity
   parent: AirlockMaint
@@ -1164,87 +1096,90 @@
   suffix: Security, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Security"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
   - type: Wires
     layoutId: AirlockSecurity
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintSecLocked
   id: AirlockMaintDetectiveLocked
   suffix: Detective, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Detective"]]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsDetective ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
   id: AirlockMaintHOPLocked
   suffix: HeadOfPersonnel, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["HeadOfPersonnel"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfPersonnel ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
   id: AirlockMaintCaptainLocked
   suffix: Captain, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Captain"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCaptain ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
   id: AirlockMaintChiefEngineerLocked
   suffix: ChiefEngineer, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["ChiefEngineer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefEngineer ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
   id: AirlockMaintChiefMedicalOfficerLocked
   suffix: ChiefMedicalOfficer, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["ChiefMedicalOfficer"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefMedicalOfficer ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
   id: AirlockMaintHeadOfSecurityLocked
   suffix: HeadOfSecurity, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["HeadOfSecurity"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfSecurity ]
 
 - type: entity
-  parent: AirlockMaint
+  parent: AirlockMaintCommandLocked
   id: AirlockMaintResearchDirectorLocked
   suffix: ResearchDirector, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["ResearchDirector"]]
-  - type: Wires
-    layoutId: AirlockCommand
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsResearchDirector ]
+
+- type: entity
+  parent: AirlockMaintCommandLocked
+  id: AirlockMaintQuartermasterLocked
+  suffix: Quartermaster, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsQuartermaster ]
 
 - type: entity
   parent: AirlockMaint
@@ -1252,10 +1187,11 @@
   suffix: Armory, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Armory"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsArmory ]
   - type: Wires
-    layoutId: AirlockSecurity
+    layoutId: AirlockArmory
 
 - type: entity
   parent: AirlockSyndicate
@@ -1263,8 +1199,9 @@
   suffix: Syndicate, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]
 
 - type: entity
   parent: AirlockSyndicate
@@ -1272,8 +1209,9 @@
   suffix: Nukeop, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]
 
 # Shuttle airlocks
 - type: entity
@@ -1282,8 +1220,9 @@
   suffix: External, Docking, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["External"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockShuttleSyndicate
@@ -1291,8 +1230,9 @@
   suffix: External, Docking, Syndicate, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]
 
 - type: entity
   parent: AirlockShuttleSyndicate
@@ -1300,8 +1240,9 @@
   suffix: External, Docking, Nukeop, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]
 
 - type: entity
   parent: AirlockGlassShuttle
@@ -1309,8 +1250,9 @@
   suffix: External, Glass, Docking, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["External"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockGlassShuttleSyndicate
@@ -1318,8 +1260,9 @@
   noSpawn: true
   suffix: Syndicate, Locked, Glass
   components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]
 
 - type: entity
   parent: AirlockGlassShuttleSyndicate
@@ -1327,8 +1270,9 @@
   suffix: Nukeop, Locked, Glass
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["NuclearOperative"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsNukeop ]
 
 - type: entity
   parent: AirlockGlassShuttle
@@ -1336,10 +1280,11 @@
   suffix: External, Emergency, Glass, Docking, Locked
   noSpawn: true
   components:
-    - type: PriorityDock
-      tag: DockEmergency
-    - type: AccessReader
-      access: [["External"]]
+  - type: PriorityDock
+    tag: DockEmergency
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsExternal ]
 
 - type: entity
   parent: AirlockGlassShuttle
@@ -1347,8 +1292,8 @@
   suffix: External, Arrivals, Glass, Docking
   noSpawn: true
   components:
-    - type: PriorityDock
-      tag: DockArrivals
+  - type: PriorityDock
+    tag: DockArrivals
 
 - type: entity
   parent: AirlockGlassShuttle
@@ -1356,7 +1301,7 @@
   suffix: External, Escape 3x4, Glass, Docking
   noSpawn: true
   components:
-    - type: GridFill
+  - type: GridFill
 
 #HighSecDoors
 - type: entity
@@ -1365,8 +1310,9 @@
   suffix: Central Command, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["CentralCommand"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]
 
 - type: entity
   parent: HighSecDoor
@@ -1374,8 +1320,9 @@
   suffix: Command, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Command"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
 
 - type: entity
   parent: HighSecDoor
@@ -1383,8 +1330,9 @@
   suffix: Captain, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Captain"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCaptain ]
 
 - type: entity
   parent: HighSecDoor
@@ -1392,8 +1340,9 @@
   suffix: Armory, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["Armory"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsArmory ]
 
 #Airtight hatch
 
@@ -1403,6 +1352,6 @@
   suffix: Syndicate, Locked
   noSpawn: true
   components:
-  - type: AccessReader
-    access: [["SyndicateAgent"]]
-
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSyndicateAgent ]
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index 3a2659f8296..c47ae7c2150 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -5,6 +5,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/freezer.rsi
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -15,6 +17,8 @@
     sprite: Structures/Doors/Airlocks/Standard/engineering.rsi
   - type: PaintableAirlock
     department: Engineering
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockEngineering
@@ -33,6 +37,8 @@
     sprite: Structures/Doors/Airlocks/Standard/cargo.rsi
   - type: PaintableAirlock
     department: Logistics
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: Airlock
@@ -43,6 +49,8 @@
     sprite: Structures/Doors/Airlocks/Standard/medical.rsi
   - type: PaintableAirlock
     department: Medical
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedical
@@ -66,6 +74,8 @@
     sprite: Structures/Doors/Airlocks/Standard/science.rsi
   - type: PaintableAirlock
     department: Epistemics
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: Airlock
@@ -78,6 +88,8 @@
     securityLevel: medSecurity
   - type: PaintableAirlock
     department: Command
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: Airlock
@@ -88,6 +100,8 @@
     sprite: Structures/Doors/Airlocks/Standard/security.rsi
   - type: PaintableAirlock
     department: Security
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: Airlock
@@ -112,6 +126,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/mining.rsi
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockCommand # if you get centcom door somehow it counts as command, also inherit panel
@@ -138,48 +154,6 @@
     sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
 
 # Glass
-
-- type: entity
-  id: AirlockGlass
-  parent: Airlock
-  name: glass airlock
-  components:
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        collection: GlassSmack
-  - type: Door
-    occludes: false
-  - type: Occluder
-    enabled: false
-  - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/glass.rsi
-  - type: AnimationPlayer
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
-        density: 100
-        mask:
-        - FullTileMask
-        layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
-        - GlassAirlockLayer
-  - type: LayerChangeOnWeld
-    unWeldedLayer: GlassAirlockLayer
-    weldedLayer: GlassLayer
-  - type: Construction
-    graph: Airlock
-    node: glassAirlock
-  - type: PaintableAirlock
-    group: Glass
-  - type: RadiationBlocker
-    resistance: 2
-  - type: Tag
-    tags:
-      - GlassAirlock
-      # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
 - type: entity
   parent: AirlockGlass
   id: AirlockEngineeringGlass
@@ -189,6 +163,8 @@
     sprite: Structures/Doors/Airlocks/Glass/engineering.rsi
   - type: PaintableAirlock
     department: Engineering
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockGlass
@@ -215,6 +191,8 @@
     sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
   - type: PaintableAirlock
     department: Logistics
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockGlass
@@ -225,6 +203,8 @@
     sprite: Structures/Doors/Airlocks/Glass/medical.rsi
   - type: PaintableAirlock
     department: Medical
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedicalGlass
@@ -248,6 +228,8 @@
     sprite: Structures/Doors/Airlocks/Glass/science.rsi
   - type: PaintableAirlock
     department: Epistemics
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockGlass
@@ -260,6 +242,8 @@
     department: Command
   - type: WiresPanelSecurity
     securityLevel: medSecurity
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockGlass
@@ -270,6 +254,8 @@
     sprite: Structures/Doors/Airlocks/Glass/security.rsi
   - type: PaintableAirlock
     department: Security
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockSecurityGlass # see standard
@@ -294,5 +280,3 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi
-  - type: WiresPanelSecurity
-    securityLevel: medSecurity
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
index fcdb0d2deaf..283c9f22ae5 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
@@ -30,6 +30,10 @@
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index 476e715175e..81db550edcd 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -48,6 +48,8 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronics ]
+  - type: AccessReader
+    containerAccessProvider: board
   - type: Door
     crushDamage:
       types:
@@ -111,6 +113,10 @@
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: StrongMetallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8    
   - type: Destructible
     thresholds:
     - trigger:
@@ -133,7 +139,6 @@
   - type: PaintableAirlock
     group: Standard
     department: Civilian
-  - type: AccessReader
   - type: StaticPrice
     price: 150
   - type: LightningTarget
@@ -146,5 +151,53 @@
   - type: BlockWeather
   placement:
     mode: SnapgridCenter
+ 
+- type: entity
+  id: AirlockRCDResistant
+  parent: Airlock
+  abstract: true
+  components:
+  - type: RCDDeconstructable
+    deconstructable: false
 
-
+- type: entity
+  id: AirlockGlass
+  parent: Airlock
+  name: glass airlock
+  components:
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmack
+  - type: Door
+    occludes: false
+  - type: Occluder
+    enabled: false
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/glass.rsi
+  - type: AnimationPlayer
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
+        density: 100
+        mask:
+        - FullTileMask
+        layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
+        - GlassAirlockLayer
+  - type: LayerChangeOnWeld
+    unWeldedLayer: GlassAirlockLayer
+    weldedLayer: GlassLayer
+  - type: Construction
+    graph: Airlock
+    node: glassAirlock
+  - type: PaintableAirlock
+    group: Glass
+  - type: RadiationBlocker
+    resistance: 2
+  - type: Tag
+    tags:
+      - GlassAirlock
+      # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
index 75b23f70719..293aaac273d 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: Airlock
+  parent: AirlockRCDResistant
   id: AirlockExternal
   suffix: External
   description: It opens, it closes, it might crush you, and there might be only space behind it.
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
index a26226c9578..e9ea05a1c3f 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
@@ -60,6 +60,7 @@
   - type: NavMapDoor
   - type: DoorBolt
   - type: AccessReader
+    containerAccessProvider: board
   - type: Appearance
   - type: WiresVisuals
   - type: ApcPowerReceiver
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 9771f633888..5d6b1088f12 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: Airlock
+  parent: AirlockRCDResistant
   id: AirlockShuttle
   suffix: Docking
   name: external airlock
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index e677ef185be..1ba867773bc 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -19,6 +19,10 @@
     - type: Damageable
       damageContainer: Inorganic
       damageModifierSet: Metallic
+    - type: RCDDeconstructable
+      cost: 4
+      delay: 6
+      fx: EffectRCDDeconstruct6
     - type: Destructible
       thresholds:
       - trigger:
@@ -83,9 +87,6 @@
     - type: Appearance
     - type: WiresVisuals
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-firelock
-      layoutId: Firelock
     - type: UserInterface
       interfaces:
         - key: enum.WiresUiKey.Key
@@ -150,7 +151,7 @@
 
 - type: entity
   id: FirelockEdge
-  parent: BaseFirelock
+  parent: Firelock
   name: firelock
   components:
     - type: Sprite
@@ -180,3 +181,6 @@
       canCollide: false
     - type: StaticPrice
       price: 100
+    - type: Construction
+      graph: Firelock
+      node: FirelockEdge
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
index 8cf75e89e1a..3f4306e4aa1 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
@@ -25,6 +25,10 @@
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
+  - type: RCDDeconstructable
+    cost: 4
+    delay: 6
+    fx: EffectRCDDeconstruct6    
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index e102092be42..9669566fa29 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -43,6 +43,10 @@
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 6
+    fx: EffectRCDDeconstruct6
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
index d6c087af0a5..06e9d2219a5 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
@@ -41,6 +41,10 @@
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -97,6 +101,10 @@
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
index 136f855369d..676bcd04317 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
@@ -4,6 +4,7 @@
   name: blast door
   description: This one says 'BLAST DONGER'.
   components:
+  - type: AccessReader
   - type: Sprite
     sprite: Structures/Doors/Shutters/blastdoor.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door_autolink.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door_autolink.yml
index 399760616c2..3386703ec90 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door_autolink.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door_autolink.yml
@@ -56,6 +56,8 @@
   parent: BlastDoor
   suffix: Autolink, Bridge
   components:
+    - type: AccessReader
+      access: [["Command"]]
     - type: AutoLinkReceiver
       channel: Bridge
 
@@ -64,9 +66,51 @@
   parent: BlastDoorOpen
   suffix: Open, Autolink, Bridge
   components:
+    - type: AccessReader
+      access: [["Command"]]
     - type: AutoLinkReceiver
       channel: Bridge
 
+- type: entity
+  id: BlastDoorEngineering
+  parent: BlastDoor
+  suffix: Autolink, Engineering
+  components:
+  - type: AccessReader
+    access: [["Command"], ["Engineering"]]
+  - type: AutoLinkReceiver
+    channel: Engineering
+
+- type: entity
+  id: BlastDoorEngineeringOpen
+  parent: BlastDoorOpen
+  suffix: Open, Autolink, Engineering
+  components:
+  - type: AccessReader
+    access: [["Command"], ["Engineering"]]
+  - type: AutoLinkReceiver
+    channel: Engineering
+
+- type: entity
+  id: BlastDoorScience
+  parent: BlastDoor
+  suffix: Autolink, Science
+  components:
+  - type: AccessReader
+    access: [["Command"], ["Research"]]
+  - type: AutoLinkReceiver
+    channel: Research
+
+- type: entity
+  id: BlastDoorScienceOpen
+  parent: BlastDoorOpen
+  suffix: Open, Autolink, Science
+  components:
+  - type: AccessReader
+    access: [["Command"], ["Research"]]
+  - type: AutoLinkReceiver
+    channel: Research
+
 - type: entity
   id: BlastDoorWindows
   parent: BlastDoor
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
index 8d9cedac03a..5d47d9c5c4a 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
@@ -26,6 +26,10 @@
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index d03765d4fc9..d58273edcc9 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -66,7 +66,11 @@
     damageContainer: Inorganic
     damageModifierSet: Glass
   - type: ExaminableDamage
-    messages: WindowMessages
+    messages: WindowMessages   
+  - type: RCDDeconstructable
+    cost: 8
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 0b3c291af25..0fb69b4fdbd 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -282,6 +282,7 @@
           MaterialWoodPlank:
             min: 1
             max: 1
+  - type: Construction
     graph: RitualSeat
     node: chairCursed
 
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
index fa029c035ae..2caa4010ca0 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
@@ -53,18 +53,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingUniformRandomArmless
-        prob: 0.05
-        orGroup: dressermainloot
-      - id: ClothingUniformRandomStandart
-        prob: 0.05
-        orGroup: dressermainloot
-      - id: ClothingUniformRandomBra
-        prob: 0.05
-        orGroup: dressermainloot
-      - id: ClothingUniformRandomShorts
-        prob: 0.05
-        orGroup: dressermainloot
       - id: ClothingNeckLGBTPin
         prob: 0.06
         orGroup: dressermainloot
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index a6f14b383cb..f02b1262489 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -2,48 +2,100 @@
   name: toilet
   id: ToiletEmpty
   suffix: Empty
-  parent: SeatBase
+  parent: [ DisposalUnitBase, SeatBase ]
   description: The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean.
   components:
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        path:
-          "/Audio/Weapons/slash.ogg"
-  - type: Anchorable
   - type: Sprite
     sprite: Structures/Furniture/toilet.rsi
-    state: closed_toilet_seat_up
+    layers:
+    - state: condisposal
+      map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
+    - state: disposal
+      map: [ "enum.DisposalUnitVisualLayers.Base" ]
+    - state: disposal-flush
+      map: [ "enum.DisposalUnitVisualLayers.OverlayFlush" ]
+    - state: dispover-charge
+      map: [ "enum.DisposalUnitVisualLayers.OverlayCharging" ]
+    - state: dispover-ready
+      map: [ "enum.DisposalUnitVisualLayers.OverlayReady" ]
+    - state: dispover-full
+      map: [ "enum.DisposalUnitVisualLayers.OverlayFull" ]
+    - state: dispover-handle
+      map: [ "enum.DisposalUnitVisualLayers.OverlayEngaged" ]
+    - map: [ "DoorVisualState.DoorOpen" ]
+    - map: [ "SeatVisualState.SeatUp" ]
+  - type: Rotatable
+  - type: Transform
+    noRot: false
+  - type: Strap
+    whitelist:
+      components:
+      - HumanoidAppearance
+  - type: DisposalUnit
+    autoEngageEnabled: false
+    noUI: true
+    blacklist:
+      components:
+      - HumanoidAppearance
+      - Plunger
+      - SolutionTransfer
+    whitelist:
+      components:
+      - Item
+    soundFlush: /Audio/Effects/Fluids/flush.ogg
+    soundInsert: /Audio/Effects/Fluids/splash.ogg
   - type: Toilet
-  - type: SecretStash
-    secretPartName: secret-stash-part-toilet
   - type: ContainerContainer
     containers:
       stash: !type:ContainerSlot {}
-  - type: SolutionContainerManager
-    solutions:
-      drainBuffer:
-        maxVol: 500
-      toilet:
-        maxVol: 250
-  - type: Transform
-    anchored: true
+      disposals: !type:Container
   - type: Physics
     bodyType: Static
   - type: Construction
     graph: Toilet
     node: toilet
+  - type: PlungerUse
   - type: Appearance
+  - type: SecretStash
+    secretPartName: secret-stash-part-toilet
+    examineStash: toilet-component-on-examine-found-hidden-item
+    openableStash: true
   - type: Drain
     autoDrain: false
-  - type: DumpableSolution
-    solution: drainBuffer
-  - type: SolutionContainerVisuals
-    maxFillLevels: 1
-    fillBaseName: fill-
-    solutionName: drainBuffer
   - type: StaticPrice
     price: 25
+  - type: UserInterface
+    interfaces:
+    - key: enum.DisposalUnitUiKey.Key
+      type: DisposalUnitBoundUserInterface
+  - type: RatKingRummageable
+  - type: SolutionContainerManager
+    solutions:
+      drainBuffer:
+        maxVol: 100
+      tank:
+        maxVol: 500
+  - type: SolutionRegeneration
+    solution: tank
+    generated:
+      reagents:
+      - ReagentId: Water
+        Quantity: 1
+  - type: DrainableSolution
+    solution: tank
+  - type: ReagentTank
+  - type: DumpableSolution
+    solution: drainBuffer
+  - type: GenericVisualizer
+    visuals:
+      enum.ToiletVisuals.SeatVisualState:
+        SeatVisualState.SeatUp:
+          SeatUp: { state: disposal-up }
+          SeatDown: { state: disposal-down }
+      enum.StashVisuals.DoorVisualState:
+        DoorVisualState.DoorOpen:
+          DoorOpen: { state: disposal-open }
+          DoorClosed: { state: disposal-closed }
 
 - type: entity
   id: ToiletDirtyWater
diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
index b8717cf6cc9..f9bf81695e9 100644
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -1,121 +1,118 @@
-- type: entity
-  id: HolosignWetFloor
-  name: wet floor sign
-  description: The words flicker as if they mean nothing.
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-    canCollide: false
-  - type: Sprite
-    sprite: Structures/Holo/wetfloor.rsi
-    state: icon
-  - type: TimedDespawn
-    lifetime: 90
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: Destructible
-    thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 30
-        behaviors:
-          - !type:DoActsBehavior
-            acts: [ "Destruction" ]
-  - type: Tag
-    tags:
-      - NoPaint
-
-- type: entity
-  id: HoloFan
-  parent: HolosignWetFloor
-  name: holofan
-  description: A barrier of hard light that blocks air, but nothing else.
-  components:
-  - type: Sprite
-    sprite: Structures/Holo/holofan.rsi
-    state: icon
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-            bounds: "-0.5,-0.5,0.5,0.5"
-  - type: TimedDespawn
-    lifetime: 180
-  - type: Airtight
-    noAirWhenFullyAirBlocked: false
-
-- type: entity
-  id: HolosignSecurity
-  parent: HolosignWetFloor
-  name: holographic barrier
-  description: A barrier of hard light that blocks movement, but pretty weak.
-  components:
-    - type: Physics
-      bodyType: Static
-      canCollide: true
-    - type: Sprite
-      sprite: Structures/Holo/security.rsi
-      state: icon
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape:
-            !type:PhysShapeAabb
-            bounds: "-0.3,-0.3,0.3,0.3"
-          mask:
-            - TableMask
-          layer:
-            - TableLayer
-    - type: TimedDespawn
-      lifetime: 180
-    - type: PointLight
-      enabled: true
-      radius: 3
-      color: red
-    - type: Climbable
-    - type: Clickable
-
-- type: entity
-  id: HolosignForcefield
-  parent: HolosignWetFloor
-  name: holographic force field
-  description: A powerful temporal containment field that doesn't let anything through, not even a tesla or singularity.
-  components:
-  - type: Physics
-    bodyType: Static
-    canCollide: true
-  - type: Sprite
-    sprite: Structures/Holo/field.rsi
-    state: icon
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
-        mask:
-        - FullTileMask
-        layer:
-        - GlassLayer
-  - type: TimedDespawn
-    lifetime: 180
-  - type: PointLight
-    enabled: true
-    radius: 3
-    color: blue
-  - type: Clickable
-  - type: ContainmentField
-    throwForce: 0
-  - type: Destructible
-    thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 60
-        behaviors:
-          - !type:DoActsBehavior
-            acts: [ "Destruction" ]
\ No newline at end of file
+- type: entity
+  id: HolosignWetFloor
+  name: wet floor sign
+  description: The words flicker as if they mean nothing.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+    canCollide: false
+  - type: Sprite
+    sprite: Structures/Holo/wetfloor.rsi
+    state: icon
+  - type: TimedDespawn
+    lifetime: 90
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 30
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+
+- type: entity
+  id: HoloFan
+  parent: HolosignWetFloor
+  name: holofan
+  description: A barrier of hard light that blocks air, but nothing else.
+  components:
+  - type: Sprite
+    sprite: Structures/Holo/holofan.rsi
+    state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+            bounds: "-0.5,-0.5,0.5,0.5"
+  - type: TimedDespawn
+    lifetime: 180
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+
+- type: entity
+  id: HolosignSecurity
+  parent: HolosignWetFloor
+  name: holographic barrier
+  description: A barrier of hard light that blocks movement, but pretty weak.
+  components:
+    - type: Physics
+      bodyType: Static
+      canCollide: true
+    - type: Sprite
+      sprite: Structures/Holo/security.rsi
+      state: icon
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.3,-0.3,0.3,0.3"
+          mask:
+            - TableMask
+          layer:
+            - TableLayer
+    - type: TimedDespawn
+      lifetime: 180
+    - type: PointLight
+      enabled: true
+      radius: 3
+      color: red
+    - type: Climbable
+    - type: Clickable
+
+- type: entity
+  id: HolosignForcefield
+  parent: HolosignWetFloor
+  name: holographic force field
+  description: A powerful temporal containment field that doesn't let anything through, not even a tesla or singularity.
+  components:
+  - type: Physics
+    bodyType: Static
+    canCollide: true
+  - type: Sprite
+    sprite: Structures/Holo/field.rsi
+    state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+  - type: TimedDespawn
+    lifetime: 180
+  - type: PointLight
+    enabled: true
+    radius: 3
+    color: blue
+  - type: Clickable
+  - type: ContainmentField
+    throwForce: 0
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 60
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index 59def55d952..22bbdb7b9f9 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -40,6 +40,10 @@
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
+  - type: RCDDeconstructable
+    cost: 4
+    delay: 2
+    fx: EffectRCDDeconstruct2  
   - type: Destructible
     thresholds:
     - trigger:
@@ -70,7 +74,7 @@
     mode: SnapgridCenter
     snap:
     - Wallmount
-
+    
 - type: entity
   name: light
   description: "A light fixture. Draws power and produces light when equipped with a light tube."
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
new file mode 100644
index 00000000000..8eceb76b639
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
@@ -0,0 +1,148 @@
+- type: entity
+  id: AlwaysPoweredStrobeLight
+  name: strobe
+  description: "UH?! Sorry, all I can hear is WEE-OOO-WEE-OOO!"
+  suffix: Always powered
+  components:
+  - type: AmbientSound
+    volume: -15
+    range: 2
+    sound:
+      path: /Audio/Ambience/Objects/light_hum.ogg
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmash
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Construction
+    graph: LightFixture
+    node: bulbLight
+  - type: Sprite
+    sprite: Structures/Wallmounts/Lighting/strobe_light.rsi
+    drawdepth: WallMountedItems
+    layers:
+    - map: ["enum.PoweredLightLayers.Base"]
+      state: base
+    - map: ["enum.PoweredLightLayers.Glow"]
+      state: glow
+      shader: unshaded
+    state: base
+  - type: PointLight
+    mask: /Textures/Effects/LightMasks/double_cone.png
+    color: "#FFE4CE"
+    energy: 5
+    radius: 10
+    softness: 1
+    offset: "0, 0.35"
+  - type: RotatingLight
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors: #excess damage, don't spawn entities.
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 25
+      behaviors:
+      - !type:EmptyAllContainersBehaviour
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wallmount
+
+- type: entity
+  name: strobe
+  description: "UH?! Sorry, all I can hear is WEE-OOO-WEE-OOO!"
+  id: PoweredStrobeLightEmpty
+  suffix: Empty
+  parent: AlwaysPoweredStrobeLight
+  components:
+  - type: Sprite
+    sprite: Structures/Wallmounts/Lighting/strobe_light.rsi
+    state: empty
+  - type: AmbientSound
+    enabled: false
+  - type: PointLight
+    enabled: false
+    offset: "0, 0.35"
+  - type: ContainerContainer
+    containers:
+      light_bulb: !type:ContainerSlot
+  - type: PoweredLight
+    bulb: Bulb
+    on: false
+    damage:
+      types:
+        Heat: 5
+  - type: ApcPowerReceiver
+  - type: ExtensionCableReceiver
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: SmartLight
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: Appearance
+  - type: PoweredLightVisuals
+    spriteStateMap:
+      empty: empty
+      broken: broken
+      burned: broken
+      off: base
+      on: base
+  - type: DeviceLinkSink
+    ports:
+      - On
+      - Off
+      - Toggle
+  - type: Construction
+    graph: LightFixture
+    node: strobeLight
+
+- type: entity
+  id: PoweredStrobeLightPolice
+  suffix: "Empty, police"
+  parent: PoweredStrobeLightEmpty
+  components:
+  - type: AmbientSound
+    volume: 0
+    range: 10
+    sound:
+      path: "/Audio/Effects/Lightning/strobe.ogg"
+
+- type: entity
+  id: PoweredStrobeLightSiren
+  suffix: "Empty, siren"
+  parent: PoweredStrobeLightEmpty
+  components:
+  - type: AmbientSound
+    volume: 0
+    range: 10
+    sound:
+      path: "/Audio/Misc/siren.ogg"
+
+- type: entity
+  id: PoweredStrobeLightEpsilon
+  suffix: "Empty, epsilon"
+  parent: PoweredStrobeLightEmpty
+  components:
+  - type: AmbientSound
+    volume: 0
+    range: 10
+    sound:
+      path: "/Audio/Effects/Lightning/strobeepsilon.ogg"
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index b75893d1643..98f4a9afb0c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -7,34 +7,70 @@
   components:
   - type: ApcPowerReceiver
     powerLoad: 350
-    priority: Low
   - type: ExtensionCableReceiver
   - type: PointLight
-    radius: 1.5
+    radius: 1.8
     energy: 1.6
     color: "#3db83b"
+  - type: LitOnPowered
   - type: Sprite
     sprite: Structures/Machines/arcade.rsi
     layers:
     - map: ["computerLayerBody"]
       state: arcade
     - map: ["computerLayerScreen"]
-      state: invaders
+      state: screen_invaders
+    - map: ["enum.WiresVisualLayers.MaintenancePanel"]
+      state: panel
+      visible: false
   - type: Icon
     sprite: Structures/Machines/arcade.rsi
     state: arcade
+  - type: WiresPanel
+  - type: Wires
+    layoutId: Arcade
+    boardName: wires-board-name-arcade
+  - type: WiresVisuals
+  - type: TypingIndicator
+    proto: robot
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: Vending
   - type: Anchorable
   - type: Pullable
   - type: StaticPrice
     price: 300
+  - type: SpamEmitSoundRequirePower
+  - type: SpamEmitSound
+    minInterval: 30
+    maxInterval: 90
+    sound:
+      collection: ArcadeNoise
+      params:
+        volume: -8
+        maxDistance: 10
+        variation: 0.05
 
 - type: entity
   id: SpaceVillainArcade
   name: space villain arcade
   parent: ArcadeBase
   components:
+  - type: Sprite
+    sprite: Structures/Machines/arcade.rsi
+    layers:
+    - map: ["computerLayerBody"]
+      state: arcade
+    - map: ["computerLayerScreen"]
+      state: screen_spacevillain
+    - map: ["enum.WiresVisualLayers.MaintenancePanel"]
+      state: panel
+      visible: false
+  - type: PointLight
+    color: "#e3a136"
   - type: SpaceVillainArcade
-    rewardAmount: 0
+    rewardMinAmount: 0
+    rewardMaxAmount: 0
     possibleRewards:
     - ToyMouse
     - ToyAi
@@ -110,6 +146,12 @@
         type: WiresBoundUserInterface
   - type: Computer
     board: SpaceVillainArcadeComputerCircuitboard
+  - type: Advertise
+    pack: SpaceVillainAds
+    minimumWait: 60 # Arcades are noisy
+    maximumWait: 240
+  - type: SpeakOnUIClosed
+    pack: SpaceVillainGoodbyes
 
 - type: entity
   id: SpaceVillainArcadeFilled
@@ -132,15 +174,14 @@
     - map: ["computerLayerBody"]
       state: arcade
     - map: ["computerLayerScreen"]
-      state: blockgame
+      state: screen_blockgame
+    - map: ["enum.WiresVisualLayers.MaintenancePanel"]
+      state: panel
+      visible: false
   - type: BlockGameArcade
   - type: ActivatableUI
     key: enum.BlockGameUiKey.Key
   - type: ActivatableUIRequiresPower
-  - type: WiresPanel
-  - type: Wires
-    layoutId: Arcade
-    boardName: wires-board-name-arcade
   - type: UserInterface
     interfaces:
       - key: enum.BlockGameUiKey.Key
@@ -149,3 +190,9 @@
         type: WiresBoundUserInterface
   - type: Computer
     board: BlockGameArcadeComputerCircuitboard
+  - type: Advertise
+    pack: BlockGameAds
+    minimumWait: 60 # Arcades are noisy
+    maximumWait: 240
+  - type: SpeakOnUIClosed
+    pack: BlockGameGoodbyes
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index b9e75d9df86..4fd2129f7a5 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -63,6 +63,22 @@
     color: "#43ccb5"
   - type: Rotatable
     rotateWhileAnchored: true
+  - type: ItemSlots
+    slots:
+      disk_slot:
+        name: Disk
+        insertSound:
+          path: /Audio/Machines/terminal_insert_disc.ogg
+        ejectSound:
+          path: /Audio/Machines/terminal_insert_disc.ogg
+        whitelist:
+          components:
+          - ShuttleDestinationCoordinates
+  - type: ContainerContainer
+    containers:
+      board: !type:Container
+        ents: []
+      disk_slot: !type:ContainerSlot {}
 
 - type: entity
   parent: BaseComputerShuttle
@@ -406,7 +422,6 @@
       type: ResearchClientBoundUserInterface
   - type: ApcPowerReceiver
     powerLoad: 1000
-    priority: Low
   - type: Computer
     board: ResearchComputerCircuitboard
   - type: AccessReader
@@ -455,7 +470,6 @@
       type: ResearchClientBoundUserInterface
   - type: ApcPowerReceiver
     powerLoad: 1000
-    priority: Low
   - type: Computer
     board: AnalysisComputerCircuitboard
   - type: PointLight
@@ -777,6 +791,8 @@
     radius: 1.5
     energy: 1.6
     color: "#b89f25"
+  - type: AccessReader
+    access: [["Quartermaster"]]
   - type: GuideHelp
     guides:
     - CargoBounties
@@ -939,7 +955,6 @@
     speechVerb: Robotic
   - type: SurveillanceCameraSpeaker
   - type: SurveillanceCameraMonitor
-    speechEnabled: true
   - type: ActivatableUI
     key: enum.SurveillanceCameraMonitorUiKey.Key
   - type: ActivatableUIRequiresVision
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
index 7b1e89bcc10..65eaf04d78f 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
@@ -29,8 +29,6 @@
           components:
           - FitsInDispenser
   - type: Machine
-  - type: Wires
-    layoutId: chem
   - type: WiresPanel
   - type: WiresVisuals
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
index cc9f8035fe7..ab09a03fef7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
@@ -37,9 +37,6 @@
     color: "#fca3c0"
   - type: Appearance
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-vessel
-    layoutId: Vessel
   - type: AmbientSound
     enabled: false
     range: 3
@@ -160,6 +157,7 @@
     board: APECircuitboard
   - type: Lock
     locked: false
+  - type: LockedWiresPanel
   - type: AccessReader
     access: [[ "Research" ]]
   - type: Emitter
@@ -171,10 +169,12 @@
     - AnomalousParticleDelta
     - AnomalousParticleEpsilon
     - AnomalousParticleZeta
+    - AnomalousParticleSigma
     setTypePorts:
       SetParticleDelta: AnomalousParticleDelta
       SetParticleEpsilon: AnomalousParticleEpsilon
       SetParticleZeta: AnomalousParticleZeta
+      SetParticleSigma: AnomalousParticleSigma
     fireBurstSize: 1
     fireBurstDelayMin: 2
     fireBurstDelayMax: 6
@@ -184,6 +184,7 @@
     guides:
     - APE
   - type: Gun
+    projectileSpeed: 4
     fireRate: 10 #just has to be fast enough to keep up with upgrades
     showExamineText: false
     selectedMode: SemiAuto
@@ -194,9 +195,6 @@
   - type: Appearance
   - type: WiresPanel
   - type: WiresVisuals
-  - type: Wires
-    boardName: wires-board-name-ape
-    layoutId: Ape
   - type: GenericVisualizer
     visuals:
       enum.PowerDeviceVisuals.Powered:
@@ -204,6 +202,7 @@
           True: { visible: true }
           False: { visible: false }
   - type: LockVisuals
+  - type: LockedAnchorable
   - type: DeviceNetwork
     deviceNetId: Wireless
     receiveFrequencyId: BasicDevice
@@ -217,6 +216,7 @@
       - SetParticleDelta
       - SetParticleEpsilon
       - SetParticleZeta
+      - SetParticleSigma
 
 - type: entity
   id: MachineAnomalyGenerator
@@ -284,9 +284,6 @@
     fuelCost: 10
     doAfterDelay: 5
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-anomalygenerator
-    layoutId: AnomalyGenerator
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
index e6b4f77fa8b..18999a6ab2a 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
@@ -144,9 +144,6 @@
         Blunt: 10
   - type: Machine
     board: ArtifactCrusherMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-crusher
-    layoutId: Crusher
   - type: WiresPanel
   - type: Sprite
     sprite: Structures/Machines/artifact_crusher.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index d7df219663e..aee12460214 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -63,9 +63,6 @@
           False: { visible: false }
   # Machine / Construction stuff
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-chemmaster
-    layoutId: chem_master
   - type: Machine
     board: ChemMasterMachineCircuitboard
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
index 5d9ab0dd7e4..0451b394909 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -52,9 +52,6 @@
     materialWhiteList:
     - Biomass
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-cloningpod
-    layoutId: CloningPod
   - type: ApcPowerReceiver
     powerLoad: 200 #Receives most of its power from the console
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
index 72027d2243e..0f8286af862 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
@@ -23,7 +23,6 @@
         machine_parts: !type:Container
     - type: CrewMonitoringServer
     - type: SingletonDeviceNetServer
-      ServerType: CrewMonitoringServer
     - type: DeviceNetwork
       deviceNetId: Wireless
       transmitFrequencyId: CrewMonitor
@@ -34,7 +33,6 @@
     - type: StationLimitedNetwork
     - type: ApcPowerReceiver
       powerLoad: 200
-      priority: Low
     - type: ExtensionCableReceiver
     - type: Destructible
       thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
index 9f09e49059c..fc417e68d6c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
@@ -98,9 +98,6 @@
   - type: Machine
     board: FatExtractorMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-fatextractor
-    layoutId: FatExtractor
   - type: Appearance
   - type: Speech
     speechVerb: Robotic
diff --git a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
index 54a32db69f5..3244789a028 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
@@ -52,9 +52,6 @@
       path: /Audio/Items/rped.ogg
   - type: WiresPanel
   - type: WiresVisuals
-  - type: Wires
-    boardName: wires-board-name-flatpacker
-    layoutId: Flatpacker
   - type: Appearance
   - type: ActivatableUI
     key: enum.FlatpackCreatorUIKey.Key
diff --git a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
index 2eb4f57fab5..618538dccb7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
@@ -55,7 +55,7 @@
     activePower: 2500
     lightRadiusMin: 0.75
     lightRadiusMax: 2.5
-    spritemap:
+    spriteMap:
       broken: "broken"
       unpowered: "off"
       off: "off"
@@ -120,9 +120,6 @@
             min: 1
             max: 1
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-minigravitygenerator
-    layoutId: MiniGravityGenerator
   - type: Machine
     board: MiniGravityGeneratorCircuitboard
   - type: ApcPowerReceiver
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 2a10abf3b34..2f4ecae7645 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -33,9 +33,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-autolathe
-    layoutId: Autolathe
   - type: ActivatableUI
     key: enum.LatheUiKey.Key
   - type: ActivatableUIRequiresPower
@@ -157,6 +154,7 @@
       - APCElectronics
       - SMESMachineCircuitboard
       - SubstationMachineCircuitboard
+      - WallmountSubstationElectronics
       - CellRechargerCircuitboard
       - BorgChargerCircuitboard
       - WeaponCapacitorRechargerCircuitboard
@@ -261,9 +259,6 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Machine
     board: ProtolatheMachineCircuitboard
-  - type: Wires
-    boardName: wires-board-name-protolathe
-    layoutId: Protolathe
   - type: MaterialStorage
     whitelist:
       tags:
@@ -499,6 +494,7 @@
       - ArtifactCrusherMachineCircuitboard
       - TelecomServerCircuitboard
       - MassMediaCircuitboard
+      - ReagentGrinderIndustrialMachineCircuitboard
     # Begin Nyano additions
       - ReverseEngineeringMachineCircuitboard
       - CrewMonitoringComputerCircuitboard
@@ -742,6 +738,7 @@
       - ShellShotgunPractice
       - WeaponLaserCarbinePractice
       - WeaponDisablerPractice
+      - ShockCollar
       # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab
       - MagazineBoxSpecial
       - MagazineBoxSpecialPractice
diff --git a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
index 6b082845bd0..a4d5a2fbf18 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
@@ -61,9 +61,6 @@
   - type: Machine
     board: MaterialReclaimerMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-reclaimer
-    layoutId: Reclaimer
   - type: MaterialReclaimer
     whitelist:
       components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
index 6f05baee944..de19db96b52 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -69,9 +69,6 @@
   - type: Machine
     board: MedicalScannerMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-medicalscanner
-    layoutId: MedicalScanner
   - type: Appearance
   - type: Climbable
   - type: ApcPowerReceiver
diff --git a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
similarity index 95%
rename from Resources/Prototypes/Entities/Objects/Devices/nuke.yml
rename to Resources/Prototypes/Entities/Structures/Machines/nuke.yml
index 811210d429e..f37c42e4745 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseStructure
+  parent: [BaseStructure, StructureWheeled]
   id: NuclearBomb
   name: nuclear fission explosive
   description: You probably shouldn't stick around to see if this is armed.
@@ -49,7 +49,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.45
-        density: 80 #It has wheels and bluespace tech to make it lighter.
+        density: 255 # Has "bluespace technology" to make it lighter, whatever that means. Don't mind the fact that this is lighter then a high capacity fuel tank.
         mask:
         - MachineMask
         layer:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
index 12fec44e4f4..80bfb465fff 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -56,3 +56,49 @@
       inputContainer: !type:Container
       machine_board: !type:Container
       machine_parts: !type:Container
+
+- type: entity
+  parent: Recycler #too different so different parent
+  id: ReagentGrinderIndustrial
+  name: industrial reagent grinder
+  description: An industrial reagent grinder.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      output:
+        maxVol: 400 #*slaps roof of machine* This baby can fit so much omnizine in it
+  - type: MaterialReclaimer
+    whitelist:
+      components:
+      - Extractable #same as reagent grinder
+    blacklist:
+      tags:
+      - HighRiskItem #ian meat
+    efficiency: 0.9
+  - type: Sprite
+    sprite: Structures/Machines/recycling.rsi
+    layers:
+      - state: grinder-b0
+  - type: Machine
+    board: ReagentGrinderIndustrialMachineCircuitboard
+  - type: GenericVisualizer
+    visuals:
+      enum.ConveyorVisuals.State:
+        enum.RecyclerVisualLayers.Main:
+          Forward: { state: grinder-b1 }
+          Reverse: { state: grinder-b1 }
+          Off: { state: grinder-b0 }
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container
+      machine_parts: !type:Container
+  - type: Construction
+    graph: Machine
+    node: machine
+    containers:
+    - machine_parts
+    - machine_board
+  - type: DrainableSolution
+    solution: output
+  - type: ExaminableSolution
+    solution: output
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
index 814852125a0..138795cbf13 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
@@ -116,4 +116,4 @@
     interactSuccessString: petting-success-recycler
     interactFailureString: petting-failure-generic
     interactSuccessSound:
-      path: /Audio/Items/drill_hit.ogg
+      path: /Audio/Items/drill_hit.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml
index 7b369f62cc9..948b3f84b26 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/research.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml
@@ -20,11 +20,8 @@
     - CivilianServices
   - type: ApcPowerReceiver
     powerLoad: 200
-    priority: Low
   - type: ExtensionCableReceiver
   - type: WiresPanel
-  - type: Wires
-    layoutId: rndserver
   - type: WiresVisuals
   - type: Machine
     board: ResearchAndDevelopmentServerMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml
index 2bf3ce082d8..859dc85ff1d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml
@@ -52,7 +52,6 @@
   description: Locates salvage.
   components:
   - type: SalvageMagnet
-    offsetRadiusMax: 32
   - type: ApcPowerReceiver
     powerLoad: 1000
 
diff --git a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
index c523e7d68d3..ba9d7be88b0 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
@@ -5,7 +5,6 @@
   description: A bed that massively slows down the patient's metabolism and prevents bodily decay, allowing more time to administer a proper treatment for stabilization.
   components:
   - type: StasisBed
-    baseMultiplier: 10
   - type: AntiRotOnBuckle
   - type: HealOnBuckle
     damage:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
index bc5490b08b4..80938fbb5ed 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
@@ -51,9 +51,6 @@
   - type: Machine
     board: TelecomServerCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-telecomserver
-    layoutId: TelecomServer
   - type: Transform
     anchored: true
   - type: Pullable
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 380f7e012d1..fcc6e4974c1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -29,7 +29,7 @@
         - MachineMask
         layer:
         - MachineLayer
-        density: 200
+        density: 1000
   - type: Destructible
     thresholds:
     - trigger:
@@ -96,7 +96,6 @@
   - type: LitOnPowered
   - type: ApcPowerReceiver
     powerLoad: 200
-    priority: Low
   - type: Actions
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-mechanical
@@ -104,13 +103,15 @@
     price: 100
   - type: Appearance
   - type: WiresVisuals
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - RobotTalk
     understands:
     - GalacticCommon
     - RobotTalk
+  - type: VendingMachine
+    soundVend: /Audio/SimpleStation14/Machines/machine_vend.ogg
 
 - type: entity
   parent: VendingMachine
@@ -140,6 +141,8 @@
         density: 190
   - type: Advertise
     pack: CondimentVendAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Speech
   - type: Transform
     noRot: false
@@ -157,6 +160,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: AmmoVendAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Speech
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/ammo.rsi
@@ -184,6 +189,8 @@
     loopDeny: false
   - type: Advertise
     pack: BoozeOMatAds
+  - type: SpeakOnUIClosed
+    pack: BoozeOMatGoodbyes
   - type: Speech
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/boozeomat.rsi
@@ -253,6 +260,8 @@
     ejectState: eject-unshaded
   - type: Advertise
     pack: ChefvendAds
+  - type: SpeakOnUIClosed
+    pack: ChefvendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/chefvend.rsi
     layers:
@@ -289,6 +298,8 @@
     denyState: deny-unshaded
   - type: Advertise
     pack: CigaretteMachineAds
+  - type: SpeakOnUIClosed
+    pack: CigaretteMachineGoodbyes
   - type: Speech
   - type: Sprite
     noRot: true
@@ -321,6 +332,8 @@
     denyState: deny-unshaded
   - type: Advertise
     pack: ClothesMateAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Speech
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/clothing.rsi
@@ -353,6 +366,8 @@
     denyState: deny-unshaded
   - type: Advertise
     pack: ClothesMateAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Speech
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/winterdrobe.rsi
@@ -392,6 +407,8 @@
     initialStockQuality: 0.33
   - type: Advertise
     pack: HotDrinksMachineAds
+  - type: SpeakOnUIClosed
+    pack: HotDrinksMachineGoodbyes
   - type: Speech
   - type: Sprite
     noRot: true
@@ -438,6 +455,8 @@
     initialStockQuality: 0.33
   - type: Advertise
     pack: RobustSoftdrinksAds
+  - type: SpeakOnUIClosed
+    pack: RobustSoftdrinksGoodbyes
   - type: Speech
   - type: Sprite
     noRot: true
@@ -653,6 +672,8 @@
     initialStockQuality: 0.33
   - type: Advertise
     pack: RobustSoftdrinksAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Speech
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/pwrgame.rsi
@@ -690,6 +711,8 @@
     initialStockQuality: 0.33
   - type: Advertise
     pack: RobustSoftdrinksAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Speech
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/gib.rsi
@@ -723,6 +746,8 @@
     denyState: deny-unshaded
   - type: Advertise
     pack: DinnerwareAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     noRot: true
     sprite: Structures/Machines/VendingMachines/dinnerware.rsi
@@ -763,6 +788,8 @@
     ejectState: eject-unshaded
   - type: Advertise
     pack: MagiVendAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     noRot: true
     sprite: Structures/Machines/VendingMachines/magivend.rsi
@@ -802,6 +829,8 @@
     initialStockQuality: 0.33
   - type: Advertise
     pack: DiscountDansAds
+  - type: SpeakOnUIClosed
+    pack: DiscountDansGoodbyes
   - type: Speech
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/discount.rsi
@@ -874,6 +903,8 @@
     ejectDelay: 0.6
   - type: Advertise
     pack: NanoMedAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/medivend.rsi
     noRot: true
@@ -917,6 +948,8 @@
     denyState: deny-unshaded
   - type: Advertise
     pack: NutriMaxAds
+  - type: SpeakOnUIClosed
+    pack: NutriMaxGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/nutri_green.rsi
     layers:
@@ -951,6 +984,8 @@
     denyState: deny-unshaded
   - type: Advertise
     pack: SecTechAds
+  - type: SpeakOnUIClosed
+    pack: SecTechGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/security.rsi
     noRot: true
@@ -995,6 +1030,8 @@
     denyState: deny-unshaded
   - type: Advertise
     pack: MegaSeedAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/seeds_green.rsi
     layers:
@@ -1038,6 +1075,8 @@
     initialStockQuality: 0.33
   - type: Advertise
     pack: GetmoreChocolateCorpAds
+  - type: SpeakOnUIClosed
+    pack: GetmoreChocolateCorpGoodbyes
   - type: Speech
   - type: Sprite
     noRot: true
@@ -1200,6 +1239,8 @@
     initialStockQuality: 0.33
   - type: Advertise
     pack: BodaAds
+  - type: SpeakOnUIClosed
+    pack: BodaGoodbyes
   - type: Speech
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/sodasoviet.rsi
@@ -1240,6 +1281,8 @@
     screenState: screen
   - type: Advertise
     pack: AutoDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Speech
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/theater.rsi
@@ -1282,6 +1325,8 @@
     denyState: deny-unshaded
   - type: Advertise
     pack: VendomatAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Speech
   - type: Sprite
     noRot: true
@@ -1321,6 +1366,8 @@
     denyState: deny-unshaded
   - type: Advertise
     pack: VendomatAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Speech
   - type: Sprite
     noRot: true
@@ -1401,6 +1448,8 @@
     ejectDelay: 1.8
   - type: Advertise
     pack: GoodCleanFunAds
+  - type: SpeakOnUIClosed
+    pack: GoodCleanFunGoodbyes
   - type: Sprite
     noRot: true
     sprite: Structures/Machines/VendingMachines/games.rsi
@@ -1442,6 +1491,8 @@
     initialStockQuality: 0.33
   - type: Advertise
     pack: ChangAds
+  - type: SpeakOnUIClosed
+    pack: ChangGoodbyes
   - type: Speech
   - type: Sprite
     noRot: true
@@ -1516,6 +1567,8 @@
     initialStockQuality: 0.33
   - type: Advertise
     pack: DonutAds
+  - type: SpeakOnUIClosed
+    pack: DonutGoodbyes
   - type: Speech
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/donut.rsi
@@ -1546,9 +1599,6 @@
     snap:
     - Wallmount
   components:
-  - type: Physics
-    canCollide: false
-  - type: Fixtures
   - type: Sprite
     drawdepth: WallMountedItems
     snapCardinals: false
@@ -1616,6 +1666,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: HyDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/hydrobe.rsi
     layers:
@@ -1642,6 +1694,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: LawDrobeAds
+  - type: SpeakOnUIClosed
+    pack: LawDrobeGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/lawdrobe.rsi
     layers:
@@ -1668,6 +1722,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: SecDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/secdrobe.rsi
     layers:
@@ -1694,6 +1750,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: BarDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/bardrobe.rsi
     layers:
@@ -1750,6 +1808,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: CargoDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/cargodrobe.rsi
     layers:
@@ -1776,6 +1836,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: MediDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/medidrobe.rsi
     layers:
@@ -1802,6 +1864,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: ChemDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/chemdrobe.rsi
     layers:
@@ -1828,6 +1892,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: CuraDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/curadrobe.rsi
     layers:
@@ -1854,6 +1920,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: AtmosDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/atmosdrobe.rsi
     layers:
@@ -1880,6 +1948,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: EngiDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/engidrobe.rsi
     layers:
@@ -1906,6 +1976,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: ChefDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/chefdrobe.rsi
     layers:
@@ -1932,6 +2004,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: DetDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/detdrobe.rsi
     layers:
@@ -1960,6 +2034,8 @@
     ejectState: eject-unshaded
   - type: Advertise
     pack: JaniDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/lavatory.rsi
     layers:
@@ -1992,6 +2068,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: SciDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/scidrobe.rsi
     layers:
@@ -2018,6 +2096,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: SyndieDrobeAds
+  - type: SpeakOnUIClosed
+    pack: SyndieDrobeGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/syndiedrobe.rsi
     layers:
@@ -2044,6 +2124,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: RoboDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/robodrobe.rsi
     layers:
@@ -2070,6 +2152,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: GeneDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/genedrobe.rsi
     layers:
@@ -2096,6 +2180,8 @@
     normalState: normal-unshaded
   - type: Advertise
     pack: ViroDrobeAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/virodrobe.rsi
     layers:
@@ -2174,6 +2260,8 @@
     autoRot: true
   - type: Advertise
     pack: HappyHonkAds
+  - type: SpeakOnUIClosed
+    pack: HappyHonkGoodbyes
   - type: AccessReader
     access: [["Kitchen"], ["Theatre"]]
 
@@ -2281,6 +2369,8 @@
     screenState: screen
   - type: Advertise
     pack: FitnessVendAds
+  - type: SpeakOnUIClosed
+    pack: FitnessVendGoodbyes
   - type: Transform
     noRot: false
   - type: Rotatable
@@ -2323,6 +2413,8 @@
     rotateWhilePulling: true
   - type: Advertise
     pack: HotfoodAds
+  - type: SpeakOnUIClosed
+    pack: HotfoodGoodbyes
   - type: PointLight
     radius: 2
     energy: 1.6
@@ -2356,6 +2448,8 @@
     denyState: deny-unshaded
   - type: Advertise
     pack: SolsnackAds
+  - type: SpeakOnUIClosed
+    pack: SolsnackGoodbyes
   - type: Transform
     noRot: false
   - type: Rotatable
@@ -2395,6 +2489,8 @@
     ejectState: eject-unshaded
   - type: Advertise
     pack: WeebVendAds
+  - type: SpeakOnUIClosed
+    pack: WeebVendGoodbyes
   - type: Transform
     noRot: false
   - type: Rotatable
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
index 7f994b237ac..6758c413280 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: PortableScrubber
-  parent: [BaseMachinePowered, SmallConstructibleMachine]
+  parent: [BaseMachinePowered, SmallConstructibleMachine, StructureWheeled]
   name: portable scrubber
   description: It scrubs, portably!
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
index a6f831e1a52..d0f239b338b 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
@@ -64,9 +64,6 @@
     - type: Construction
       graph: GasTrinary
       node: filter
-      conditions:
-        - !type:TileNotBlocked
-        - !type:NoUnstackableInTile
     - type: AmbientSound
       enabled: false
       volume: -9
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index 6858f0433de..bf475d5e068 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -209,7 +209,7 @@
       visuals:
        # toggle color of the unshaded light:
        enum.OutletInjectorVisuals.Enabled:
-         unshaded:
+         enum.LightLayers.Unshaded:
            True: { color: "#5eff5e" }
            False: { color: "#990000" }
     - type: Appearance
@@ -248,9 +248,6 @@
       inHandsOnly: false
       key: enum.ThermomachineUiKey.Key
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-thermomachine
-      layoutId: Thermomachine
     - type: WiresVisuals
     - type: NodeContainer
       nodes:
@@ -310,7 +307,6 @@
   suffix: Enabled
   components:
   - type: GasThermoMachine
-    enabled: true
   - type: ApcPowerReceiver
     powerDisabled: false
 
@@ -355,7 +351,6 @@
   suffix: Enabled
   components:
   - type: GasThermoMachine
-    enabled: true
   - type: ApcPowerReceiver
     powerDisabled: false
 
@@ -433,9 +428,6 @@
   - type: Machine
     board: CondenserMachineCircuitBoard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-condenser
-    layoutId: Condenser
   - type: WiresVisuals
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index a9ea8261371..75ec98c402a 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -10,7 +10,6 @@
   components:
   - type: Sprite
     sprite: Structures/Piping/disposal.rsi
-    snapCardinals: true
     layers:
     - state: condisposal
       map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
@@ -19,7 +18,7 @@
     - state: disposal-charging
       map: [ "enum.DisposalUnitVisualLayers.BaseCharging" ]
     - state: disposal-flush
-      map: [ "enum.DisposalUnitVisualLayers.BaseFlush" ]
+      map: [ "enum.DisposalUnitVisualLayers.OverlayFlush" ]
     - state: dispover-charge
       map: [ "enum.DisposalUnitVisualLayers.OverlayCharging" ]
     - state: dispover-ready
@@ -30,17 +29,6 @@
       map: [ "enum.DisposalUnitVisualLayers.OverlayEngaged" ]
   - type: Physics
     bodyType: Static
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.4,0.25,0.4"
-        density: 75
-        mask:
-        - MachineMask
-        layer:
-        - MachineLayer
   - type: Destructible
     thresholds:
     - trigger:
@@ -82,6 +70,9 @@
   parent: DisposalUnitBase
   name: disposal unit
   components:
+  - type: Sprite
+    sprite: Structures/Piping/disposal.rsi
+    snapCardinals: true
   - type: Construction
     graph: DisposalMachine
     node: disposal_unit
@@ -101,6 +92,7 @@
   components:
   - type: Sprite
     sprite: Structures/Piping/disposal.rsi
+    snapCardinals: true
     layers:
       - state: conmailing
         map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
@@ -109,7 +101,7 @@
       - state: mailing-charging
         map: [ "enum.DisposalUnitVisualLayers.BaseCharging" ]
       - state: mailing-flush
-        map: [ "enum.DisposalUnitVisualLayers.BaseFlush" ]
+        map: [ "enum.DisposalUnitVisualLayers.OverlayFlush" ]
       - state: dispover-charge
         map: [ "enum.DisposalUnitVisualLayers.OverlayCharging" ]
       - state: dispover-ready
@@ -123,7 +115,9 @@
     node: mailing_unit
   - type: DisposalUnit
     autoEngageEnabled: false
-    mobsCanEnter: false
+    whitelist:
+      components:
+      - Item
   - type: MailingUnit
   - type: DeviceNetwork
     deviceNetId: Wired
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index 6cfbc04ee1b..6946dcbf835 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -84,6 +84,8 @@
   - type: Lock
     locked: false
   - type: LockVisuals
+  - type: LockedAnchorable
+  - type: LockedWiresPanel
   - type: AccessReader
     access: [[ "Engineering" ]]
   - type: Machine
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
index f236bb8a41e..48994ac7d84 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
@@ -59,7 +59,6 @@
     maxCharge: 1000000
     startingCharge: 0
   - type: BatteryDischarger
-    activeSupplyRate: 15000
   - type: TeslaCoil
     chargeFromLightning: 500000
   - type: LightningTarget
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
index 4567c6d0440..ea41ba3a20d 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
@@ -85,7 +85,6 @@
   - type: ChaoticJump
     jumpMinInterval: 8
     jumpMaxInterval: 15
-    offset: 1
   - type: WarpPoint
     follow: true
     location: tesla ball
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
index 26f0a1de6db..4fa1bcbd918 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
@@ -6,7 +6,7 @@
 - type: entity
   abstract: true
   id: PortableGeneratorBase
-  parent: [ BaseMachine, SmallConstructibleMachine]
+  parent: [ BaseMachine, SmallConstructibleMachine, StructureWheeled]
   components:
     # Basic properties
     - type: Transform
@@ -27,8 +27,8 @@
           shape:
             !type:PhysShapeAabb
             bounds: "-0.40,-0.40,0.40,0.40"
-          # It has wheels
-          density: 45
+          # Despite the heavy weight, it has wheels, so it's still fairly portable.
+          density: 155
           mask:
             - MachineMask
           layer:
@@ -42,9 +42,6 @@
 
     # Construction, interaction
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-generator
-      layoutId: Generator
     - type: UserInterface
       interfaces:
         - key: enum.GeneratorComponentUiKey.Key
@@ -259,8 +256,7 @@
           shape:
             !type:PhysShapeAabb
             bounds: "-0.30,-0.30,0.30,0.30"
-          # It has wheels
-          density: 30
+          density: 80
           mask:
             - MachineMask
           layer:
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 7efa53e2542..4df502791f3 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -97,9 +97,6 @@
     supplyRampRate: 500
   - type: WallMount
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-apc
-    layoutId: APC
   - type: WiresVisuals
   - type: Damageable
     damageContainer: Inorganic
diff --git a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
index da724014dc4..cc337911742 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -17,6 +17,10 @@
     - type: Damageable
       damageContainer: Inorganic
       damageModifierSet: Metallic
+    - type: RCDDeconstructable
+      cost: 2
+      delay: 0
+      fx: EffectRCDConstruct0  
     - type: Destructible
       thresholds:
         - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml
index de66dfc66d6..d064cc187c4 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -43,6 +43,10 @@
     lowVoltageNode: power
   - type: CableVis
     node: power
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 0
+    fx: EffectRCDConstruct0  
 
 - type: entity
   parent: CableBase
diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
index 9f322dc5926..f5f0748b819 100644
--- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -86,9 +86,6 @@
       visible: false
   - type: Machine
     board: CellRechargerCircuitboard
-  - type: Wires
-    boardName: wires-board-name-recharger
-    layoutId: Recharger
   - type: WiresPanel
   - type: GenericVisualizer
     visuals:
@@ -253,8 +250,6 @@
     - machine_parts
     - machine_board
     - entity_storage
-  - type: Wires
-    layoutId: borgcharger
   - type: WiresPanel
   - type: WiresVisuals
   - type: Machine
diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml
index c2170a127ad..1e3559e5a95 100644
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -67,9 +67,6 @@
       color: "#c9c042"
       castShadows: false
     - type: WiresPanel
-    - type: Wires
-      boardName: wires-board-name-smes
-      layoutId: SMES
     - type: Machine
       board: SMESMachineCircuitboard
     - type: StationInfiniteBatteryTarget
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index 94de12be185..347b18ecaee 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -92,9 +92,6 @@
     intensitySlope: 2
     totalIntensity: 200
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-substation
-    layoutId: Substation
   - type: Machine
     board: SubstationMachineCircuitboard
   - type: StationInfiniteBatteryTarget
@@ -244,6 +241,16 @@
   - type: Battery
     maxCharge: 2000000
     startingCharge: 2000000
+  - type: ContainerFill
+    containers:
+      board: [ WallmountSubstationElectronics ]
+      capacitor: [ CapacitorStockPart ]
+      powercell: [ PowerCellSmall ]
+  - type: ContainerContainer
+    containers:
+      board: !type:Container
+      capacitor: !type:Container
+      powercell: !type:Container
 
 # Construction Frame
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index cbc36491f44..4f474765ba7 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -21,6 +21,7 @@
     anchored: false
   - type: Physics
     bodyType: Static
+    bodyStatus: InAir
   - type: Fixtures
     fixtures:
       fix1:
@@ -47,9 +48,12 @@
   - type: EmitSoundOnSpawn
     sound:
       path: /Audio/Effects/teleport_arrival.ogg
-  #- type: Psionic #Nyano - Summary: makes psionic on creation.
+  - type: Psionic #Nyano - Summary: makes psionic on creation.
   - type: GlimmerSource #Nyano - Summary: makes this a potential source of Glimmer.
     active: false
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 0
+    randomStartSecretMax: 2
 
 - type: entity
   id: AnomalyPyroclastic
@@ -89,7 +93,6 @@
     tempChange: 420
   - type: ProjectileAnomaly
     projectilePrototype: ProjectileAnomalyFireball
-    targetNonSentientChance: 0.6
     projectileSpeed: 0.5
     minProjectiles: 3
     maxProjectiles: 6
@@ -163,6 +166,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreFlesh
     coreInertPrototype: AnomalyCoreFleshInert
+    minPulseLength: 180
+    maxPulseLength: 300
   - type: Sprite
     layers:
     - state: anom5
@@ -327,7 +332,6 @@
     explosionMaxTileIntensity: 20
   - type: ProjectileAnomaly
     projectilePrototype: ProjectileIcicle
-    targetNonSentientChance: 0.1
   - type: EntitySpawnAnomaly
     entries:
     - settings:
@@ -354,6 +358,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreRock
     coreInertPrototype: AnomalyCoreRockInert
+    minPulseLength: 180
+    maxPulseLength: 300
   - type: Sprite
     layers:
     - state: anom6
@@ -601,9 +607,11 @@
     color: "#6270bb"
   - type: Anomaly
     animationTime: 6
-    offset: 0.05, 0
+    offset: 0, 0
     corePrototype: AnomalyCoreFlora
     coreInertPrototype: AnomalyCoreFloraInert
+    minPulseLength: 60
+    maxPulseLength: 120
     anomalyContactDamage:
       types:
         Slash: 0
@@ -708,6 +716,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreLiquid
     coreInertPrototype: AnomalyCoreLiquidInert
+    minPulseLength: 60
+    maxPulseLength: 120
     anomalyContactDamage:
       types:
         Slash: 1
@@ -821,6 +831,8 @@
   - type: Anomaly
     corePrototype: AnomalyCoreShadow
     coreInertPrototype: AnomalyCoreShadowInert
+    minPulseLength: 60
+    maxPulseLength: 120
     anomalyContactDamage:
       types:
         Cold: 10
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml
new file mode 100644
index 00000000000..e0247001f20
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml
@@ -0,0 +1,62 @@
+- type: entity
+  id: FloorDrain
+  name: drain
+  description: Drains puddles around it. Useful for dumping mop buckets or keeping certain rooms clean.
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: Sprite
+      drawdepth: FloorObjects
+      sprite: Objects/Specific/Janitorial/drain.rsi
+      layers:
+      - state: icon
+      - map: [ "enum.SolutionContainerLayers.Fill" ]
+        state: fill-1
+        visible: false
+    - type: InteractionOutline
+    - type: Clickable
+    - type: Transform
+      anchored: true
+    - type: Physics
+      bodyType: Static
+      canCollide: false
+    - type: AmbientSound
+      enabled: false
+      volume: -8
+      range: 8
+      sound:
+        path: /Audio/Ambience/Objects/drain.ogg
+    - type: Drain
+    - type: DumpableSolution
+      solution: drainBuffer
+    - type: Appearance
+    - type: SolutionContainerVisuals
+      maxFillLevels: 1
+      fillBaseName: fill-
+      solutionName: drainBuffer
+    - type: SolutionContainerManager
+      solutions:
+        drainBuffer:
+          maxVol: 1000
+    - type: DrainableSolution
+      solution: drainBuffer
+    - type: Damageable
+      damageContainer: Inorganic
+      damageModifierSet: Metallic
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 200
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+        - trigger:
+            !type:DamageTrigger
+            damage: 100
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalBreak
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
new file mode 100644
index 00000000000..2591b3f3408
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
@@ -0,0 +1,336 @@
+# Mop Bucket
+- type: entity
+  name: mop bucket
+  id: MopBucket
+  parent: [BaseStructureDynamic, StructureWheeled]
+  description: Holds water and the tears of the janitor.
+  components:
+  - type: Clickable
+  - type: Sprite
+    sprite: Objects/Specific/Janitorial/janitorial.rsi
+    noRot: true
+    layers:
+    - state: mopbucket
+    - state: mopbucket_water-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
+    drawdepth: Objects
+  - type: InteractionOutline
+  - type: SolutionContainerManager
+    solutions:
+      bucket:
+        maxVol: 600
+  - type: Spillable
+    solution: bucket
+    spillDelay: 3.0
+    spillWhenThrown: false
+  - type: DrainableSolution
+    solution: bucket
+  - type: RefillableSolution
+    solution: bucket
+  - type: ExaminableSolution
+    solution: bucket
+  - type: Tag
+    tags:
+      - Wringer
+  - type: ItemMapper
+    mapLayers:
+      mopbucket_shark_blue:
+        whitelist:
+          tags:
+            - PlushieSharkBlue
+      mopbucket_shark_pink:
+        whitelist:
+          tags:
+            - PlushieSharkPink
+      mopbucket_shark_grey:
+        whitelist:
+          tags:
+            - PlushieSharkGrey
+    sprite: Objects/Fun/sharkplush.rsi
+  - type: Transform
+    noRot: true
+  - type: ItemSlots
+    slots:
+      shark_slot:
+        name: mop-bucket-slot-component-slot-name-shark
+        whitelist:
+          tags:
+            - PlushieSharkBlue
+            - PlushieSharkPink
+            - PlushieSharkGrey
+        priority: 3 # Higher than drinking priority
+  - type: Drink
+    solution: bucket
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: mopbucket_water-
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      shark_slot: !type:ContainerSlot {}
+  - type: GuideHelp
+    guides:
+    - Janitorial
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 70
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 60
+        mask:
+        - MachineMask
+
+- type: entity
+  name: mop bucket
+  id: MopBucketFull
+  parent: MopBucket
+  suffix: full
+  components:
+    - type: Sprite
+      layers:
+        - state: mopbucket
+        - state: mopbucket_water-3
+          map: [ "enum.SolutionContainerLayers.Fill" ]
+    - type: SolutionContainerManager
+      solutions:
+        bucket:
+          maxVol: 600
+          reagents:
+            - ReagentId: Water
+              Quantity: 600
+
+# Janicart
+- type: entity
+  name: janitorial trolley
+  id: JanitorialTrolley
+  parent: [BaseStructureDynamic, StructureWheeled]
+  description: This is the alpha and omega of sanitation.
+  components:
+    - type: Sprite
+      noRot: true
+      sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
+      layers:
+        - state: cart
+        - state: cart_water-1
+          map: ["enum.SolutionContainerLayers.Fill"]
+          visible: false
+    - type: Rotatable
+    - type: InteractionOutline
+    # Removing storage until OnInteractUsing logic resolved
+    #- type: Storage
+    #  popup: false
+    #  capacity: 80
+    #  blacklist: # there is exclusive item slots for that
+    #    tags:
+    #      - Mop
+    #      - TrashBag
+    #      - Bucket
+    - type: ItemSlots
+      slots:
+        mop_slot:
+          name: janitorial-trolley-slot-component-slot-name-mop
+          whitelist:
+            tags:
+              - Mop
+          insertOnInteract: false # or it conflicts with bucket logic
+          priority: 9 # Higher than bucket slot
+        plunger_slot:
+          name: janitorial-trolley-slot-component-slot-name-plunger
+          whitelist:
+            tags:
+              - Plunger
+          priority: 8
+        wetfloorsign_slot4:
+          name: janitorial-trolley-slot-component-slot-name-sign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        wetfloorsign_slot3:
+          name: janitorial-trolley-slot-component-slot-name-sign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        wetfloorsign_slot2:
+          name: janitorial-trolley-slot-component-slot-name-sign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        wetfloorsign_slot1:
+          name: janitorial-trolley-slot-component-slot-name-sign
+          whitelist:
+            tags:
+              - WetFloorSign
+          priority: 7
+        lightreplacer_slot:
+          name: janitorial-trolley-slot-component-slot-name-lightreplacer
+          whitelist:
+            components:
+              - LightReplacer
+          priority: 6
+        spraybottle_slot:
+          name: janitorial-trolley-slot-component-slot-name-spray
+          whitelist:
+            tags:
+              - Spray
+          insertOnInteract: false # or it conflicts with bucket logic
+          priority: 5 # Higher than bucket slot
+        bucket_slot:
+          name: janitorial-trolley-slot-component-slot-name-bucket
+          whitelist:
+            tags:
+              - Bucket
+          insertOnInteract: false # or it also conflicts with bucket logic
+          priority: 4 # Higher than trash bag slot
+        trashbag_slot:
+          name: janitorial-trolley-slot-component-slot-name-trashbag
+          whitelist:
+            tags:
+              - TrashBag
+          priority: 3 # Higher than drinking priority
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeCircle
+            radius: 0.3
+          density: 250
+          layer:
+          - MobLayer
+          mask:
+          - MobMask
+    - type: Spillable
+      solution: bucket
+      spillDelay: 3.0
+      spillWhenThrown: false
+    - type: SolutionContainerManager
+      solutions:
+        bucket:
+          maxVol: 800
+          reagents:
+            - ReagentId: Water
+              Quantity: 600 # 3 quarters full at roundstart to make it more appealing
+    - type: DrainableSolution
+      solution: bucket
+    - type: RefillableSolution
+      solution: bucket
+    - type: ExaminableSolution
+      solution: bucket
+    - type: Tag
+      tags:
+        - Wringer
+    - type: Damageable
+      damageContainer: Inorganic
+      damageModifierSet: Metallic
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 400
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+        - trigger:
+            !type:DamageTrigger
+            damage: 200
+          behaviors:
+            - !type:EmptyAllContainersBehaviour
+            - !type:DoActsBehavior
+              acts: ["Destruction"]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalBreak
+    - type: ItemMapper
+      mapLayers:
+        cart_plunger:
+          whitelist:
+            tags:
+              - Plunger
+        cart_mop:
+          whitelist:
+            tags:
+              - MopBasic
+        cart_advmop:
+          whitelist:
+            tags:
+              - MopAdv
+        cart_garbage:
+          whitelist:
+            tags:
+              - TrashBag
+        cart_replacer:
+          whitelist:
+            components:
+              - LightReplacer
+        cart_spray:
+          whitelist:
+            tags:
+              - Spray
+        cart_sign1: # this is like stack of floor signs
+          minCount: 1
+          whitelist:
+            tags:
+              - WetFloorSign
+        cart_sign2:
+          minCount: 2
+          whitelist:
+            tags:
+              - WetFloorSign
+        cart_sign3:
+          minCount: 3
+          whitelist:
+            tags:
+              - WetFloorSign
+        cart_sign4:
+          minCount: 4
+          whitelist:
+            tags:
+              - WetFloorSign
+        cart_bucket:
+          whitelist:
+            tags:
+              - Bucket
+      sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
+    - type: Appearance
+    - type: SolutionContainerVisuals
+      maxFillLevels: 3
+      fillBaseName: cart_water-
+    - type: UserInterface
+      interfaces:
+      - key: enum.StorageUiKey.Key
+        type: StorageBoundUserInterface
+    - type: Drink
+      solution: bucket
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          ents: []
+        mop_slot: !type:ContainerSlot {}
+        trashbag_slot: !type:ContainerSlot {}
+        bucket_slot: !type:ContainerSlot {}
+        plunger_slot: !type:ContainerSlot {}
+        wetfloorsign_slot4: !type:ContainerSlot {}
+        wetfloorsign_slot3: !type:ContainerSlot {}
+        wetfloorsign_slot2: !type:ContainerSlot {}
+        wetfloorsign_slot1: !type:ContainerSlot {}
+        lightreplacer_slot: !type:ContainerSlot {}
+        spraybottle_slot:  !type:ContainerSlot {}
+    - type: GuideHelp
+      guides:
+      - Janitorial
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 0ef99b9f47e..23b1efdf535 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -48,6 +48,10 @@
         layer:
         - MachineLayer
   - type: EntityStorage
+    closeSound:
+      path: /Audio/Effects/closet_close.ogg
+    openSound:
+      path: /Audio/Effects/closet_open.ogg
   - type: ContainerContainer
     containers:
       entity_storage: !type:Container
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
index 5fda0ddbe2e..fb00db7aa6b 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
@@ -37,6 +37,19 @@
     stateDoorOpen: emergency_open
     stateDoorClosed: emergency_door
 
+# Emergency N2 closet
+- type: entity
+  id: ClosetEmergencyN2
+  name: emergency nitrogen closet
+  parent: ClosetSteelBase
+  description: It's full of life-saving equipment. Assuming, that is, that you breathe nitrogen.
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: fire
+    stateDoorOpen: fire_open
+    stateDoorClosed: n2_door
+
 # Fire safety closet
 - type: entity
   id: ClosetFire
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 6299abef89a..78c8c84d4c9 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -21,6 +21,9 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: InteractionOutline
   - type: Physics
   - type: Fixtures
@@ -55,6 +58,18 @@
   - type: EntityStorageVisuals
     stateDoorOpen: open
     stateDoorClosed: closed
+  - type: GenericVisualizer
+    visuals:
+      enum.PaperLabelVisuals.HasLabel:
+        enum.PaperLabelVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.PaperLabelVisuals.LabelType:
+        enum.PaperLabelVisuals.Layer:
+          Paper: { state: paper }
+          Bounty: { state: bounty }
+          CaptainsPaper: { state: captains_paper }
+          Invoice: { state: invoice }
   - type: PaperLabel
     labelSlot:
       insertVerbText: Attach Label
@@ -107,6 +122,9 @@
     - state: locked
       map: ["enum.LockVisualLayers.Lock"]
       shader: unshaded
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: StructuralMetallic
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 4ebe8d04eb6..1cf80836590 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -138,6 +138,9 @@
       map: ["enum.StorageVisualLayers.Base"]
     - state: closed
       map: ["enum.StorageVisualLayers.Door"]
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      map: ["enum.PaperLabelVisuals.Layer"]  
   - type: Construction
     graph: WebStructures
     node: crate
@@ -320,6 +323,10 @@
     - state: base
     - state: closed
       map: ["enum.StorageVisualLayers.Door"]
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "-0.25,0.625"
+      map: ["enum.PaperLabelVisuals.Layer"]  
   - type: Icon
     sprite: Structures/Storage/Crates/livestock.rsi
     state: base
@@ -371,6 +378,10 @@
     - state: base
     - state: closed
       map: ["enum.StorageVisualLayers.Door"]
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "0.0,0.125"
+      map: ["enum.PaperLabelVisuals.Layer"]   
   - type: Icon
     sprite: Structures/Storage/Crates/cage.rsi
   - type: Destructible
@@ -424,6 +435,10 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "0.0,-0.09375"
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: Icon
     sprite: Structures/Storage/Crates/piratechest.rsi
     state: crate_icon
@@ -449,6 +464,8 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: Icon
     sprite: Structures/Storage/Crates/toybox.rsi
     state: crate_icon
@@ -465,6 +482,8 @@
     - state: base
     - state: closed
       map: ["enum.StorageVisualLayers.Door"]
+    - state: paper
+      map: ["enum.PaperLabelVisuals.Layer"] 
   - type: Icon
     sprite: Structures/Storage/Crates/coffin.rsi
     state: base
@@ -503,6 +522,10 @@
     - state: base
     - state: closed
       map: ["enum.StorageVisualLayers.Door"]
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "-0.28125,0.625"
+      map: ["enum.PaperLabelVisuals.Layer"] 
   - type: Icon
     sprite: Structures/Storage/Crates/wooden_grave.rsi
     state: base
@@ -547,6 +570,10 @@
     - state: base
     - state: closed
       map: ["enum.StorageVisualLayers.Door"]
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "-0.3125,0.5625"
+      map: ["enum.PaperLabelVisuals.Layer"] 
   - type: Icon
     sprite: Structures/Storage/Crates/stone_grave.rsi
     state: base
@@ -563,7 +590,7 @@
     sprite: Structures/Storage/Crates/syndicate.rsi
 
 - type: entity
-  parent: CrateBaseWeldable
+  parent: [StructureWheeled, CrateBaseWeldable]
   id: CrateTrashCart
   name: trash cart
   components:
@@ -571,6 +598,17 @@
     sprite: Structures/Storage/Crates/trashcart.rsi
   - type: Sprite
     sprite: Structures/Storage/Crates/trashcart.rsi
+    layers:
+    - state: base
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "0.0,0.03125"
+      map: ["enum.PaperLabelVisuals.Layer"]
 
 - type: entity
   parent: CrateBaseSecure
@@ -581,6 +619,20 @@
     sprite: Structures/Storage/Crates/trashcart_jani.rsi
   - type: Sprite
     sprite: Structures/Storage/Crates/trashcart_jani.rsi
+    layers:
+    - state: base
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "0.0,0.03125"
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: AccessReader
     access: [["Janitor"]]
 
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
index 238efaf68d0..7b56e6d36b5 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
@@ -65,3 +65,21 @@
   - type: ReagentTank
   - type: Transform
     noRot: true
+
+# For highcap tanks
+- type: entity
+  id: StorageTankBig
+  parent: StorageTank
+  abstract: true
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        density: 455 #very heavy, they store 10k units of reagents after all.
+        mask:
+        - MachineMask
+        layer:
+        - WallLayer
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index a644c7afa14..934298b6207 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -2,7 +2,7 @@
 
 - type: entity
   id: WeldingFuelTank
-  parent: StorageTank
+  parent: [StorageTank, StructureWheeled]
   name: fuel tank
   description: A fuel tank. It's used to store high amounts of fuel.
   suffix: Empty
@@ -48,7 +48,7 @@
           Quantity: 1500
 
 - type: entity
-  parent: WeldingFuelTank
+  parent: [StorageTankBig, WeldingFuelTank] # StorageTankBig must come first, or else the desnity won't get inherited.
   id: WeldingFuelTankHighCapacity
   name: high-capacity fuel tank
   description: A highly pressurized fuel tank made to hold gargantuan amounts of welding fuel.
@@ -81,7 +81,7 @@
 
 - type: entity
   id: WaterTank
-  parent: StorageTank
+  parent: [StorageTank, StructureWheeled]
   name: water tank
   description: A water tank. It's used to store high amounts of water.
   suffix: Empty
@@ -115,7 +115,7 @@
           Quantity: 1500
 
 - type: entity
-  parent: WaterTankFull
+  parent: StorageTank
   id: WaterCooler
   name: water cooler
   description: Seems like a good place to stand and waste time. It has a stock of paper cups on the side.
@@ -127,6 +127,7 @@
       - state: watercooler-2-1
         map: ["enum.SolutionContainerLayers.Fill"]
         visible: false
+  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 4
     fillBaseName: watercooler-2-
@@ -157,14 +158,20 @@
       - FitsInDispenser
       tags:
       - Trash
+  - type: ExaminableSolution
+    solution: tank
+  - type: StaticPrice
+    price: 500
 
 - type: entity
-  parent: StorageTank
+  parent: [StorageTankBig, WaterTank]
   id: WaterTankHighCapacity
   name: high-capacity water tank
   description: A highly pressurized water tank made to hold gargantuan amounts of water.
   suffix: Full
   components:
+  - type: StaticPrice
+    price: 2500
   - type: Sprite
     sprite: Structures/Storage/tanks.rsi
     layers:
@@ -192,7 +199,7 @@
 
 - type: entity
   id: GenericTank
-  parent: StorageTank
+  parent: [StorageTank, StructureWheeled]
   suffix: Empty
   components:
     - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
index 4a442d0542f..421ab93be97 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
@@ -2,6 +2,8 @@
   id: NoticeBoard
   name: notice board
   description: Is there a job for a witcher?
+  placement:
+    mode: SnapgridCenter
   components:
   - type: WallMount
   - type: Sprite
@@ -53,3 +55,9 @@
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
+  - type: Tag
+    tags:
+    - Wooden
+  - type: Construction
+    graph: NoticeBoard
+    node: noticeBoard
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
index 94bc33a210a..d1df619b7a4 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
@@ -59,7 +59,6 @@
         board: !type:Container
     - type: ApcPowerReceiver
       powerLoad: 200
-      priority: Low
     - type: WallMount
       arc: 360
     - type: ExtensionCableReceiver
diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
index 88d2f272c08..1dca59225cb 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
@@ -10,9 +10,6 @@
       Brute:
         path:
           "/Audio/Weapons/grille_hit.ogg"
-  - type: Tag
-    tags:
-    - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/fence.rsi
     drawdepth: WallTops
@@ -78,6 +75,10 @@
           True: { visible: True }
           False: { visible: False }
   - type: AnimationPlayer
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2
 
 - type: entity
   parent: BaseFenceMetal
diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
index 7277af64ca5..41dbe21d5f1 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
@@ -12,7 +12,6 @@
           "/Audio/Weapons/boxingpunch1.ogg"
   - type: Tag
     tags:
-    - RCDDeconstructWhitelist
     - Wooden
   - type: Sprite
     sprite: Structures/Walls/wooden_fence.rsi
@@ -24,6 +23,10 @@
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Wood
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
index b532db221da..11ada142fa5 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -9,9 +9,10 @@
         Brute:
           path:
             "/Audio/Weapons/grille_hit.ogg"
-    - type: Tag
-      tags:
-        - RCDDeconstructWhitelist
+    - type: RCDDeconstructable
+      cost: 6
+      delay: 4
+      fx: EffectRCDDeconstruct4  
     - type: CanBuildWindowOnTop
     - type: Sprite
       drawdepth: Walls
@@ -120,9 +121,10 @@
     - type: Icon
       sprite: Structures/Walls/grille.rsi
       state: grille_broken
-    - type: Tag
-      tags:
-        - RCDDeconstructWhitelist
+    - type: RCDDeconstructable
+      cost: 6
+      delay: 4
+      fx: EffectRCDDeconstruct4
     - type: Construction
       graph: Grille
       node: grilleBroken
diff --git a/Resources/Prototypes/Entities/Structures/Walls/railing.yml b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
index 95d16742d58..a23c559abab 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
@@ -57,6 +57,10 @@
   - type: Construction
     graph: Railing
     node: railing
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
 
 - type: entity
   parent: BaseStructure
@@ -126,6 +130,10 @@
   - type: Construction
     graph: Railing
     node: railingCorner
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
 
 - type: entity
   parent: BaseStructure
@@ -186,7 +194,11 @@
   - type: Construction
     graph: Railing
     node: railingCornerSmall
-
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
+    
 - type: entity
   parent: BaseStructure
   id: RailingRound
@@ -261,3 +273,7 @@
   - type: Construction
     graph: Railing
     node: railingRound
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 53d9a5224ef..b5b55dbd546 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -59,11 +59,14 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/brick.rsi
   - type: Icon
     sprite: Structures/Walls/brick.rsi
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -90,7 +93,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/clock.rsi
   - type: Icon
@@ -123,7 +125,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/clown.rsi
   - type: Icon
@@ -131,6 +132,10 @@
   - type: Construction
     graph: Girder
     node: bananiumWall
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -156,7 +161,6 @@
   components:
   - type: Tag
     tags:
-      - RCDDeconstructWhitelist
       - Wall
       - Structure
   - type: Sprite
@@ -165,7 +169,7 @@
     sprite: Structures/Walls/meat.rsi
   - type: Construction
     graph: Girder
-    node: bananiumWall
+    node: meatWall
   - type: Destructible
     thresholds:
     - trigger:
@@ -190,7 +194,6 @@
   components:
   - type: Tag
     tags:
-      - RCDDeconstructWhitelist
       - Wall
   - type: Sprite
     sprite: Structures/Walls/cult.rsi
@@ -223,7 +226,6 @@
     tags:
       - Wall
       - Debug
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/debug.rsi
   - type: Icon
@@ -253,11 +255,14 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/diamond.rsi
   - type: Icon
     sprite: Structures/Walls/diamond.rsi
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -283,7 +288,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/gold.rsi
   - type: Icon
@@ -291,6 +295,10 @@
   - type: Construction
     graph: Girder
     node: goldWall
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -325,7 +333,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/ice.rsi
   - type: Icon
@@ -355,7 +362,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/plasma.rsi
   - type: Icon
@@ -363,6 +369,10 @@
   - type: Construction
     graph: Girder
     node: plasmaWall
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -399,7 +409,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/plastic.rsi
   - type: Icon
@@ -407,6 +416,10 @@
   - type: Construction
     graph: Girder
     node: plasticWall
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -459,7 +472,6 @@
     - type: Tag
       tags:
         - Wall
-        - RCDDeconstructWhitelist
     - type: Destructible
       thresholds:
         - trigger:
@@ -609,7 +621,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/riveted.rsi
   - type: Icon
@@ -644,11 +655,14 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/sandstone.rsi
   - type: Icon
     sprite: Structures/Walls/sandstone.rsi
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -674,7 +688,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/silver.rsi
   - type: Icon
@@ -682,6 +695,10 @@
   - type: Construction
     graph: Girder
     node: silverWall
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -803,7 +820,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/shuttle.rsi
   - type: Icon
@@ -845,7 +861,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/solid.rsi
   - type: WallReplacementMarker
@@ -854,6 +869,10 @@
     node: wall
   - type: Icon
     sprite: Structures/Walls/solid.rsi
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
@@ -1015,7 +1034,6 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/web.rsi
   - type: Icon
@@ -1229,11 +1247,14 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
   - type: Sprite
     sprite: Structures/Walls/cobblebrick.rsi
   - type: Icon
     sprite: Structures/Walls/cobblebrick.rsi
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 8
+    fx: EffectRCDDeconstruct8
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/mining.yml b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
index 910c3daae2a..82d11b732b6 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/mining.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: MiningWindow
   name: mining window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
index 0dd2a1b06cc..36a12f2d844 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: PlasmaWindow
   name: plasma window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
@@ -55,7 +55,7 @@
 
 - type: entity
   id: PlasmaWindowDirectional
-  parent: WindowDirectional
+  parent: WindowDirectionalRCDResistant
   name: directional plasma window
   description: Don't smudge up the glass down there.
   placement:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index 1c79644ce4d..d8b6c7d11d8 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -14,6 +14,10 @@
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: RGlass
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 6
+    fx: EffectRCDDeconstruct6
   - type: Destructible
     thresholds:
     - trigger:
@@ -99,6 +103,10 @@
       sprite: Structures/Windows/cracks_directional.rsi
   - type: Damageable
     damageModifierSet: RGlass
+  - type: RCDDeconstructable
+    cost: 4
+    delay: 4
+    fx: EffectRCDDeconstruct4  
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
index d81204be071..93859b1db2c 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ReinforcedPlasmaWindow
   name: reinforced plasma window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
@@ -58,7 +58,7 @@
 
 - type: entity
   id: PlasmaReinforcedWindowDirectional
-  parent: WindowDirectional
+  parent: WindowDirectionalRCDResistant
   name: directional reinforced plasma window
   description: Don't smudge up the glass down there.
   placement:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
index 6ed2cc59267..e26fec65b77 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ReinforcedUraniumWindow
   name: reinforced uranium window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
index df0874b3f46..6af5467d941 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ShuttleWindow
   name: shuttle window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
diff --git a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
index b956d369fa3..e5228bc593e 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: UraniumWindow
   name: uranium window
-  parent: Window
+  parent: WindowRCDResistant
   components:
   - type: Sprite
     drawdepth: WallTops
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index ee2ad6bc28f..443df0ea531 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -16,7 +16,6 @@
     arc: 360 # interact despite grilles
   - type: Tag
     tags:
-      - RCDDeconstructWhitelist
       - ForceFixRotations
       - Window
   - type: Sprite
@@ -42,6 +41,10 @@
   - type: ExaminableDamage
     messages: WindowMessages
   - type: Repairable
+  - type: RCDDeconstructable
+    cost: 6
+    delay: 4
+    fx: EffectRCDDeconstruct4
   - type: Destructible
     thresholds:
     - trigger:
@@ -89,6 +92,14 @@
   - type: StaticPrice
     price: 100
   - type: BlockWeather
+  
+- type: entity
+  id: WindowRCDResistant
+  parent: Window
+  abstract: true
+  components:
+  - type: RCDDeconstructable
+    deconstructable: false
 
 - type: entity
   id: WindowDirectional
@@ -140,6 +151,10 @@
     damageModifierSet: Glass
   - type: ExaminableDamage
     messages: WindowMessages
+  - type: RCDDeconstructable
+    cost: 4
+    delay: 2
+    fx: EffectRCDDeconstruct2
   - type: Destructible
     thresholds:
     - trigger:
@@ -182,6 +197,14 @@
   - type: StaticPrice
     price: 10
 
+- type: entity
+  id: WindowDirectionalRCDResistant  
+  parent: WindowDirectional
+  abstract: true
+  components:
+  - type: RCDDeconstructable
+    deconstructable: false
+
 - type: entity
   id: WindowFrostedDirectional
   parent: WindowDirectional
diff --git a/Resources/Prototypes/Entities/Structures/base_structure.yml b/Resources/Prototypes/Entities/Structures/base_structure.yml
index b5356674aaa..71971a66243 100644
--- a/Resources/Prototypes/Entities/Structures/base_structure.yml
+++ b/Resources/Prototypes/Entities/Structures/base_structure.yml
@@ -56,5 +56,13 @@
         - LowImpassable
   - type: Anchorable
 
+# For use with yaml composition, so that all wheeled structures can easily be changed.
+- type: entity
+  id: StructureWheeled
+  abstract: true
+  components:
+    - type: TileFrictionModifier
+      modifier: 0.4
+
 - type: Tag
   id: Structure
diff --git a/Resources/Prototypes/Entities/Structures/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml
index c727c249522..6dee91365ef 100644
--- a/Resources/Prototypes/Entities/Structures/catwalk.yml
+++ b/Resources/Prototypes/Entities/Structures/catwalk.yml
@@ -51,3 +51,7 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
index 6dac2e656e4..68a0cbd38e4 100644
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -83,9 +83,6 @@
   - type: Machine
     board: HydroponicsTrayMachineCircuitboard
   - type: WiresPanel
-  - type: Wires
-    boardName: wires-board-name-hydroponicstray
-    layoutId: HydroponicsTray
   - type: AmbientSound
     volume: -9
     range: 5
@@ -94,9 +91,6 @@
   - type: GuideHelp
     guides:
     - Botany
-  - type: Tag
-    tags:
-      - NoPaint
 
 - type: entity
   parent: hydroponicsTray
diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
index bf49eb1be35..c4ee507395f 100644
--- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -66,12 +66,15 @@
         - Opaque
         - MidImpassable
   - type: Occluder
+  - type: Construction
+    graph: PlasticFlapsGraph
+    node: opaqueFlaps
 
 - type: entity
   id: PlasticFlapsAirtightClear
   parent: PlasticFlapsClear
   name: airtight plastic flaps
-  suffix: Airtight Clear
+  suffix: Airtight, Clear
   description: Heavy duty, slightly stronger, airtight plastic flaps. Definitely can't get past those. No way.
   components:
   - type: Destructible
@@ -83,12 +86,17 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Airtight
+  - type: Construction
+    graph: PlasticFlapsGraph
+    node: airtightFlaps
+  - type: StaticPrice
+    price: 100
 
 - type: entity
   id: PlasticFlapsAirtightOpaque
   parent: PlasticFlapsOpaque
   name: airtight plastic flaps
-  suffix: Airtight Opaque
+  suffix: Airtight, Opaque
   description: Heavy duty, slightly stronger, airtight plastic flaps. Definitely can't get past those. No way.
   components:
   - type: Destructible
@@ -100,3 +108,8 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Airtight
+  - type: Construction
+    graph: PlasticFlapsGraph
+    node: airtightopaqueFlaps
+  - type: StaticPrice
+    price: 100
diff --git a/Resources/Prototypes/Entities/Virtual/electrocution.yml b/Resources/Prototypes/Entities/Virtual/electrocution.yml
index 497071ee939..ac65245191e 100644
--- a/Resources/Prototypes/Entities/Virtual/electrocution.yml
+++ b/Resources/Prototypes/Entities/Virtual/electrocution.yml
@@ -1,7 +1,7 @@
 # Special entity used to attach to power networks as load when somebody gets electrocuted.
 - type: entity
   id: VirtualElectrocutionLoadBase
-  noSpawn: true
+  abstract: true
   components:
   - type: Electrocution
   - type: Icon
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 254b563affa..9f0f6ad6787 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -624,6 +624,11 @@
   flavorType: Complex
   description: flavor-complex-dr-gibb
 
+- type: flavor
+  id: gingersoda
+  flavorType: Complex
+  description: flavor-complex-ginger-soda
+
 - type: flavor
   id: lemonlimesoda
   flavorType: Complex
@@ -694,6 +699,11 @@
   flavorType: Complex
   description: flavor-complex-rum
 
+- type: flavor
+  id: coconutrum
+  flavorType: Complex
+  description: flavor-complex-coconut-rum
+
 - type: flavor
   id: coffeeliquor
   flavorType: Complex
@@ -739,6 +749,31 @@
   flavorType: Complex
   description: flavor-complex-ice
 
+- type: flavor
+  id: arnoldpalmer
+  flavorType: Complex
+  description: flavor-complex-arnold-palmer
+
+- type: flavor
+  id: bluehawaiian
+  flavorType: Complex
+  description: flavor-complex-blue-hawaiian
+
+- type: flavor
+  id: cosmopolitan
+  flavorType: Complex
+  description: flavor-complex-cosmopolitan
+
+- type: flavor
+  id: painkiller
+  flavorType: Complex
+  description: flavor-complex-painkiller
+
+- type: flavor
+  id: pinacolada
+  flavorType: Complex
+  description: flavor-complex-pina-colada
+
 - type: flavor
   id: longisland
   flavorType: Complex
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 7e0fccb6b8b..7a5aa9ae463 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -49,7 +49,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-bureaucratic-error-announcement
+    startAnnouncement: true
     minimumPlayers: 25
     weight: 5
     duration: 1
@@ -61,7 +61,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-clerical-error-announcement
+    startAnnouncement: true
     minimumPlayers: 15
     weight: 5
     duration: 1
@@ -134,10 +134,8 @@
   noSpawn: true
   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
+    startAnnouncement: true
+    endAnnouncement: true
     earliestStart: 10
     minimumPlayers: 5
     weight: 10
@@ -166,12 +164,8 @@
     earliestStart: 30
     weight: 7.5
     minimumPlayers: 10 #Enough to hopefully have at least one engineering guy
-    startAnnouncement: station-event-meteor-swarm-start-announcement
-    endAnnouncement: station-event-meteor-swarm-end-announcement
-    startAudio:
-      path: /Audio/Announcements/meteors.ogg
-      params:
-        volume: -4
+    startAnnouncement: true
+    endAnnouncement: true
     duration: null #ending is handled by MeteorSwarmRule
     startDelay: 30
   - type: MeteorSwarmRule
@@ -182,9 +176,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-vent-creatures-start-announcement
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
+    startAnnouncement: true
     startDelay: 10
     earliestStart: 30
     minimumPlayers: 35
@@ -210,9 +202,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-vent-creatures-start-announcement
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
+    startAnnouncement: true
     startDelay: 10
     weight: 5
     duration: 50
@@ -230,12 +220,8 @@
   components:
   - type: StationEvent
     weight: 10
-    startAnnouncement: station-event-power-grid-check-start-announcement
-    endAnnouncement: station-event-power-grid-check-end-announcement
-    startAudio:
-      path: /Audio/Announcements/power_off.ogg
-      params:
-       volume: -4
+    startAnnouncement: true
+    endAnnouncement: true
     startDelay: 24
     duration: 60
     maxDuration: 120
@@ -249,8 +235,6 @@
 #   - type: StationEvent
 #     weight: 10
 #     duration: 1
-#     startAudio:
-#       path: /Audio/Announcements/attention.ogg
 #   - type: RandomSentienceRule
 
 - type: entity
@@ -260,10 +244,8 @@
   components:
   - type: StationEvent
     weight: 10
-    startAnnouncement: station-event-solar-flare-start-announcement
-    endAnnouncement: station-event-solar-flare-end-announcement
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
+    startAnnouncement: true
+    endAnnouncement: true
     duration: 120
     maxDuration: 240
   - type: SolarFlareRule
@@ -301,9 +283,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-vent-clog-start-announcement
-    startAudio:
-      path: /Audio/Announcements/ventclog.ogg # DeltaV - custom announcer
+    startAnnouncement: true
     earliestStart: 15
     minimumPlayers: 15
     weight: 5
@@ -317,9 +297,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-vent-creatures-start-announcement
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
+    startAnnouncement: true
     startDelay: 10
     earliestStart: 15
     minimumPlayers: 15
@@ -340,9 +318,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-vent-creatures-start-announcement
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
+    startAnnouncement: true
     startDelay: 10
     earliestStart: 20
     minimumPlayers: 15
@@ -363,9 +339,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-vent-creatures-start-announcement
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
+    startAnnouncement: true
     startDelay: 10
     earliestStart: 20
     minimumPlayers: 15
@@ -382,9 +356,7 @@
 #  noSpawn: true
 #  components:
 #  - type: StationEvent
-#    startAnnouncement: station-event-vent-creatures-start-announcement
-#    startAudio:
-#      path: /Audio/Announcements/attention.ogg
+#    startAnnouncement: true
 #    startDelay: 10
 #    earliestStart: 20
 #    minimumPlayers: 15
@@ -447,9 +419,7 @@
 #  noSpawn: true
 #  components:
 #  - type: StationEvent
-#    startAnnouncement: station-event-immovable-rod-start-announcement
-#    startAudio:
-#      path: /Audio/Announcements/attention.ogg
+#    startAnnouncement: true
 #    weight: 5
 #    duration: 1
 #    earliestStart: 45
@@ -477,3 +447,4 @@
       minimumPlayers: 20
       weight: 5
     - type: MobReplacementRule
+      numberToReplace: 1
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 86ab73ccc4f..01355cb0a40 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -144,6 +144,16 @@
   components:
   - type: RampingStationEventScheduler
 
+- type: entity
+  id: HellshiftStationEventScheduler
+  parent: BaseGameRule
+  noSpawn: true
+  components:
+  - type: RampingStationEventScheduler
+    chaosModifier: 4 # By default, one event each 30-10 seconds after two hours. Changing CVars will cause this to deviate.
+    startingChaosRatio: 0.025 # Starts as slow as survival, but quickly ramps up
+    shiftLengthModifier: 2.5
+
 # variation passes
 - type: entity
   id: BasicRoundstartVariation
diff --git a/Resources/Prototypes/Guidebook/chemicals.yml b/Resources/Prototypes/Guidebook/chemicals.yml
new file mode 100644
index 00000000000..508b61b4ac6
--- /dev/null
+++ b/Resources/Prototypes/Guidebook/chemicals.yml
@@ -0,0 +1,63 @@
+- type: guideEntry
+  id: Chemicals
+  name: guide-entry-chemicals
+  text: "/ServerInfo/Guidebook/Chemicals.xml"
+  children:
+  - Elements
+  - Medicine
+  - Narcotics
+  - Pyrotechnic
+  - Toxins
+  - Foods
+  - Botanical
+  - Biological
+  - Others
+  filterEnabled: True
+
+- type: guideEntry
+  id: Elements
+  name: guide-entry-elements
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Elements.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Narcotics
+  name: guide-entry-narcotics
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Narcotics.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Pyrotechnic
+  name: guide-entry-pyrotechnics
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Toxins
+  name: guide-entry-toxins
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Toxins.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Foods
+  name: guide-entry-foods
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Foods.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Botanical
+  name: guide-entry-botanical
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Botany.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Biological
+  name: guide-entry-biological
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Biological.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Others
+  name: guide-entry-others
+  text: "/ServerInfo/Guidebook/ChemicalTabs/Other.xml"
+  filterEnabled: True
diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml
index 9ea2398a7ce..95a4f1ca75f 100644
--- a/Resources/Prototypes/Guidebook/medical.yml
+++ b/Resources/Prototypes/Guidebook/medical.yml
@@ -47,4 +47,4 @@
 - type: guideEntry
   id: AdvancedBrute
   name: guide-entry-brute
-  text: "/ServerInfo/Guidebook/Medical/AdvancedBrute.xml"
\ No newline at end of file
+  text: "/ServerInfo/Guidebook/Medical/AdvancedBrute.xml"
diff --git a/Resources/Prototypes/Guidebook/shiftandcrew.yml b/Resources/Prototypes/Guidebook/shiftandcrew.yml
index 9df1b260084..3c4618902e6 100644
--- a/Resources/Prototypes/Guidebook/shiftandcrew.yml
+++ b/Resources/Prototypes/Guidebook/shiftandcrew.yml
@@ -19,12 +19,6 @@
   name: guide-entry-survival
   text: "/ServerInfo/Guidebook/Survival.xml"
 
-- type: guideEntry
-  id: Chemicals
-  name: guide-entry-chemicals
-  text: "/ServerInfo/Guidebook/Chemicals.xml"
-  filterEnabled: True
-
 - type: guideEntry
   id: Janitorial
   name: guide-entry-janitorial
@@ -47,4 +41,3 @@
   id: Food Recipes
   name: guide-entry-foodrecipes
   text: "/ServerInfo/Guidebook/Service/FoodRecipes.xml"
-
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 82a3fba5b41..030c89c8cf1 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -421,7 +421,6 @@
   nutrientConsumption: 0.40
   idealLight: 8
   idealHeat: 298
-  juicy: true
   splatPrototype: PuddleSplatter
   chemicals:
     Nutriment:
@@ -456,7 +455,6 @@
   nutrientConsumption: 0.70
   idealLight: 8
   idealHeat: 298
-  juicy: true
   splatPrototype: PuddleSplatter
   chemicals:
     Nutriment:
@@ -491,7 +489,6 @@
   nutrientConsumption: 0.70
   idealLight: 8
   idealHeat: 298
-  juicy: true
   splatPrototype: PuddleSplatter
   chemicals:
     Blood:
diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/digitigrade_inventory_template.yml
similarity index 100%
rename from Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml
rename to Resources/Prototypes/InventoryTemplates/digitigrade_inventory_template.yml
diff --git a/Resources/Prototypes/Language/languages.yml b/Resources/Prototypes/Language/languages.yml
index 90bce1baed2..bec1884fe5c 100644
--- a/Resources/Prototypes/Language/languages.yml
+++ b/Resources/Prototypes/Language/languages.yml
@@ -1,493 +1,578 @@
 # The universal language, assumed if the entity has a UniversalLanguageSpeakerComponent.
-# Do not use otherwise. Try to use the respective component instead of this language.
+# Do not use otherwise. Making an entity explicitly understand/speak this language will NOT have the desired effect.
 - type: language
   id: Universal
-  obfuscateSyllables: false
-  replacement:
-  - "*incomprehensible*"
+  obfuscation:
+    !type:ReplacementObfuscation
+    replacement:
+    - "*incomprehensible*" # Never actually used
 
 # The common galactic tongue.
 - type: language
   id: GalacticCommon
-  obfuscateSyllables: true
-  replacement:
-  - Blah
-  - Blah
-  - Blah
-  - dingle-doingle
-  - dingle
-  - dangle
-  - jibber-jabber
-  - jubber
-  - bleh
-  - zippity
-  - zoop
-  - wibble
-  - wobble
-  - wiggle
-  - yada
-  - meh
-  - neh
-  - nah
-  - wah
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - blah
+    - blah
+    - blah
+    - dingle-doingle
+    - dingle
+    - dangle
+    - jibber-jabber
+    - jubber
+    - bleh
+    - zippity
+    - zoop
+    - wibble
+    - wobble
+    - wiggle
+    - yada
+    - meh
+    - neh
+    - nah
+    - wah
+
+- type: language
+  id: SignLanguage
+  signLanguage: true
+  obfuscation:
+    !type:ReplacementObfuscation
+    replacement:
+    - "language-signlanguage-1"
+    - "language-signlanguage-2"
 
 # Spoken by slimes.
 - type: language
   id: Bubblish
-  obfuscateSyllables: true
-  replacement:
-  - blob
-  - plop
-  - pop
-  - bop
-  - boop
+  color: "#0077aa"
+  fontId: RubikBubbles
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - blob
+    - plop
+    - pop
+    - bop
+    - boop
 
 # Spoken by moths.
 - type: language
   id: Moffic
-  obfuscateSyllables: true
-  replacement:
-  - år
-  - i
-  - går
-  - sek
-  - mo
-  - ff
-  - ok
-  - gj
-  - ø
-  - gå
-  - la
-  - le
-  - lit
-  - ygg
-  - van
-  - dår
-  - næ
-  - møt
-  - idd
-  - hvo
-  - ja
-  - på
-  - han
-  - så
-  - ån
-  - det
-  - att
-  - nå
-  - gö
-  - bra
-  - int
-  - tyc
-  - om
-  - när
-  - två
-  - må
-  - dag
-  - sjä
-  - vii
-  - vuo
-  - eil
-  - tun
-  - käyt
-  - teh
-  - vä
-  - hei
-  - huo
-  - suo
-  - ää
-  - ten
-  - ja
-  - heu
-  - stu
-  - uhr
-  - kön
-  - we
-  - hön
+  color: "#869b29"
+  fontId: Copperplate
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 2 # Replacements are really short
+    maxSyllables: 4
+    replacement:
+    - år
+    - i
+    - går
+    - sek
+    - mo
+    - ff
+    - ok
+    - gj
+    - ø
+    - gå
+    - la
+    - le
+    - lit
+    - ygg
+    - van
+    - dår
+    - næ
+    - møt
+    - idd
+    - hvo
+    - ja
+    - på
+    - han
+    - så
+    - ån
+    - det
+    - att
+    - nå
+    - gö
+    - bra
+    - int
+    - tyc
+    - om
+    - när
+    - två
+    - må
+    - dag
+    - sjä
+    - vii
+    - vuo
+    - eil
+    - tun
+    - käyt
+    - teh
+    - vä
+    - hei
+    - huo
+    - suo
+    - ää
+    - ten
+    - ja
+    - heu
+    - stu
+    - uhr
+    - kön
+    - we
+    - hön
 
-  # Spoken by dionas.
+# Spoken by dionas.
 - type: language
   id: RootSpeak
-  obfuscateSyllables: true
-  replacement:
-  - hs
-  - zt
-  - kr
-  - st
-  - sh
+  color: "#804000"
+  fontId: Noganas
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 5
+    replacement:
+    - hs
+    - zt
+    - kr
+    - st
+    - sh
 
 # A mess of broken Japanese, spoken by Felinds and Oni
 - type: language
   id: Nekomimetic
-  obfuscateSyllables: true
-  replacement:
-  - neko
-  - nyan
-  - mimi
-  - moe
-  - mofu
-  - fuwa
-  - kyaa
-  - kawaii
-  - poka
-  - munya
-  - puni
-  - munyu
-  - ufufu
-  - icha
-  - doki
-  - kyun
-  - kusu
-  - nya
-  - nyaa
-  - desu
-  - kis
-  - ama
-  - chuu
-  - baka
-  - hewo
-  - boop
-  - gato
-  - kit
-  - sune
-  - yori
-  - sou
-  - baka
-  - chan
-  - san
-  - kun
-  - mahou
-  - yatta
-  - suki
-  - usagi
-  - domo
-  - ori
-  - uwa
-  - zaazaa
-  - shiku
-  - puru
-  - ira
-  - heto
-  - etto
+  color: "#803B56"
+  fontId: Manga
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3 # May be too long even, we'll see.
+    replacement:
+    - neko
+    - nyan
+    - mimi
+    - moe
+    - mofu
+    - fuwa
+    - kyaa
+    - kawaii
+    - poka
+    - munya
+    - puni
+    - munyu
+    - ufufu
+    - icha
+    - doki
+    - kyun
+    - kusu
+    - nya
+    - nyaa
+    - desu
+    - kis
+    - ama
+    - chuu
+    - baka
+    - hewo
+    - boop
+    - gato
+    - kit
+    - sune
+    - yori
+    - sou
+    - baka
+    - chan
+    - san
+    - kun
+    - mahou
+    - yatta
+    - suki
+    - usagi
+    - domo
+    - ori
+    - uwa
+    - zaazaa
+    - shiku
+    - puru
+    - ira
+    - heto
+    - etto
 
 # Spoken by the Lizard race.
 - type: language
   id: Draconic
-  obfuscateSyllables: true
-  replacement:
-  - za
-  - az
-  - ze
-  - ez
-  - zi
-  - iz
-  - zo
-  - oz
-  - zu
-  - uz
-  - zs
-  - sz
-  - ha
-  - ah
-  - he
-  - eh
-  - hi
-  - ih
-  - ho
-  - oh
-  - hu
-  - uh
-  - hs
-  - sh
-  - la
-  - al
-  - le
-  - el
-  - li
-  - il
-  - lo
-  - ol
-  - lu
-  - ul
-  - ls
-  - sl
-  - ka
-  - ak
-  - ke
-  - ek
-  - ki
-  - ik
-  - ko
-  - ok
-  - ku
-  - uk
-  - ks
-  - sk
-  - sa
-  - as
-  - se
-  - es
-  - si
-  - is
-  - so
-  - os
-  - su
-  - us
-  - ss
-  - ss
-  - ra
-  - ar
-  - re
-  - er
-  - ri
-  - ir
-  - ro
-  - or
-  - ru
-  - ur
-  - rs
-  - sr
-  - a
-  - a
-  - e
-  - e
-  - i
-  - i
-  - o
-  - o
-  - u
-  - u
-  - s
-  - s
+  color: "#228b22"
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 2
+    maxSyllables: 4
+    replacement:
+    - za
+    - az
+    - ze
+    - ez
+    - zi
+    - iz
+    - zo
+    - oz
+    - zu
+    - uz
+    - zs
+    - sz
+    - ha
+    - ah
+    - he
+    - eh
+    - hi
+    - ih
+    - ho
+    - oh
+    - hu
+    - uh
+    - hs
+    - sh
+    - la
+    - al
+    - le
+    - el
+    - li
+    - il
+    - lo
+    - ol
+    - lu
+    - ul
+    - ls
+    - sl
+    - ka
+    - ak
+    - ke
+    - ek
+    - ki
+    - ik
+    - ko
+    - ok
+    - ku
+    - uk
+    - ks
+    - sk
+    - sa
+    - as
+    - se
+    - es
+    - si
+    - is
+    - so
+    - os
+    - su
+    - us
+    - ss
+    - ss
+    - ra
+    - ar
+    - re
+    - er
+    - ri
+    - ir
+    - ro
+    - or
+    - ru
+    - ur
+    - rs
+    - sr
+    - a
+    - a
+    - e
+    - e
+    - i
+    - i
+    - o
+    - o
+    - u
+    - u
+    - s
+    - s
 
 # Spoken by the Vulpkanin race.
 - type: language
   id: Canilunzt
-  obfuscateSyllables: true
-  replacement:
-  - rur
-  - ya
-  - cen
-  - rawr
-  - bar
-  - kuk
-  - tek
-  - qat
-  - uk
-  - wu
-  - vuh
-  - tah
-  - tch
-  - schz
-  - auch
-  - ist
-  - ein
-  - entch
-  - zwichs
-  - tut
-  - mir
-  - wo
-  - bis
-  - es
-  - vor
-  - nic
-  - gro
-  - lll
-  - enem
-  - zandt
-  - tzch
-  - noch
-  - hel
-  - ischt
-  - far
-  - wa
-  - baram
-  - iereng
-  - tech
-  - lach
-  - sam
-  - mak
-  - lich
-  - gen
-  - or
-  - ag
-  - eck
-  - gec
-  - stag
-  - onn
-  - bin
-  - ket
-  - jarl
-  - vulf
-  - einech
-  - cresthz
-  - azunein
-  - ghzth
+  color: "#b97a57"
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 4
+    replacement:
+    - rur
+    - ya
+    - cen
+    - rawr
+    - bar
+    - kuk
+    - tek
+    - qat
+    - uk
+    - wu
+    - vuh
+    - tah
+    - tch
+    - schz
+    - auch
+    - ist
+    - ein
+    - entch
+    - zwichs
+    - tut
+    - mir
+    - wo
+    - bis
+    - es
+    - vor
+    - nic
+    - gro
+    - enem
+    - zandt
+    - tzch
+    - noch
+    - hel
+    - ischt
+    - far
+    - wa
+    - baram
+    - iereng
+    - tech
+    - lach
+    - sam
+    - mak
+    - lich
+    - gen
+    - or
+    - ag
+    - eck
+    - gec
+    - stag
+    - onn
+    - bin
+    - ket
+    - jarl
+    - vulf
+    - einech
+    - cresthz
+    - azunein
+    - ghzth
 
 # The common language of the Sol system.
 - type: language
   id: SolCommon
-  obfuscateSyllables: true
-  replacement:
-  - tao
-  - shi
-  - tzu
-  - yi
-  - com
-  - be
-  - is
-  - i
-  - op
-  - vi
-  - ed
-  - lec
-  - mo
-  - cle
-  - te
-  - dis
-  - e
+  color: "#8282fb"
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 4
+    replacement:
+    - tao
+    - shi
+    - tzu
+    - yi
+    - com
+    - be
+    - is
+    - i
+    - op
+    - vi
+    - ed
+    - lec
+    - mo
+    - cle
+    - te
+    - dis
+    - e
 
 - type: language
   id: RobotTalk
-  obfuscateSyllables: true
-  replacement:
-  - 0
-  - 1
-  - 01
-  - 10
-  - 001
-  - 100
-  - 011
-  - 110
-  - 101
-  - 010
+  fontId: Monospace
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 10 # Crazy
+    replacement:
+    - 0
+    - 1
 
 # Languages spoken by various critters.
 - type: language
   id: Cat
-  obfuscateSyllables: true
-  replacement:
-  - murr
-  - meow
-  - purr
-  - mrow
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 2
+    replacement:
+    - murr
+    - meow
+    - purr
+    - mrow
 
 - type: language
   id: Dog
-  obfuscateSyllables: true
-  replacement:
-  - woof
-  - bark
-  - ruff
-  - bork
-  - raff
-  - garr
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 2
+    replacement:
+    - woof
+    - bark
+    - ruff
+    - bork
+    - raff
+    - garr
 
 - type: language
   id: Fox
-  obfuscateSyllables: true
-  replacement:
-  - bark
-  - gecker
-  - ruff
-  - raff
-  - garr
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 2
+    replacement:
+    - ruff
+    - raff
+    - garr
+    - yip
+    - yap
+    - myah
 
 - type: language
   id: Xeno
-  obfuscateSyllables: true
-  replacement:
-  - sss
-  - sSs
-  - SSS
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 8 # I was crazy once
+    replacement:
+    - s
+    - S
 
 - type: language
   id: Monkey
-  obfuscateSyllables: true
-  replacement:
-  - ok
-  - ook
-  - oook
-  - ooook
-  - oooook
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 8 # They locked me in a room...
+    replacement:
+    - o
+    - k
 
 - type: language
   id: Mouse
-  obfuscateSyllables: true
-  replacement:
-  - Squeak
-  - Piep
-  - Chuu
-  - Eeee
-  - Pip
-  - Fwiep
-  - Heep
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 2
+    maxSyllables: 3
+    replacement:
+    - squ
+    - eak
+    - pi
+    - ep
+    - chuu
+    - ee
+    - fwi
+    - he
 
 - type: language
   id: Chicken
-  obfuscateSyllables: true
-  replacement:
-  - Coo
-  - Coot
-  - Cooot
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - co
+    - coo
+    - ot
 
 - type: language
   id: Duck
-  obfuscateSyllables: true
-  replacement:
-  - Quack
-  - Quack quack
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - qu
+    - ack
+    - quack
 
 - type: language
   id: Cow
-  obfuscateSyllables: true
-  replacement:
-  - Moo
-  - Mooo
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - moo
+    - mooo
 
 - type: language
   id: Sheep
-  obfuscateSyllables: true
-  replacement:
-  - Ba
-  - Baa
-  - Baaa
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - ba
+    - baa
+    - aa
 
 - type: language
   id: Kangaroo
-  obfuscateSyllables: true
-  replacement:
-  - Shreak
-  - Chuu
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - shre
+    - ack
+    - chuu
+    - choo
 
 - type: language
   id: Pig
-  obfuscateSyllables: true
-  replacement:
-  - Oink
-  - Oink oink
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - oink # Please someone come up with something better
 
 - type: language
   id: Crab
-  obfuscateSyllables: true
-  replacement:
-  - Click
-  - Click-clack
-  - Clack
-  - Tipi-tap
-  - Clik-tap
-  - Cliliick
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 1
+    maxSyllables: 3
+    replacement:
+    - click
+    - clack
+    - ti
+    - pi
+    - tap
+    - cli
+    - ick
 
 - type: language
   id: Kobold
-  obfuscateSyllables: true
-  replacement:
-  - Yip
-  - Grrar.
-  - Yap
-  - Bip
-  - Screet
-  - Gronk
-  - Hiss
-  - Eeee
-  - Yip
+  obfuscation:
+    !type:SyllableObfuscation
+    minSyllables: 2
+    maxSyllables: 4
+    replacement:
+    - yip
+    - yap
+    - gar
+    - grr
+    - ar
+    - scre
+    - et
+    - gronk
+    - hiss
+    - ss
+    - ee
diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
index 5e88006fcee..6dcce11d09f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/medical.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -9,6 +9,8 @@
         - MedicalDoctor
         - Paramedic
         - ChiefMedicalOfficer
+        - MedicalIntern
+        - Chemist
   items:
     - ClothingHandsGlovesNitrile
 
@@ -35,6 +37,7 @@
       jobs:
         - MedicalDoctor
         - ChiefMedicalOfficer
+        - MedicalIntern
   items:
     - ClothingNeckStethoscope
 
@@ -47,6 +50,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
   items:
     - UniformScrubsColorBlue
 
@@ -59,6 +65,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
   items:
     - UniformScrubsColorGreen
 
@@ -71,9 +80,85 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
   items:
     - UniformScrubsColorPurple
 
+- type: loadout
+  id: LoadoutMedicalUniformScrubsCyan
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - UniformScrubsColorCyan
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsBlack
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - UniformScrubsColorBlack
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsPink
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - UniformScrubsColorPink
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsCybersun
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+  items:
+    - UniformScrubsColorCybersun
+
+- type: loadout
+  id: LoadoutMedicalOuterCybersunWindbreaker
+  category: Jobs
+  cost: 5
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+  items:
+    - ClothingOuterCoatCybersunWindbreaker
+
 - type: loadout
   id: LoadoutMedicalOuterLabcoatChem
   category: Jobs
@@ -130,6 +215,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - ChiefMedicalOfficer
     - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
@@ -151,6 +239,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - ChiefMedicalOfficer
     - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
@@ -184,6 +275,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - ChiefMedicalOfficer
     - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
@@ -195,3 +289,173 @@
       min: 216000 # 60 hours
   items:
     - ClothingHeadHatBeretSeniorPhysician
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapBlue
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapPurple
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapPurple
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapGreen
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapGreen
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapCyan
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapCyan
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapBlack
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapBlack
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapPink
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapPink
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapWhite
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapWhite
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapCybersun
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+  items:
+    - ClothingHeadHatSurgcapCybersun
+
+- type: loadout
+  id: LoadoutMedicalEyesHudMedical
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Paramedic
+        - ChiefMedicalOfficer
+        - MedicalIntern
+        - Brigmedic
+  items:
+    - ClothingEyesHudMedical
+
+- type: loadout
+  id: LoadoutMedicalEyesEyepatchHudMedical
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Paramedic
+        - ChiefMedicalOfficer
+        - MedicalIntern
+        - Brigmedic
+  items:
+    - ClothingEyesEyepatchHudMedical
+
+- type: loadout
+  id: LoadoutMedicalEyesHudMedicalPrescription
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Paramedic
+        - ChiefMedicalOfficer
+        - MedicalIntern
+        - Brigmedic
+    - !type:CharacterTraitRequirement
+      traits:
+        - Nearsighted
+  items:
+    - ClothingEyesPrescriptionMedHud
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index ad6f02e589e..b9c815a15b0 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -84,3 +84,59 @@
         - ResearchDirector
   items:
     - ClothingHeadHatBeretRND
+
+- type: loadout
+  id: LoadoutScienceEyesHudDiagnostic
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+  items:
+    - ClothingEyesHudDiagnostic
+
+- type: loadout
+  id: LoadoutScienceEyesEyepatchHudDiag
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+  items:
+    - ClothingEyesEyepatchHudDiag
+
+## Robes
+- type: loadout
+  id: LoadoutOuterRobeTechPriest
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterRobeTechPriest
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+
+- type: loadout
+  id: LoadoutHeadHoodTechPriest
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadTechPriest
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index ecf7e4893a2..e6a6693ec18 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -1,7 +1,22 @@
+## Uniforms
 - type: loadout
-  id: LoadoutSecurityUniformGrey
+  id: LoadoutSecurityUniformJumpsuitBlue
   category: Jobs
-  cost: 2
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+  items:
+    - ClothingUniformJumpsuitSecBlue
+
+- type: loadout
+  id: LoadoutSecurityUniformJumpsuitGrey
+  category: Jobs
+  cost: 1
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -12,6 +27,34 @@
   items:
     - ClothingUniformJumpsuitSecGrey
 
+- type: loadout
+  id: LoadoutSecurityUniformJumpskirtGrey
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+  items:
+    - ClothingUniformJumpskirtSecGrey
+
+- type: loadout
+  id: LoadoutSecurityUniformJumpskirtBlue
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+  items:
+    - ClothingUniformJumpskirtSecBlue
+
 - type: loadout
   id: LoadoutSecurityUniformJumpskirtSenior
   category: Jobs
@@ -60,6 +103,108 @@
   items:
     - ClothingUniformJumpsuitSeniorOfficer
 
+- type: loadout
+  id: LoadoutUniformJumpsuitWardenBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpsuitWardenBlue
+
+- type: loadout
+  id: LoadoutUniformJumpsuitWardenGrey
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpsuitWardenGrey
+
+- type: loadout
+  id: LoadoutUniformJumpskirtWardenBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpskirtWardenBlue
+
+- type: loadout
+  id: LoadoutUniformJumpskirtWardenGrey
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpskirtWardenGrey
+
+- type: loadout
+  id: LoadoutUniformJumpskirtHoSBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpskirtHoSBlue
+
+- type: loadout
+  id: LoadoutUniformJumpskirtHoSGrey
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpskirtHoSGrey
+
+- type: loadout
+  id: LoadoutUniformJumpsuitSecFormal
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Detective
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpsuitSecFormal
+
+- type: loadout
+  id: LoadoutUniformJumpsuitSecSummer
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Detective
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpsuitSecSummer
+## Mask
 - type: loadout
   id: LoadoutSecurityMaskGasSwat
   category: Jobs
@@ -73,6 +218,7 @@
   items:
     - ClothingMaskGasSwat
 
+## Shoes
 - type: loadout
   id: LoadoutSecurityShoesJackboots
   category: Jobs
@@ -87,3 +233,119 @@
         - HeadOfSecurity
   items:
     - ClothingShoesBootsJack
+
+## Eyes
+- type: loadout
+  id: LoadoutSecurityEyesHudSecurity
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingEyesHudSecurity
+
+- type: loadout
+  id: LoadoutSecurityEyesEyepatchHudSecurity
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingEyesEyepatchHudSecurity
+
+- type: loadout
+  id: LoadoutSecurityEyesHudSecurityPrescription
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+    - !type:CharacterTraitRequirement
+      traits:
+        - Nearsighted
+  items:
+    - ClothingEyesPrescriptionHudSecurity
+
+## Head
+- type: loadout
+  id: LoadoutSecurityHeadHatBeret
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingHeadHatBeretSecurity
+
+- type: loadout
+  id: LoadoutSecurityHeadHelmetInsulated
+  category: Jobs
+  cost: 3
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingHeadHelmetInsulated
+
+## Belt
+- type: loadout
+  id: LoadoutSecurityBeltWebbing
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Detective
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+        - HeadOfSecurity
+  items:
+    - ClothingBeltSecurityWebbingFilled
+
+## Species
+#- type: loadout ##Uncomment this and reassess points when we can make it replace the secoff duty pistol
+#  id: LoadoutSecurityEquipmentTruncheon
+#  category: Jobs
+#  cost: 8 ## TODO: Make this replace the secoff handgun, and thus also make it cheaper
+#  requirements:
+#    - !type:CharacterJobRequirement
+#      jobs:
+#        - SecurityOfficer
+#        - Warden
+#        - HeadOfSecurity
+#        - Brigmedic
+#    - !type:CharacterPlaytimeRequirement
+#      tracker: JobSecurityOfficer
+#      min: 36000 # 10 hours
+#    - !type:CharacterSpeciesRequirement
+#      species: Oni
+#  items:
+#    - Truncheon
diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml
index 6ef3c3ad485..ed6107db9e9 100644
--- a/Resources/Prototypes/Loadouts/Jobs/service.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/service.yml
@@ -1,3 +1,4 @@
+## Clown
 - type: loadout
   id: LoadoutServiceClownOutfitJester
   category: Jobs
@@ -26,6 +27,7 @@
     - ClothingHeadHatJesterAlt
     - ClothingShoesJester
 
+## Bartender
 - type: loadout
   id: LoadoutServiceBartenderUniformPurple
   category: Jobs
@@ -38,6 +40,7 @@
   items:
     - ClothingUniformJumpsuitBartenderPurple
 
+## Botanist
 - type: loadout
   id: LoadoutServiceBotanistUniformOveralls
   category: Jobs
@@ -50,6 +53,7 @@
   items:
     - ClothingUniformOveralls
 
+## Lawyer
 - type: loadout
   id: LoadoutServiceLawyerUniformBlueSuit
   category: Jobs
@@ -158,6 +162,7 @@
   items:
     - ClothingUniformJumpsuitJournalist
 
+## Reporter
 - type: loadout
   id: LoadoutServiceReporterUniformDetectivesuit
   category: Jobs
@@ -181,3 +186,15 @@
         - Reporter
   items:
     - ClothingUniformJumpskirtDetective
+
+## Musician
+- type: loadout
+  id: LoadoutItemSynthesizerInstrument
+  category: Jobs
+  cost: 8
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Musician
+  items:
+    - SynthesizerInstrument
diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
index a4381941acc..20bf38efa99 100644
--- a/Resources/Prototypes/Loadouts/categories.yml
+++ b/Resources/Prototypes/Loadouts/categories.yml
@@ -4,7 +4,13 @@
   id: Uncategorized
 
 - type: loadoutCategory
-  id: Accessories
+  id: Eyes
+
+- type: loadoutCategory
+  id: Hands
+
+- type: loadoutCategory
+  id: Head
 
 - type: loadoutCategory
   id: Items
@@ -12,8 +18,14 @@
 - type: loadoutCategory
   id: Jobs
 
+- type: loadoutCategory
+  id: Neck
+
 - type: loadoutCategory
   id: Outer
 
+- type: loadoutCategory
+  id: Shoes
+
 - type: loadoutCategory
   id: Uniform
diff --git a/Resources/Prototypes/Loadouts/eyes.yml b/Resources/Prototypes/Loadouts/eyes.yml
index a7a8cbd7736..74226604e92 100644
--- a/Resources/Prototypes/Loadouts/eyes.yml
+++ b/Resources/Prototypes/Loadouts/eyes.yml
@@ -1,13 +1,21 @@
 - type: loadout
   id: LoadoutEyesEyepatch
-  category: Accessories
+  category: Eyes
   cost: 1
   items:
     - ClothingEyesEyepatch
 
 - type: loadout
   id: LoadoutEyesBlindfold
-  category: Accessories
+  category: Eyes
   cost: 2
   items:
     - ClothingEyesBlindfold
+
+- type: loadout
+  id: LoadoutItemSunglasses
+  category: Eyes
+  cost: 5
+  exclusive: true
+  items:
+    - ClothingEyesGlassesSunglasses
diff --git a/Resources/Prototypes/Loadouts/hands.yml b/Resources/Prototypes/Loadouts/hands.yml
new file mode 100644
index 00000000000..3604678d387
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/hands.yml
@@ -0,0 +1,115 @@
+- type: loadout
+  id: LoadoutHandsColorPurple
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorPurple
+
+- type: loadout
+  id: LoadoutHandsColorRed
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorRed
+
+- type: loadout
+  id: LoadoutHandsColorBlack
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorBlack
+
+- type: loadout
+  id: LoadoutHandsColorBlue
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorBlue
+
+- type: loadout
+  id: LoadoutHandsColorBrown
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorBrown
+
+- type: loadout
+  id: LoadoutHandsColorGray
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorGray
+
+- type: loadout
+  id: LoadoutHandsColorGreen
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorGreen
+
+- type: loadout
+  id: LoadoutHandsColorLightBrown
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorLightBrown
+
+- type: loadout
+  id: LoadoutHandsColorOrange
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorOrange
+
+- type: loadout
+  id: LoadoutHandsColorWhite
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorWhite
+
+- type: loadout
+  id: LoadoutHandsColorYellowBudget
+  category: Hands
+  cost: 4
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
+  items:
+    - ClothingHandsGlovesColorYellowBudget
+
+- type: loadout
+  id: LoadoutHandsGlovesLeather
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesLeather
+
+- type: loadout
+  id: LoadoutHandsGlovesPowerglove
+  category: Hands
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHandsGlovesPowerglove
+
+- type: loadout
+  id: LoadoutHandsGlovesRobohands
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesRobohands
diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml
index 33a2f0b19bc..25cb4dadf11 100644
--- a/Resources/Prototypes/Loadouts/head.yml
+++ b/Resources/Prototypes/Loadouts/head.yml
@@ -1,125 +1,273 @@
+## Hats
 - type: loadout
   id: LoadoutHeadBeaverHat
-  category: Accessories
+  category: Head
   cost: 2
+  exclusive: true
   items:
     - ClothingHeadHatBeaverHat
 
 - type: loadout
   id: LoadoutHeadTophat
-  category: Accessories
+  category: Head
   cost: 2
+  exclusive: true
   items:
     - ClothingHeadHatTophat
 
+- type: loadout
+  id: LoadoutHeadFedoraBlack
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFedoraBlack
+
+- type: loadout
+  id: LoadoutHeadFedoraChoc
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFedoraChoc
+
+- type: loadout
+  id: LoadoutHeadFedoraWhite
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFedoraWhite
+
+- type: loadout
+  id: LoadoutHeadFlatBlack
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFlatBlack
+
+- type: loadout
+  id: LoadoutHeadFlatBrown
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFlatBrown
+
+- type: loadout
+  id: LoadoutHeadTinfoil
+  category: Head
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingHeadTinfoil
+
+- type: loadout
+  id: LoadoutHeadBellhop
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatBellhop
+## Color Hats
 - type: loadout
   id: LoadoutHeadHatBluesoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatBluesoft
 
 - type: loadout
   id: LoadoutHeadHatBluesoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatBluesoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatCorpsoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatCorpsoft
 
 - type: loadout
   id: LoadoutHeadHatCorpsoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatCorpsoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatGreensoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreensoft
 
 - type: loadout
   id: LoadoutHeadHatGreensoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreensoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatGreysoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreysoft
 
 - type: loadout
   id: LoadoutHeadHatGreysoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreysoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatOrangesoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatOrangesoft
 
 - type: loadout
   id: LoadoutHeadHatOrangesoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatOrangesoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatPurplesoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatPurplesoft
 
 - type: loadout
   id: LoadoutHeadHatPurplesoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatPurplesoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatRedsoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatRedsoft
 
 - type: loadout
   id: LoadoutHeadHatRedsoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatRedsoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatYellowsoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatYellowsoft
 
 - type: loadout
   id: LoadoutHeadHatYellowsoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatYellowsoftFlipped
+
+## Headbands
+- type: loadout
+  id: LoadoutHeadBandBlack
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandBlack
+
+- type: loadout
+  id: LoadoutHeadBandBlue
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandBlue
+
+- type: loadout
+  id: LoadoutHeadBandGold
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandGold
+
+- type: loadout
+  id: LoadoutHeadBandGreen
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandGreen
+
+- type: loadout
+  id: LoadoutHeadBandGrey
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandGrey
+
+- type: loadout
+  id: LoadoutHeadBandRed
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandRed
+
+- type: loadout
+  id: LoadoutHeadBandSkull
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandSkull
+
+- type: loadout
+  id: LoadoutHeadBandMerc
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadBandMerc
+
+- type: loadout
+  id: LoadoutHeadBandBrown
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandBrown
diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml
index 6ce8d260613..072061d2e28 100644
--- a/Resources/Prototypes/Loadouts/items.yml
+++ b/Resources/Prototypes/Loadouts/items.yml
@@ -1,3 +1,4 @@
+#Smokes
 - type: loadout
   id: LoadoutItemCig
   category: Items
@@ -34,11 +35,18 @@
     - CigPackBlack
 
 - type: loadout
-  id: LoadoutItemPAI
+  id: LoadoutItemCigsMixed
   category: Items
   cost: 3
   items:
-    - PersonalAI
+    - CigPackMixed
+
+- type: loadout
+  id: LoadoutItemCigsSyndicate
+  category: Items
+  cost: 4
+  items:
+    - CigPackSyndicate
 
 - type: loadout
   id: LoadoutItemLighter
@@ -61,30 +69,138 @@
   items:
     - Matchbox
 
+## Instruments
 - type: loadout
-  id: LoadoutItemPlushieSharkBlue
+  id: LoadoutItemMicrophoneInstrument
   category: Items
-  cost: 2
+  cost: 4
   items:
-    - PlushieSharkBlue
+    - MicrophoneInstrument
 
 - type: loadout
-  id: LoadoutItemPlushieSharkPink
+  id: LoadoutItemKalimbaInstrument
   category: Items
-  cost: 2
+  cost: 4
+  items:
+    - KalimbaInstrument
+
+- type: loadout
+  id: LoadoutItemTrumpetInstrument
+  category: Items
+  cost: 6
+  items:
+    - TrumpetInstrument
+
+- type: loadout
+  id: LoadoutItemElectricGuitar
+  category: Items
+  cost: 7
+  items:
+    - ElectricGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemBassGuitar
+  category: Items
+  cost: 7
+  items:
+    - BassGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemRockGuitar
+  category: Items
+  cost: 7
+  items:
+    - RockGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemAcousticGuitar
+  category: Items
+  cost: 7
+  items:
+    - AcousticGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemViolin
+  category: Items
+  cost: 6
+  items:
+    - ViolinInstrument
+
+- type: loadout
+  id: LoadoutItemHarmonica
+  category: Items
+  cost: 3
+  items:
+    - HarmonicaInstrument
+
+- type: loadout
+  id: LoadoutItemAccordion
+  category: Items
+  cost: 6
+  items:
+    - AccordionInstrument
+
+- type: loadout
+  id: LoadoutItemFlute
+  category: Items
+  cost: 4
   items:
-    - PlushieSharkPink
+    - FluteInstrument
 
 - type: loadout
-  id: LoadoutItemPlushieSharkGrey
+  id: LoadoutItemOcarina
+  category: Items
+  cost: 3
+  items:
+    - OcarinaInstrument
+
+# Survival Kit
+- type: loadout
+  id: LoadoutItemsEmergencyOxygenTank
+  category: Items
+  cost: 1
+  items:
+    - EmergencyOxygenTankFilled
+
+- type: loadout
+  id: LoadoutItemsExtendedEmergencyOxygenTank
   category: Items
   cost: 2
   items:
-    - PlushieSharkGrey
+    - ExtendedEmergencyOxygenTankFilled
+
+- type: loadout
+  id: LoadoutItemsDoubleEmergencyOxygenTank
+  category: Items
+  cost: 4
+  items:
+    - DoubleEmergencyOxygenTankFilled
+
+- type: loadout
+  id: LoadoutItemsEmergencyCrowbar
+  category: Items
+  cost: 3
+  items:
+    - CrowbarRed
 
+#Misc Items
 - type: loadout
-  id: LoadoutItemPlushieCarp
+  id: LoadoutItemPAI
+  category: Items
+  cost: 3
+  items:
+    - PersonalAI
+
+- type: loadout
+  id: LoadoutItemWaistbag
   category: Items
   cost: 2
   items:
-    - PlushieCarp
+    - ClothingBeltStorageWaistbag
+
+- type: loadout
+  id: LoadoutSolCommonTranslator
+  category: Items
+  cost: 3
+  items:
+    - SolCommonTranslator
diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml
index 7e5526f966a..eb933de29ee 100644
--- a/Resources/Prototypes/Loadouts/neck.yml
+++ b/Resources/Prototypes/Loadouts/neck.yml
@@ -1,27 +1,104 @@
 - type: loadout
   id: LoadoutNeckScarfStripedRed
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedRed
 
 - type: loadout
   id: LoadoutNeckScarfStripedBlue
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedBlue
 
 - type: loadout
   id: LoadoutNeckScarfStripedGreen
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedGreen
 
 - type: loadout
   id: LoadoutNeckScarfStripedZebra
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedZebra
+
+#Pride Accessories
+- type: loadout
+  id: LoadoutItemsPrideLGBTPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckLGBTPin
+
+- type: loadout
+  id: LoadoutItemsPrideAromanticPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckAromanticPin
+
+- type: loadout
+  id: LoadoutItemsPrideAsexualPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckAsexualPin
+
+- type: loadout
+  id: LoadoutItemsPrideBisexualPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckBisexualPin
+
+- type: loadout
+  id: LoadoutItemsPrideIntersexPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckIntersexPin
+
+- type: loadout
+  id: LoadoutItemsPrideLesbianPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckLesbianPin
+
+- type: loadout
+  id: LoadoutItemsPrideNonBinaryPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckNonBinaryPin
+
+- type: loadout
+  id: LoadoutItemsPridePansexualPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckPansexualPin
+
+- type: loadout
+  id: LoadoutItemsPrideTransPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckTransPin
diff --git a/Resources/Prototypes/Loadouts/outerClothing.yml b/Resources/Prototypes/Loadouts/outerClothing.yml
index 078cf530ba2..a5932214ce9 100644
--- a/Resources/Prototypes/Loadouts/outerClothing.yml
+++ b/Resources/Prototypes/Loadouts/outerClothing.yml
@@ -1,10 +1,3 @@
-- type: loadout
-  id: LoadoutOuterGhostSheet
-  category: Outer
-  cost: 2
-  items:
-    - ClothingOuterGhostSheet
-
 - type: loadout
   id: LoadoutOuterCoatBomberjacket
   category: Outer
@@ -33,6 +26,72 @@
   items:
     - ClothingOuterWinterCoat
 
+- type: loadout
+  id: LoadoutOuterCoatHyenhSweater
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatHyenhSweater
+
+- type: loadout
+  id: LoadoutOuterWinterCoatLong
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterWinterCoatLong
+
+- type: loadout
+  id: LoadoutOuterWinterCoatPlaid
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterWinterCoatPlaid
+
+- type: loadout
+  id: LoadoutOuterVestValet
+  category: Outer
+  cost: 1
+  items:
+    - ClothingOuterVestValet
+
+## Letterman Jackets
+- type: loadout
+  id: LoadoutOuterCoatLettermanBlue
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatLettermanBlue
+
+- type: loadout
+  id: LoadoutOuterCoatLettermanRed
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatLettermanRed
+
+## MNK
+- type: loadout
+  id: LoadoutOuterCoatMNKWhiteHoodie
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatMNKWhiteHoodie
+
+- type: loadout
+  id: LoadoutOuterCoatMNKBlackTopCoat
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatMNKBlackTopCoat
+
+- type: loadout
+  id: LoadoutOuterCoatMNKBlackJacket
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatMNKBlackJacket
+
+## Contractor Jackets
 - type: loadout
   id: LoadoutOuterCorporateJacket
   category: Outer
diff --git a/Resources/Prototypes/Loadouts/shoes.yml b/Resources/Prototypes/Loadouts/shoes.yml
index 4a1880b5e21..3c2e21e631b 100644
--- a/Resources/Prototypes/Loadouts/shoes.yml
+++ b/Resources/Prototypes/Loadouts/shoes.yml
@@ -1,7 +1,7 @@
 # Colored
 - type: loadout
   id: LoadoutShoesBlack
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -9,7 +9,7 @@
 
 - type: loadout
   id: LoadoutShoesBlue
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -17,7 +17,7 @@
 
 - type: loadout
   id: LoadoutShoesBrown
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -25,7 +25,7 @@
 
 - type: loadout
   id: LoadoutShoesGreen
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -33,7 +33,7 @@
 
 - type: loadout
   id: LoadoutShoesOrange
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -41,7 +41,7 @@
 
 - type: loadout
   id: LoadoutShoesPurple
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -49,7 +49,7 @@
 
 - type: loadout
   id: LoadoutShoesRed
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -57,7 +57,7 @@
 
 - type: loadout
   id: LoadoutShoesWhite
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -65,25 +65,93 @@
 
 - type: loadout
   id: LoadoutShoesYellow
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
     - ClothingShoesColorYellow
 
+- type: loadout
+  id: LoadoutShoesGeta
+  category: Shoes
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesGeta
+
+## Boots
+- type: loadout
+  id: LoadoutShoesBootsWork
+  category: Shoes
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesBootsWork
+
+- type: loadout
+  id: LoadoutShoesBootsLaceup
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsLaceup
+
+- type: loadout
+  id: LoadoutShoesBootsWinter
+  category: Shoes
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesBootsWinter
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyBrown
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyBrown
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyBlack
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyBlack
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyWhite
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyWhite
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyFancy
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyFancy
 
 # Miscellaneous
 - type: loadout
   id: LoadoutShoesSlippersDuck
-  category: Accessories
-  cost: 1
+  category: Shoes
+  cost: 2
   exclusive: true
   items:
     - ClothingShoeSlippersDuck
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Clown
 
 - type: loadout
   id: LoadoutShoesLeather
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -91,7 +159,7 @@
 
 - type: loadout
   id: LoadoutShoesMiscWhite
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
diff --git a/Resources/Prototypes/Loadouts/species.yml b/Resources/Prototypes/Loadouts/species.yml
new file mode 100644
index 00000000000..03dc4e5abc7
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/species.yml
@@ -0,0 +1,35 @@
+# - type: loadout
+  # id: LoadoutSpeciesEmergencyNitrogenTank
+  # category: Species
+  # cost: 0
+  # requirements:
+    # - !type:CharacterSpeciesRequirement
+      # species: SlimePerson
+    # - !type:CharacterSpeciesRequirement
+      # species: Vox
+  # items:
+    # - EmergencyNitrogenTankFilled
+
+# - type: loadout
+  # id: LoadoutSpeciesExtendedEmergencyNitrogenTank
+  # category: Species
+  # cost: 1
+  # requirements:
+    # - !type:CharacterSpeciesRequirement
+      # species: SlimePerson
+    # - !type:CharacterSpeciesRequirement
+      # species: Vox
+  # items:
+    # - ExtendedEmergencyNitrogenTankFilled
+
+# - type: loadout
+  # id: LoadoutSpeciesDoubleEmergencyNitrogenTank
+  # category: Species
+  # cost: 3
+  # requirements:
+    # - !type:CharacterSpeciesRequirement
+      # species: SlimePerson
+    # - !type:CharacterSpeciesRequirement
+      # species: Vox
+  # items:
+    # - DoubleEmergencyNitrogenTankFilled
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
index 5afdd303c0b..20c5b42c7c2 100644
--- a/Resources/Prototypes/Loadouts/uniform.yml
+++ b/Resources/Prototypes/Loadouts/uniform.yml
@@ -19,6 +19,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBlack
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBlack
@@ -27,6 +31,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBlack
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorBlue
@@ -35,6 +43,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBlue
@@ -43,6 +55,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorGreen
@@ -51,6 +67,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorGreen
@@ -59,6 +79,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorOrange
@@ -67,6 +91,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorOrange
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorOrange
@@ -75,6 +103,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorOrange
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorPink
@@ -83,6 +115,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorPink
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorPink
@@ -91,6 +127,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorPink
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorRed
@@ -99,6 +139,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorRed
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorRed
@@ -107,6 +151,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorRed
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorWhite
@@ -115,6 +163,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorWhite
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorWhite
@@ -123,6 +175,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorWhite
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorYellow
@@ -131,6 +187,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorYellow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorYellow
@@ -139,6 +199,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorYellow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorDarkBlue
@@ -147,6 +211,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorDarkBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorDarkBlue
@@ -155,6 +223,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorDarkBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorTeal
@@ -163,6 +235,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorTeal
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorTeal
@@ -171,6 +247,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorTeal
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorPurple
@@ -179,6 +259,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorPurple
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorPurple
@@ -187,6 +271,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorPurple
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorDarkGreen
@@ -195,6 +283,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorDarkGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorDarkGreen
@@ -203,6 +295,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorDarkGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorLightBrown
@@ -211,6 +307,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorLightBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorLightBrown
@@ -219,6 +319,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorLightBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorBrown
@@ -227,6 +331,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBrown
@@ -235,6 +343,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorMaroon
@@ -243,6 +355,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorMaroon
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorMaroon
@@ -251,11 +367,131 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorMaroon
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
+
+## Kendo
+- type: loadout
+  id: LoadoutUniformKendoHakama
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformKendoHakama
+
+- type: loadout
+  id: LoadoutUniformMartialGi
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformMartialGi
+
+## Kimono
+- type: loadout
+  id: LoadoutClothingKimonoBlue
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoBlue
+
+- type: loadout
+  id: LoadoutClothingKimonoPink
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoPink
+
+- type: loadout
+  id: LoadoutClothingKimonoPurple
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoPurple
+
+- type: loadout
+  id: LoadoutClothingKimonoSky
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoSky
+
+- type: loadout
+  id: LoadoutClothingKimonoGreen
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoGreen
 
+## Gakuran
 - type: loadout
-  id: LoadoutUniformJumpsuitColorRainbow
+  id: LoadoutUniformSchoolGakuranBlack
   category: Uniform
   cost: 2
   exclusive: true
   items:
-    - ClothingUniformColorRainbow
+    - ClothingUniformSchoolGakuranBlack
+
+## MNK Uniforms
+- type: loadout
+  id: LoadoutClothingMNKOfficeSkirt
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKOfficeSkirt
+
+- type: loadout
+  id: LoadoutClothingMNKUnderGarment
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKUnderGarment
+
+- type: loadout
+  id: LoadoutClothingMNKGymBra
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKGymBra
+
+- type: loadout
+  id: LoadoutClothingMNKDressBlack
+  category: Uniform
+  cost: 4
+  exclusive: true
+  items:
+    - ClothingUniformMNKDressBlack
+
+- type: loadout
+  id: LoadoutClothingMNKBlackOveralls
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKBlackOveralls
+
+- type: loadout
+  id: LoadoutClothingMNKBlackShoulder
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKBlackShoulder
+
+- type: loadout
+  id: LoadoutClothingMNKTracksuitBlack
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKTracksuitBlack
diff --git a/Resources/Prototypes/NPCs/Combat/melee.yml b/Resources/Prototypes/NPCs/Combat/melee.yml
index 2855fe1a65a..db459af4a7b 100644
--- a/Resources/Prototypes/NPCs/Combat/melee.yml
+++ b/Resources/Prototypes/NPCs/Combat/melee.yml
@@ -95,12 +95,11 @@
 # Tries to melee attack our target.
 - type: htnCompound
   id: MeleeAttackTargetCompound
-  preconditions:
-    - !type:KeyExistsPrecondition
-      key: Target
   branches:
-    # Move to melee range and hit them
-    - tasks:
+    - preconditions:
+      - !type:KeyExistsPrecondition
+        key: Target
+      tasks:
         - !type:HTNPrimitiveTask
           operator: !type:MoveToOperator
             shutdownState: PlanFinished
@@ -160,11 +159,11 @@
 
 - type: htnCompound
   id: MeleeAttackOrderedTargetCompound
-  preconditions:
-    - !type:KeyExistsPrecondition
-      key: Target
   branches:
-    - tasks:
+    - preconditions:
+      - !type:KeyExistsPrecondition
+        key: Target
+      tasks:
         - !type:HTNPrimitiveTask
           operator: !type:MoveToOperator
             shutdownState: PlanFinished
diff --git a/Resources/Prototypes/NPCs/honkbot.yml b/Resources/Prototypes/NPCs/honkbot.yml
new file mode 100644
index 00000000000..c9c925ac49d
--- /dev/null
+++ b/Resources/Prototypes/NPCs/honkbot.yml
@@ -0,0 +1,6 @@
+- type: htnCompound
+  id: HonkbotCompound
+  branches:
+    - tasks:
+        - !type:HTNCompoundTask
+          task: IdleCompound
diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
index e6e4bdc5a75..04002f5755d 100644
--- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml
+++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
@@ -156,24 +156,3 @@
     icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png
     event: !type:RemovePsionicInvisibilityOffPowerActionEvent
 
-- type: entity
-  id: ActionFabricateLollipop
-  name: action-name-fabricate-lollipop
-  description: action-description-fabricate-lollipop
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: { sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi, state: lollipop }
-    useDelay: 120
-    event: !type:FabricateLollipopActionEvent
-
-- type: entity
-  id: ActionFabricateGumball
-  name: action-name-fabricate-gumball
-  description: action-description-fabricate-gumball
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: { sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi, state: gumball }
-    useDelay: 40
-    event: !type:FabricateGumballActionEvent
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml
index 4610c0f68c8..d7d0b665381 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml
@@ -4,6 +4,6 @@
     sprite: Nyanotrasen/Objects/Consumable/Drinks/flaskholywater.rsi
     state: icon
   product: CrateHolyWaterKit
-  cost: 1000
+  cost: 3000
   category: Epistemics
   group: market
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml
index ae0df3d17c1..83044c1ad5e 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml
@@ -1,5 +1,5 @@
-- type: advertisementsPack
+- type: messagePack
   id: MailDrobeAds
-  advertisements:
+  messages:
     - advertisement-maildrobe-1
-    - advertisement-maildrobe-2
\ No newline at end of file
+    - advertisement-maildrobe-2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml
index c82dbffae86..0ef1a5a85a3 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml
@@ -54,7 +54,7 @@
     sprite: Nyanotrasen/Clothing/Uniforms/Costume/maid.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: ClothingCostumeBunnySuit
   name: bunny suit
   description: Ready to go with stockings and a bow tie.
@@ -89,10 +89,10 @@
     sprite: Nyanotrasen/Clothing/Uniforms/Jumpskirt/Decorskirt.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: ClothingCostumeNaota
   name: turquoise hoodie and shorts
-  description: A hoodie with a small kangaroo pouch. 
+  description: A hoodie with a small kangaroo pouch.
   components:
   - type: Sprite
     sprite: Nyanotrasen/Clothing/Uniforms/Costume/naota.rsi
@@ -113,7 +113,7 @@
     femaleMask: NoMask
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: ClothingUniformDressRed
   name: red dress
   description: A voluminous, fancy red dress.
@@ -125,7 +125,7 @@
     femaleMask: NoMask
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: ClothingUniformSwimsuitBlue
   name: blue swimsuit
   description: A form-fitting, hydrodynamic blue swimsuit.
@@ -358,7 +358,7 @@
     femaleMask: NoMask
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: ClothingUniformMNKUnderGarment
   name: MNK under garment
   description: MNK ensured comfort for the important bits.
@@ -369,7 +369,7 @@
     sprite: Nyanotrasen/Clothing/Misc/under_garments.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: ClothingUniformMNKGymBra
   name: MNK gym bra
   description: Maximum performance with MNK sweat blockers.
@@ -381,7 +381,7 @@
     femaleMask: NoMask
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: ClothingUniformMNKDressBlack
   name: MNK black dress
   description: A sleek black dress sporting a MNK window.
@@ -405,7 +405,7 @@
     femaleMask: NoMask
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
   id: ClothingUniformMNKBlackShoulder
   name: MNK exposed shoulders
   description: A MNK outfit with exposed shoulders.
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
index 59e3690b6bc..2f790f2ce1c 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
@@ -10,7 +10,7 @@
   - type: Sprite
     layers:
       - sprite: Objects/Misc/books.rsi
-        state: book6
+        state: book_icon
   - type: RandomSpawner
     offset: 0
     prototypes:
@@ -61,20 +61,20 @@
       - BookHowToSurvive
       - BookChemicalCompendium
       # Other Books
-      - BookEscalation
-      - BookEscalationSecurity
+      #- BookEscalation
+      #- BookEscalationSecurity
       - BookAtmosDistro
       - BookAtmosWaste
       - BookAtmosAirAlarms
       - BookAtmosVentsMore
       - BookRandom # The empty random book because why not
     chance: 0.9
-    rarePrototypes:
-      - BookChemistryInsane
-      - BookBotanicalTextbook
-      - BookGnominomicon
-      - BookFishing
-      - BookFishops # DeltaV - fishops book
-      - BookDetective
-      - BookSalvageEpistemics1 # Nyanotrasen - Epistemic Lore Book
-    rareChance: 0.25
+   # rarePrototypes:
+   #   - BookChemistryInsane
+   #   - BookBotanicalTextbook
+   #   - BookGnominomicon
+   #   - BookFishing
+   #   - BookFishops # DeltaV - fishops book
+   #   - BookDetective
+   #   - BookSalvageEpistemics1 # Nyanotrasen - Epistemic Lore Book
+   # rareChance: 0.25
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
index f0dd4709034..3ea45bf846c 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
@@ -19,7 +19,7 @@
         - ClothingHeadHatXmasCrown
         - ClothingHeadHelmetCosmonaut
         - ClothingHeadHelmetBasic
-        - ClothingHeadHelmetScaf
+        #- ClothingHeadHelmetScaf
         - ClothingHeadHelmetTemplar
         - ClothingHeadHelmetThunderdome
         - ClothingHeadHelmetFire
@@ -29,7 +29,7 @@
         - ClothingHeadHatHoodRad
         - ClothingHeadHatCake
         - ClothingHeadHatChickenhead
-        - ClothingHeadHatHairflower
+        #- ClothingHeadHatHairflower
         - ClothingHeadHatPumpkin
         - ClothingHeadHatRichard
         - ClothingHeadHatSkub
@@ -94,7 +94,7 @@
         - ClothingHeadFishCap
         - ClothingHeadRastaHat
         - ClothingHeadSafari
-        - ClothingHeadHatFlowerCrown
+        #- ClothingHeadHatFlowerCrown
         - ClothingHeadHatCone
         - ClothingHeadHatCasa
         - ClothingHeadHatBluesoft
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
index 91e40a8e607..9ef2331aa93 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
@@ -72,7 +72,7 @@
       - ChemistryEmptyBottle03
       - LargeBeaker
       - Syringe
-      - BodyBag_Folded
+      - BodyBagFolded
       - SprayBottle
       - SprayBottleWater
       - SprayBottleSpaceCleaner
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
index ab3f6f3d1c1..e93117b1aad 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml
@@ -35,7 +35,7 @@
         - MobLayer
   - type: Stamina
     critThreshold: 115
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - Nekomimetic
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index 5bc02461eed..285c7340b21 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -65,7 +65,7 @@
       Unsexed: MaleFelinid
   - type: Felinid
   - type: NoShoesSilentFootsteps
-  - type: LanguageSpeaker
+  - type: LanguageKnowledge
     speaks:
     - GalacticCommon
     - SolCommon
@@ -74,6 +74,11 @@
     - GalacticCommon
     - SolCommon
     - Nekomimetic
+  - type: Thieving
+    ignoreStripHidden: true
+    stealth: Subtle
+    stripTimeReduction: 0
+    stripTimeMultiplier: 0.667
 
 - type: entity
   save: false
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 ff9b3f8f2a0..94efc40530c 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml
@@ -5,9 +5,12 @@
   components:
   - type: Sprite
     layers:
-    - state: orange
-    - sprite: DeltaV/Objects/Misc/id_cards.rsi
-      state: nyanoprisoner
+    - state: prisoner
+    - state: department
+      color: "#292929"
+    - state: subdepartment
+      color: "#A54900"
+    - state: warden
   - type: PresetIdCard
     job: Prisoner
 
@@ -18,9 +21,12 @@
   components:
   - type: Sprite
     layers:
-    - state: orange
-    - sprite: DeltaV/Objects/Misc/id_cards.rsi
-      state: nyanogladiator
+    - state: default
+    - state: department
+      color: "#878787"
+    - state: subdepartment
+      color: "#878787"
+    - state: gladiator
   - type: PresetIdCard
     job: Gladiator
 
@@ -32,8 +38,11 @@
   - type: Sprite
     layers:
     - state: default
-    - sprite: DeltaV/Objects/Misc/id_cards.rsi
-      state: nyanoprisonguard
+    - state: department
+      color: "#CB0000"
+    - state: subdepartment
+      color: "#CB0000"
+    - state: prisonguard
   - type: PresetIdCard
     job: PrisonGuard
 
@@ -45,8 +54,11 @@
   - type: Sprite
     layers:
     - state: default
-    - sprite: DeltaV/Objects/Misc/id_cards.rsi
-      state: nyanomailcarrier
+    - state: department
+      color: "#B18644"
+    - state: subdepartment
+      color: "#B18644"
+    - state: mailcarrier
   - type: PresetIdCard
     job: MailCarrier
 
@@ -59,8 +71,11 @@
   - type: Sprite
     layers:
     - state: default
-    - sprite: DeltaV/Objects/Misc/id_cards.rsi
-      state: nyanomartialartist
+    - state: department
+      color: "#878787"
+    - state: subdepartment
+      color: "#878787"
+    - state: martialartist
   - type: PresetIdCard
     job: MartialArtist
 
@@ -69,10 +84,13 @@
   id: ForensicMantisIDCard
   name: psionic mantis ID card # DeltaV - Rename Forensic Mantis to Psionic Mantis
   components:
-    - type: Sprite
-      layers:
-        - state: default
-        - sprite: DeltaV/Objects/Misc/id_cards.rsi
-          state: nyanomantis
-    - type: PresetIdCard
-      job: ForensicMantis
+  - type: Sprite
+    layers:
+    - state: default
+    - state: department
+      color: "#C96DBF"
+    - state: subdepartment
+      color: "#C96DBF"
+    - state: detective
+  - type: PresetIdCard
+    job: ForensicMantis
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml
index e0761b7d40d..72f0cb741c7 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml
@@ -80,41 +80,41 @@
     contents:
     - id: BlockGameArcadeComputerCircuitboard
 
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailBooks
-  suffix: books
-  components:
-  - type: Mail
-    contents:
-      # Don't use BookDemonomiconRandom.
-      # It uses a RandomSpawner which just spawns the book outside of the mail.
-    - id: BookDemonomicon1
-      orGroup: Demonomicon
-    - id: BookDemonomicon2
-      orGroup: Demonomicon
-    - id: BookDemonomicon3
-      orGroup: Demonomicon
-      # There's no way to signal "spawn nothing" with an orGroup,
-      # so have this blank book instead. Write your own demon summoning tome!
-    - id: BookRandom
-      prob: 3
-      orGroup: Demonomicon
-    - id: BookChemistryInsane
-      prob: 0.10
-    - id: BookBotanicalTextbook
-      prob: 0.5
-    - id: BookFishing
-      prob: 0.10
-    - id: BookDetective
-      prob: 0.10
-    - id: BookGnominomicon
-      prob: 0.2
-    - id: BookFishops # DeltaV - fishops book
-      prob: 0.2
-    - id: BookSalvageEpistemics1
-      prob: 0.025
+#- type: entity
+#  noSpawn: true
+#  parent: BaseMail
+#  id: MailBooks
+#  suffix: books
+#  components:
+#  - type: Mail
+#    contents:
+#      # Don't use BookDemonomiconRandom.
+#      # It uses a RandomSpawner which just spawns the book outside of the mail.
+#    - id: BookDemonomicon1
+#      orGroup: Demonomicon
+#    - id: BookDemonomicon2
+#      orGroup: Demonomicon
+#    - id: BookDemonomicon3
+#      orGroup: Demonomicon
+#      # There's no way to signal "spawn nothing" with an orGroup,
+#      # so have this blank book instead. Write your own demon summoning tome!
+#    - id: BookRandom
+#      prob: 3
+#      orGroup: Demonomicon
+#    - id: BookChemistryInsane
+#      prob: 0.10
+#    - id: BookBotanicalTextbook
+#      prob: 0.5
+#    - id: BookFishing
+#      prob: 0.10
+#    - id: BookDetective
+#      prob: 0.10
+#    - id: BookGnominomicon
+#      prob: 0.2
+#    - id: BookFishops # DeltaV - fishops book
+#      prob: 0.2
+#    - id: BookSalvageEpistemics1
+#      prob: 0.025
 
 - type: entity
   noSpawn: true
@@ -408,19 +408,19 @@
     contents:
     - id: FlashlightLantern
 
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailFlowers
-  suffix: flowers
-  components:
-  - type: Mail
-    contents:
-    # TODO actual flowers
-    - id: ClothingHeadHatFlowerCrown
-      orGroup: Flower
-    - id: ClothingHeadHatHairflower
-      orGroup: Flower
+#- type: entity
+#  noSpawn: true
+#  parent: BaseMail
+#  id: MailFlowers
+#  suffix: flowers
+#  components:
+#  - type: Mail
+#    contents:
+#    # TODO actual flowers
+#    - id: ClothingHeadHatFlowerCrown
+#      orGroup: Flower
+#    - id: ClothingHeadHatHairflower
+#      orGroup: Flower
 
 - type: entity
   noSpawn: true
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Projectiles/shotgun.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Projectiles/shotgun.yml
index a3fcc86116a..293eba3aca0 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Projectiles/shotgun.yml
@@ -19,7 +19,7 @@
     solution: ammo
   - type: DrainableSolution
     solution: ammo
-  - type: SolutionInjectOnCollide
+  - type: SolutionInjectOnProjectileHit
     transferAmount: 15
     blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask
   - type: InjectableSolution
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Walls/walls.yml
index 0dc5c678198..12548299910 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Walls/walls.yml
@@ -92,4 +92,3 @@
   - type: Tag
     tags:
       - Wall
-      - RCDDeconstructWhitelist
diff --git a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
index f5626a0406f..8646ff643f3 100644
--- a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
+++ b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
@@ -5,9 +5,7 @@
   noSpawn: true
   components:
     - type: StationEvent
-      startAnnouncement: station-event-noospheric-storm-announcement
-      startAudio:
-        path: /Audio/Announcements/noosphericstorm.ogg
+      startAnnouncement: true
       weight: 5
       earliestStart: 15
     - type: NoosphericStormRule
diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml
index c43abbf8018..5645b17a67e 100644
--- a/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml
+++ b/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml
@@ -12,22 +12,6 @@
   products:
     Lean: 4
 
-- type: reaction
-  id: BahamaMama
-  reactants:
-    Rum:
-      amount: 1
-    Grenadine:
-      amount: 1
-    JuiceOrange:
-      amount: 1
-    JuicePineapple:
-      amount: 1
-    Ice:
-      amount: 1
-  products:
-      BahamaMama: 5
-
 - type: reaction
   id: OrangeCreamice
   reactants:
diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml
index 697a925d896..fa471f3d705 100644
--- a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml
@@ -2,72 +2,37 @@
 - type: emote
   id: Hiss
   category: Vocal
-  chatMessages: [hisses.]
+  chatMessages: [ hisses ]
   chatTriggers:
-    - hiss.
-    - hisses.
-    - hisses!
-    - hissing.
-    - hissed.
+    - hisses
 
 - type: emote
   id: Meow
   category: Vocal
-  chatMessages: [meows.]
+  chatMessages: [ meows ]
   chatTriggers:
-    - meow.
-    - meow!
-    - meows.
-    - meows~
-    - meows!
-    - meowing.
-    - meowed.
-    - miau.
-    - miaus.
-    - miaus!
-    - nya.
-    - nyas.
-    - nyas!
-    - mraow.
-    - mraow!
-    - mraow~
-    - mraows.
-    - mraows!
-    - mraows~
+    - meows
+    - miaus
+    - nyas
+    - mraows
 
 - type: emote
   id: Mew
   category: Vocal
-  chatMessages: [mews.]
+  chatMessages: [ mews ]
   chatTriggers:
-    - mew.
-    - mew!
-    - mew~
-    - mews.
-    - mews!
-    - mews~
-    - mewing.
-    - mewed.
+    - mews
 
 - type: emote
   id: Growl
   category: Vocal
-  chatMessages: [growls.]
+  chatMessages: [ growls ]
   chatTriggers:
-    - growl.
-    - growls.
-    - growls!
-    - growling.
-    - growled.
+    - growls
 
 - type: emote
   id: Purr
   category: Vocal
-  chatMessages: [purrs.]
+  chatMessages: [ purrs ]
   chatTriggers:
-    - purr.
-    - purrs.
-    - purrs~
-    - purrs!
-    - purring.
-    - purred.
+    - purrs
diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml
index b6c3d553df0..0495be29355 100644
--- a/Resources/Prototypes/Objectives/ninja.yml
+++ b/Resources/Prototypes/Objectives/ninja.yml
@@ -39,8 +39,8 @@
       sprite: Structures/Machines/server.rsi
       state: server
   - type: NumberObjective
-    min: 5
-    max: 10
+    min: 9
+    max: 13
     title: objective-condition-steal-research-title
   - type: StealResearchCondition
 
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index fba2c4cc172..f00641702a2 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -80,7 +80,6 @@
     TechnologyDiskStealCollectionObjective: 1        #rnd
     FigurineStealCollectionObjective: 0.3          #service
     IDCardsStealCollectionObjective: 1
-    CannabisStealCollectionObjective: 1
     LAMPStealCollectionObjective: 2 #only for moth
 
 - type: weightedRandom
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index 006c061666b..11e503d7940 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -55,13 +55,13 @@
   sprite:
     sprite: Objects/Consumable/Food/meat.rsi
     state: corgi
-    #
+
 - type: stealTargetGroup
   id: CaptainIDCard
   name: captain ID card
   sprite:
     sprite: Objects/Misc/id_cards.rsi
-    state: ert_commander #no one will know the difference.
+    state: gold
 
 - type: stealTargetGroup
   id: JetpackCaptainFilled
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index 18154850973..c320cb2db84 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -144,21 +144,21 @@
 
 
 
-- type: entity
-  noSpawn: true
-  parent: BaseThiefStealCollectionObjective
-  id: LAMPStealCollectionObjective
-  components:
-  - type: SpeciesRequirement
-    allowedSpecies:
-    - Moth
-  - type: StealCondition
-    stealGroup: LAMP
-    minCollectionSize: 1
-    maxCollectionSize: 10
-    verifyMapExistence: true
-  - type: Objective
-    difficulty: 0.5 # just for fun, collectings LAMP on Moth
+# - type: entity
+  # noSpawn: true
+  # parent: BaseThiefStealCollectionObjective
+  # id: LAMPStealCollectionObjective
+  # components:
+  # - type: SpeciesRequirement
+    # allowedSpecies:
+    # - Moth
+  # - type: StealCondition
+    # stealGroup: LAMP
+    # minCollectionSize: 1
+    # maxCollectionSize: 10
+    # verifyMapExistence: true
+  # - type: Objective
+    # difficulty: 0.5 # just for fun, collectings LAMP on Moth
 
 # steal item
 
diff --git a/Resources/Prototypes/Procedural/biome_templates.yml b/Resources/Prototypes/Procedural/biome_templates.yml
index 88979316443..425bcd824ab 100644
--- a/Resources/Prototypes/Procedural/biome_templates.yml
+++ b/Resources/Prototypes/Procedural/biome_templates.yml
@@ -620,7 +620,7 @@
       allowedTiles:
         - FloorAsteroidSand
       entities:
-        - AsteroidRock
+        - RandomRockSpawner #Delta V - Makes Asteroids Great-ish Again
     - !type:BiomeTileLayer
       threshold: -1.0
       tile: FloorAsteroidSand
diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
index 9e8d3a44095..3614e4e787f 100644
--- a/Resources/Prototypes/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -292,11 +292,11 @@
     - !type:JunctionPostGen
       width: 1
       entities:
-        - AirlockHydroGlassLocked
+        - AirlockGlass
 
     - !type:JunctionPostGen
       entities:
-        - AirlockHydroGlassLocked
+        - AirlockGlass
 
     - !type:AutoCablingPostGen
 
diff --git a/Resources/Prototypes/RCD/rcd.yml b/Resources/Prototypes/RCD/rcd.yml
new file mode 100644
index 00000000000..500b5f59bf9
--- /dev/null
+++ b/Resources/Prototypes/RCD/rcd.yml
@@ -0,0 +1,280 @@
+# Operations
+- type: rcd
+  id: Invalid   # Hidden prototype - do not add to RCDs
+  mode: Invalid
+  
+- type: rcd
+  id: Deconstruct
+  name: rcd-component-deconstruct
+  category: Main
+  sprite: /Textures/Interface/Radial/RCD/deconstruct.png
+  mode: Deconstruct
+  prototype: EffectRCDDeconstructPreview
+  rotation: Camera
+
+- type: rcd
+  id: DeconstructLattice   # Hidden prototype - do not add to RCDs  
+  name: rcd-component-deconstruct
+  mode: Deconstruct
+  cost: 2
+  delay: 0
+  rotation: Camera
+  fx: EffectRCDConstruct0
+    
+- type: rcd
+  id: DeconstructTile      # Hidden prototype - do not add to RCDs
+  name: rcd-component-deconstruct
+  mode: Deconstruct
+  cost: 4
+  delay: 4
+  rotation: Camera
+  fx: EffectRCDDeconstruct4
+
+# Flooring 
+- type: rcd
+  id: Plating
+  name: rcd-component-plating
+  category: WallsAndFlooring
+  sprite: /Textures/Interface/Radial/RCD/plating.png
+  mode: ConstructTile
+  prototype: Plating
+  cost: 1
+  delay: 1
+  collisionMask: InteractImpassable
+  rules:
+    - CanBuildOnEmptyTile
+  fx: EffectRCDConstruct1
+  
+- type: rcd
+  id: FloorSteel
+  name: rcd-component-floor-steel
+  category: WallsAndFlooring
+  sprite: /Textures/Interface/Radial/RCD/metal_tile.png
+  mode: ConstructTile
+  prototype: FloorSteel
+  cost: 1
+  delay: 1
+  collisionMask: InteractImpassable
+  rules:
+    - CanBuildOnEmptyTile
+  fx: EffectRCDConstruct1
+
+- type: rcd
+  id: Catwalk
+  category: WallsAndFlooring
+  sprite: /Textures/Interface/Radial/RCD/catwalk.png
+  mode: ConstructObject
+  prototype: Catwalk
+  cost: 1
+  delay: 1
+  collisionMask: InteractImpassable
+  rules:
+    - MustBuildOnSubfloor
+    - IsCatwalk
+  rotation: Fixed
+  fx: EffectRCDConstruct1
+
+# Walls
+- type: rcd
+  id: WallSolid
+  category: WallsAndFlooring
+  sprite: /Textures/Interface/Radial/RCD/solid_wall.png
+  mode: ConstructObject
+  prototype: WallSolid 
+  cost: 4
+  delay: 2
+  collisionMask: FullTileMask
+  rotation: Fixed
+  fx: EffectRCDConstruct2
+
+- type: rcd
+  id: Grille
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/grille.png
+  mode: ConstructObject
+  prototype: Grille
+  cost: 4
+  delay: 2
+  collisionMask: FullTileMask
+  rotation: Fixed
+  fx: EffectRCDConstruct2
+
+# Windows
+- type: rcd
+  id: Window
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/window.png
+  mode: ConstructObject
+  prototype: Window
+  cost: 3
+  delay: 2
+  collisionMask: FullTileMask
+  rules:
+    - IsWindow
+  rotation: Fixed
+  fx: EffectRCDConstruct2
+  
+- type: rcd
+  id: WindowDirectional
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/directional.png
+  mode: ConstructObject
+  prototype: WindowDirectional
+  cost: 2
+  delay: 1
+  collisionMask: FullTileMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rules:
+    - IsWindow
+  rotation: User
+  fx: EffectRCDConstruct1
+  
+- type: rcd
+  id: ReinforcedWindow
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/window_reinforced.png
+  mode: ConstructObject
+  prototype: ReinforcedWindow
+  cost: 4
+  delay: 3
+  collisionMask: FullTileMask
+  rules:
+    - IsWindow
+  rotation: User
+  fx: EffectRCDConstruct3
+    
+- type: rcd
+  id: WindowReinforcedDirectional
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/directional_reinforced.png
+  mode: ConstructObject
+  prototype: WindowReinforcedDirectional
+  cost: 3
+  delay: 2
+  collisionMask: FullTileMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rules:
+    - IsWindow
+  rotation: User
+  fx: EffectRCDConstruct2
+
+# Airlocks
+- type: rcd
+  id: Airlock
+  category: Airlocks
+  sprite: /Textures/Interface/Radial/RCD/airlock.png
+  mode: ConstructObject
+  prototype: Airlock
+  cost: 4
+  delay: 4
+  collisionMask: FullTileMask
+  rotation: Camera
+  fx: EffectRCDConstruct4
+  
+- type: rcd
+  id: AirlockGlass
+  category: Airlocks
+  sprite: /Textures/Interface/Radial/RCD/glass_airlock.png
+  mode: ConstructObject
+  prototype: AirlockGlass
+  cost: 4
+  delay: 4
+  collisionMask: FullTileMask
+  rotation: Camera
+  fx: EffectRCDConstruct4
+  
+- type: rcd
+  id: Firelock
+  category: Airlocks
+  sprite: /Textures/Interface/Radial/RCD/firelock.png
+  mode: ConstructObject
+  prototype: Firelock
+  cost: 4
+  delay: 3
+  collisionMask: FullTileMask
+  rotation: Camera
+  fx: EffectRCDConstruct3
+
+# Lighting
+- type: rcd
+  id: TubeLight
+  category: Lighting
+  sprite: /Textures/Interface/Radial/RCD/tube_light.png
+  mode: ConstructObject
+  prototype: Poweredlight
+  cost: 2
+  delay: 1
+  collisionMask: TabletopMachineMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rotation: User
+  fx: EffectRCDConstruct1
+  
+- type: rcd
+  id: BulbLight
+  category: Lighting
+  sprite: /Textures/Interface/Radial/RCD/bulb_light.png
+  mode: ConstructObject
+  prototype: PoweredSmallLight
+  cost: 2
+  delay: 1
+  collisionMask: TabletopMachineMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rotation: User
+  fx: EffectRCDConstruct1
+
+# Electrical
+- type: rcd
+  id: LVCable
+  category: Electrical
+  sprite: /Textures/Interface/Radial/RCD/lv_coil.png
+  mode: ConstructObject
+  prototype: CableApcExtension
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: Fixed
+  fx: EffectRCDConstruct0
+    
+- type: rcd
+  id: MVCable
+  category: Electrical
+  sprite: /Textures/Interface/Radial/RCD/mv_coil.png
+  mode: ConstructObject
+  prototype: CableMV
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: Fixed
+  fx: EffectRCDConstruct0
+    
+- type: rcd
+  id: HVCable
+  category: Electrical
+  sprite: /Textures/Interface/Radial/RCD/hv_coil.png
+  mode: ConstructObject
+  prototype: CableHV
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: Fixed
+  fx: EffectRCDConstruct0
+    
+- type: rcd
+  id: CableTerminal
+  category: Electrical
+  sprite: /Textures/Interface/Radial/RCD/cable_terminal.png
+  mode: ConstructObject
+  prototype: CableTerminal
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
\ No newline at end of file
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index fb2422ca28b..12f5a80185a 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -79,6 +79,26 @@
         reagent: Ethanol
         amount: 0.1
 
+- type: reagent
+  id: BlueHawaiian
+  name: reagent-name-blue-hawaiian
+  parent: BaseAlcohol
+  desc: reagent-desc-blue-hawaiian
+  physicalDesc: reagent-physical-desc-tropical
+  flavor: bluehawaiian
+  color: "#47687b"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+
 - type: reagent
   id: Cognac
   name: reagent-name-cognac
@@ -733,6 +753,46 @@
         reagent: Ethanol
         amount: 0.2
 
+- type: reagent
+  id: CoconutRum
+  name: reagent-name-coconut-rum
+  parent: BaseAlcohol
+  desc: reagent-desc-coconut-rum
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: rum
+  color: "#cccbc8"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/coconutrum.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+
+- type: reagent
+  id: Cosmopolitan
+  name: reagent-name-cosmopolitan
+  parent: BaseAlcohol
+  desc: reagent-desc-cosmopolitan
+  physicalDesc: reagent-physical-desc-citric
+  flavor: cosmopolitan
+  color: "#f73030"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/cosmopolitan.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.15
+
 - type: reagent
   id: CubaLibre
   name: reagent-name-cuba-libre
@@ -1255,6 +1315,26 @@
           types:
             Poison: 1
 
+- type: reagent
+  id: Painkiller
+  name: reagent-name-painkiller
+  parent: BaseAlcohol
+  desc: reagent-desc-painkiller
+  physicalDesc: reagent-physical-desc-refreshing
+  flavor: painkiller
+  color: "#e6cb47"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/painkiller.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+
 - type: reagent
   id: Patron
   name: reagent-name-patron
@@ -1293,6 +1373,18 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
 
+- type: reagent
+  id: PinaColada
+  name: reagent-name-pina-colada
+  parent: BaseAlcohol
+  desc: reagent-desc-pina-colada
+  physicalDesc: reagent-physical-desc-tropical
+  flavor: alcohol
+  color: "#e8dba4"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/pinacolada.rsi
+    state: icon
+
 - type: reagent
   id: Sbiten
   name: reagent-name-sbiten
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 946a2a6e449..5c09b3c909b 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -48,6 +48,34 @@
       - !type:SatiateThirst
         factor: 1
 
+- type: reagent
+  id: CoconutWater
+  name: reagent-name-coconut-water
+  parent: BaseDrink
+  desc: reagent-desc-coconut-water
+  physicalDesc: reagent-physical-desc-milky
+  flavor: nutty
+  color: "#f4eadb"
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 4 # Coconut water is 94% water
+
+- type: reagent
+  id: CreamOfCoconut
+  name: reagent-name-cream-of-coconut
+  parent: BaseDrink
+  desc: reagent-desc-cream-of-coconut
+  physicalDesc: reagent-physical-desc-syrupy
+  flavor: creamy
+  color: "#FFEABF"
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+
 - type: reagent
   id: CafeLatte
   name: reagent-name-cafe-latte
@@ -406,6 +434,26 @@
       - !type:SatiateHunger
         factor: 4
 
+- type: reagent
+  id: ArnoldPalmer
+  name: reagent-name-arnold-palmer
+  parent: BaseAlcohol
+  desc: reagent-desc-arnold-palmer
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: arnoldpalmer
+  color: "#d8cc5d"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 4
+      - !type:AdjustReagent
+        reagent: Theobromine
+        amount: 0.05
+
 - type: reagent
   id: Pilk
   name: reagent-name-pilk
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index 63ae5b25d5b..ba5adc4f2ae 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -8,6 +8,23 @@
   color: "#6c2828"
   recognizable: true
 
+- type: reagent
+  id: RoyRogers
+  name: reagent-name-roy-rogers
+  parent: BaseSoda
+  desc: reagent-desc-roy-rogers
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: cola
+  color: "#262019"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/royrogers.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 4
+
 - type: reagent
   id: ChangelingSting
   name: reagent-name-changeling-sting
@@ -116,6 +133,35 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
 
+- type: reagent
+  id: SolDry
+  name: reagent-name-sol-dry
+  parent: BaseSoda
+  desc: reagent-desc-sol-dry
+  physicalDesc: reagent-physical-desc-fizzy
+  flavor: gingersoda
+  color: "#ccb87e"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi
+    state: icon
+
+- type: reagent
+  id: ShirleyTemple
+  name: reagent-name-shirley-temple
+  parent: BaseSoda
+  desc: reagent-desc-shirley-temple
+  physicalDesc: reagent-physical-desc-fizzy
+  flavor: sweet
+  color: "#af2221"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/shirleytemple.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 4
+
 - type: reagent
   id: SpaceMountainWind
   name: reagent-name-space-mountain-wind
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
index 8fbfd3cd64b..4cc2810792f 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
@@ -164,3 +164,27 @@
       # eating salt on its own kinda sucks, kids
       - !type:SatiateThirst
         factor: -0.5
+
+- type: reagent
+  id: Syrup
+  name: reagent-name-syrup
+  group: Foods
+  desc: reagent-desc-syrup
+  flavor: sweet
+  color: "#fb7125"
+  recognizable: true
+  physicalDesc: reagent-physical-desc-sticky
+  slippery: false
+  viscosity: 0.55 #Start using syrup to attach your remote recievers to your microwaves!
+  tileReactions:
+    - !type:SpillTileReaction
+  metabolisms:
+    Food:
+      # 12 diona blood for 1 unit of syrup, this stuff better be worthwhile.
+      effects:
+      - !type:SatiateHunger
+        factor: 6.0 #Stronger than cookedramen
+  footstepSound:
+    collection: FootstepBlood
+    params:
+      volume: 6
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index c24c073f037..0c53ae10fd1 100644
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -82,6 +82,32 @@
     params:
       volume: 6
 
+- type: reagent
+  id: Sap
+  name: reagent-name-sap
+  group: Biological
+  desc: reagent-desc-sap
+  flavor: sweet
+  color: "#cd7314"
+  recognizable: true
+  physicalDesc: reagent-physical-desc-sticky
+  slippery: false
+  viscosity: 0.10
+  tileReactions:
+    - !type:SpillTileReaction
+  metabolisms:
+    Food:
+      # Sweet!
+      effects:
+      - !type:SatiateHunger
+        factor: 1
+      - !type:SatiateThirst
+        factor: 1
+  footstepSound:
+    collection: FootstepBlood
+    params:
+      volume: 6
+
 - type: reagent
   parent: Blood
   id: CopperBlood
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index b3a7fe1bb0a..e47335b1b4a 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -72,7 +72,7 @@
     Medicine:
       effects:
       - !type:ModifyBloodLevel
-        condition:
+        conditions:
         - !type:OrganType
           type: Arachnid
           shouldHave: true
@@ -163,7 +163,7 @@
     Medicine:
       effects:
       - !type:ModifyBloodLevel
-        condition:
+        conditions:
         - !type:OrganType
           type: Arachnid
           shouldHave: false
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index b3b5bcebb31..dfe96359e68 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -243,7 +243,7 @@
           types:
             Asphyxiation: 1
             Cold: 2
-        groups:
+          groups:
             Brute: 0.5
       - !type:Jitter
         conditions:
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index 55787633875..2ab323c3093 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -116,6 +116,13 @@
         damage:
           types:
             Poison: 1
+      - !type:AdjustReagent
+        conditions:
+        - !type:ReagentThreshold
+          reagent: ChloralHydrate
+          min: 1
+        reagent: ChloralHydrate
+        amount: -10
       - !type:GenericStatusEffect
         key: Stun
         time: 3
@@ -129,6 +136,10 @@
         component: StaminaModifier
         time: 3
         type: Add
+      - !type:GenericStatusEffect
+        key: ForcedSleep
+        time: 3
+        type: Remove
     Medicine:
       metabolismRate: 1.0
       effects:
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index a5b9a3e9bcb..661e1b7dd16 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -430,11 +430,12 @@
   color: "#D6CE7B"
   metabolisms:
     Poison:
+      metabolismRate: 0.2
       effects:
       - !type:HealthChange
         damage:
           types:
-            Poison: 6
+            Poison: 3
 
 - type: reagent
   id: VentCrud
@@ -483,7 +484,8 @@
       - !type:PopupMessage
         conditions:
           - !type:OrganType
-            type: Human
+            type: Animal
+            shouldHave: false
         reagent: Protein
         type: Local
         visualType: MediumCaution
@@ -493,19 +495,21 @@
         probability: 0.1
         conditions:
           - !type:OrganType
-            type: Human
+            type: Animal
+            shouldHave: false
       - !type:HealthChange
         conditions:
         - !type:OrganType
-          type: Human
+          type: Animal
+          shouldHave: false
         damage:
           types:
             Poison: 1
       - !type:AdjustReagent
         conditions:
         - !type:OrganType
-          type: Human
-          shouldHave: false
+          type: Animal
+          shouldHave: true
         reagent: Protein
         amount: 0.5
 
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/noticeboard.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/noticeboard.yml
new file mode 100644
index 00000000000..324745cbb9d
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/noticeboard.yml
@@ -0,0 +1,26 @@
+- type: constructionGraph
+  id: NoticeBoard
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity {}
+      edges:
+        - to: noticeBoard
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: WoodPlank
+              amount: 3
+              doAfter: 2
+    - node: noticeBoard
+      entity: NoticeBoard
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank
+              amount: 3
+          steps:
+            - tool: Prying
+              doAfter: 3
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
index 7daf9ca22df..d9a4cd02fb4 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
@@ -24,7 +24,6 @@
           conditions:
             - !type:EntityAnchored
               anchored: false
-            - !type:ToiletLidClosed {}
           steps:
             - tool: Welding
               doAfter: 2
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
index 3cd22bbfc72..0bb6b4b1ce4 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
@@ -46,7 +46,7 @@
       conditions:
       - !type:EntityAnchored {}
       steps:
-      - tag: DoorElectronics
+      - component: DoorElectronics
         store: board
         name: "door electronics circuit board"
         icon:
@@ -121,7 +121,6 @@
     actions:
     - !type:SetWiresPanelSecurity
       wiresAccessible: true
-      weldingAllowed: true
     edges:
     - to: glassElectronics
       conditions:
@@ -162,7 +161,6 @@
     actions:
     - !type:SetWiresPanelSecurity
       wiresAccessible: true
-      weldingAllowed: true
     edges:
     - to: wired
       conditions:
@@ -201,7 +199,6 @@
     actions:
     - !type:SetWiresPanelSecurity
       wiresAccessible: true
-      weldingAllowed: true
     edges:
     - to: medSecurityUnfinished
       conditions:
@@ -225,7 +222,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level1
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: glassAirlock
       completed:
@@ -278,7 +274,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level2
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: medSecurityUnfinished
       conditions:
@@ -293,7 +288,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level3
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: glassAirlock
       completed:
@@ -346,7 +340,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level4
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: highSecurityUnfinished
       conditions:
@@ -369,7 +362,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level5
       wiresAccessible: false
-      weldingAllowed: true
     edges:
     - to: highSecurity
       completed:
@@ -397,7 +389,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level6
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: maxSecurity
       completed:
@@ -422,7 +413,6 @@
     - !type:SetWiresPanelSecurity
       examine: wires-panel-component-on-examine-security-level7
       wiresAccessible: false
-      weldingAllowed: false
     edges:
     - to: superMaxSecurityUnfinished
       conditions:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
index b0cfe30eb01..76b641a06d9 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
@@ -121,7 +121,6 @@
     actions:
     - !type:SetWiresPanelSecurity
       wiresAccessible: true
-      weldingAllowed: true
     edges:
     - to: glassElectronics
       conditions:
@@ -146,7 +145,6 @@
     actions:
     - !type:SetWiresPanelSecurity
       wiresAccessible: true
-      weldingAllowed: true
     edges:
     - to: wired
       conditions:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
index ff0ecbc4ed1..43d2484bbd2 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
@@ -23,7 +23,6 @@
         - !type:SetAnchor
           value: true
         - !type:SnapToGrid
-          offset: Center
       edges:
         - to: item
           steps:
@@ -31,4 +30,4 @@
               doAfter: 3
           completed:
             - !type:SetAnchor
-              value: false
\ No newline at end of file
+              value: false
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
index 0dbf26794d9..0d7bdddd2f2 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
@@ -103,6 +103,14 @@
             - tool: Anchoring
               doAfter: 1
 
+        - to: FirelockEdge
+          conditions:
+            - !type:EntityAnchored
+              anchored: true
+          steps:
+            - tool: Welding
+              doAfter: 0.5
+
         - to: FirelockGlassFrame
           conditions:
             - !type:EntityAnchored
@@ -160,3 +168,14 @@
           steps:
             - tool: Anchoring
               doAfter: 1
+
+    - node: FirelockEdge
+      entity: FirelockEdge
+      edges:
+        - to: frame4
+          conditions:
+            - !type:DoorWelded
+              welded: true
+          steps:
+            - tool: Anchoring
+              doAfter: 0.25
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
index 111d8ebcd72..f70a44efe3c 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
@@ -19,6 +19,11 @@
             - material: Steel
               amount: 5
               doAfter: 2.0
+        - to: strobeLight
+          steps:
+            - material: Steel
+              amount: 1
+              doAfter: 2.0
     - node: tubeLight
       entity: PoweredlightEmpty
       edges:
@@ -63,4 +68,19 @@
             - !type:SpawnPrototype
               prototype: SheetSteel1
               amount: 5
+            - !type:DeleteEntity {}
+    - node: strobeLight
+      entity: PoweredStrobeLightEmpty
+      edges:
+        - to: start
+          conditions:
+            - !type:ContainerEmpty
+              container: "light_bulb"
+          steps:
+            - tool: Screwing
+              doAfter: 2.0
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetSteel1
+              amount: 1
             - !type:DeleteEntity {}
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/plastic_flaps.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/plastic_flaps.yml
index 9f8497ac98a..776c1491a63 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/plastic_flaps.yml
@@ -13,6 +13,7 @@
           - material: Plastic
             amount: 5
             doAfter: 10
+
   - node: plasticFlaps
     entity: PlasticFlapsClear
     edges:
@@ -24,3 +25,73 @@
         steps:
           - tool: Anchoring
             doAfter: 10
+
+      - to: opaqueFlaps
+        completed:
+          - !type:SnapToGrid { }
+        steps:
+          - tool: Welding
+            doAfter: 5
+
+      - to: airtightFlaps
+        completed:
+          - !type:SnapToGrid { }
+        steps:
+          - material: Plastic
+            amount: 5
+            doAfter: 5
+          - tool: Screwing
+            doAfter: 5
+
+  - node: opaqueFlaps
+    entity: PlasticFlapsOpaque
+    edges:
+      - to: start
+        completed:
+          - !type:SpawnPrototype
+            prototype: SheetPlastic
+            amount: 5
+        steps:
+          - tool: Anchoring
+            doAfter: 10
+
+      - to: airtightopaqueFlaps
+        completed:
+          - !type:SnapToGrid { }
+        steps:
+          - material: Plastic
+            amount: 5
+            doAfter: 5
+          - tool: Screwing
+            doAfter: 5
+
+  - node: airtightFlaps
+    entity: PlasticFlapsAirtightClear
+    edges:
+      - to: plasticFlaps
+        completed:
+          - !type:SpawnPrototype
+            prototype: SheetPlastic
+            amount: 5
+        steps:
+          - tool: Screwing
+            doAfter: 10
+
+      - to: airtightopaqueFlaps #test
+        completed:
+          - !type:SnapToGrid { }
+        steps:
+          - tool: Welding
+            doAfter: 5
+
+  - node: airtightopaqueFlaps
+    entity: PlasticFlapsAirtightOpaque
+    edges:
+      - to: opaqueFlaps
+        completed:
+          - !type:SpawnPrototype
+            prototype: SheetPlastic
+            amount: 5
+        steps:
+          - tool: Screwing
+            doAfter: 10
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
index 70d1c12d845..db53de288a4 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
@@ -44,7 +44,7 @@
             - !type:EntityAnchored
               anchored: true
           steps:
-            - tag: DoorElectronics
+            - component: DoorElectronics
               name: Door Electronics
               icon:
                 sprite: "Objects/Misc/module.rsi"
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
index 457fbfede56..f29629043df 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
@@ -23,7 +23,7 @@
       conditions:
       - !type:EntityAnchored {}
       steps:
-      - tag: DoorElectronics
+      - component: DoorElectronics
         store: board
         name: "door electronics circuit board"
         icon:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
index 64809ee1dbc..de896634670 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
@@ -107,7 +107,7 @@
       conditions:
       - !type:EntityAnchored {}
       steps:
-      - tag: DoorElectronics
+      - component: DoorElectronics
         store: board
         name: "door electronics circuit board"
         icon:
@@ -378,7 +378,7 @@
       conditions:
       - !type:EntityAnchored { }
       steps:
-      - tag: DoorElectronics
+      - component: DoorElectronics
         store: board
         name: "door electronics circuit board"
         icon:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
index 0914ae46e56..922e8857c92 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
@@ -28,18 +28,15 @@
         - to: solarpanel
           conditions:
             - !type:EntityAnchored
-              value: true
           steps:
             - material: Glass
               amount: 2
               doAfter: 0.5
           completed:
             - !type:SnapToGrid
-              offset: Center
         - to: solartracker
           conditions:
             - !type:EntityAnchored
-              value: true
           steps:
             - tag: SolarTrackerElectronics
               name: Solar Tracker Electronics
@@ -52,7 +49,6 @@
               doAfter: 2
           completed:
             - !type:SnapToGrid
-              offset: Center
 
     - node: solarpanel
       entity: SolarPanel
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
index 381871f94af..7e4087b20a2 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
@@ -26,7 +26,13 @@
         steps:
         - material: Cable
           amount: 5
-          doAfter: 2
+          doAfter: 0.5
+        - material: CableMV
+          amount: 5
+          doAfter: 0.5
+        - material: CableHV
+          amount: 5
+          doAfter: 0.5
         - tool: Screwing
           doAfter: 2
 
@@ -41,12 +47,34 @@
           icon:
             sprite: "Objects/Misc/module.rsi"
             state: "charger_APC"
-          doAfter: 1
+          doAfter: 0.5
+        - anyTags:
+            - PowerCell
+            - PowerCellSmall
+          store: powercell
+          name: a powercell
+          icon:
+            sprite: "Objects/Power/power_cells.rsi"
+            state: "medium"
+          doAfter: 0.5
+        - tag: CapacitorStockPart
+          name: a capacitor
+          store: capacitor
+          icon:
+            sprite: "Objects/Misc/stock_parts.rsi"
+            state: "capacitor"
+          doAfter: 0.5
       - to: frame
         completed:
         - !type:GivePrototype
           prototype: CableApcStack1
           amount: 5
+        - !type:GivePrototype
+          prototype: CableMVStack1
+          amount: 5
+        - !type:GivePrototype
+          prototype: CableHVStack1
+          amount: 5
         steps:
         - tool: Cutting
           doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
index 6e1c682f475..f1efe63ff50 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
@@ -10,7 +10,7 @@
               amount: 2
               doAfter: 2
             - material: Cable
-              amount: 2
+              amount: 3
               doAfter: 1
             - tag: GlassShard
               name: Glass Shard
@@ -33,7 +33,7 @@
               amount: 2
               doAfter: 2
             - material: Cable
-              amount: 2
+              amount: 3
               doAfter: 1
             - tag: ReinforcedGlassShard
               name: Reinforced Glass Shard
@@ -56,7 +56,7 @@
               amount: 2
               doAfter: 2
             - material: Cable
-              amount: 2
+              amount: 3
               doAfter: 1
             - tag: PlasmaGlassShard
               name: Plasma Glass Shard
@@ -79,7 +79,7 @@
               amount: 2
               doAfter: 2
             - material: Cable
-              amount: 2
+              amount: 3
               doAfter: 1
             - tag: UraniumGlassShard
               name: Uranium Glass Shard
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index 25978771872..5f7ec9c92d8 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -606,7 +606,7 @@
   description: A human excrement flushing apparatus.
   icon:
     sprite: Structures/Furniture/toilet.rsi
-    state: closed_toilet_seat_up
+    state: disposal
   objectType: Structure
   placementMode: SnapgridCenter
   canBuildInImpassable: false
@@ -884,3 +884,21 @@
   canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
+
+- type: construction
+  id: NoticeBoard
+  name: notice board
+  description: Wooden notice board, can store paper inside itself.
+  graph: NoticeBoard
+  startNode: start
+  targetNode: noticeBoard
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Wallmounts/noticeboard.rsi
+    state: noticeboard
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index f49ea346dd1..b0467e72bed 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -86,7 +86,7 @@
   canRotate: false
   canBuildInImpassable: false
   conditions:
-    - !type:TileNotBlocked    
+    - !type:TileNotBlocked
 
 - type: construction
   name: clock wall
@@ -722,6 +722,23 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: Thin firelock
+  id: FirelockEdge
+  graph: Firelock
+  startNode: start
+  targetNode: FirelockEdge
+  category: construction-category-structures
+  description: This is a firelock - it locks an area when a fire alarm in the area is triggered. Don't get squished!
+  icon:
+    sprite: Structures/Doors/edge_door_hazard.rsi
+    state: closed
+  placementMode: SnapgridCenter
+  objectType: Structure
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: shutter
   id: Shutters
@@ -1398,6 +1415,24 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: strobe light
+  id: LightStrobeFixture
+  graph: LightFixture
+  startNode: start
+  targetNode: strobeLight
+  category: construction-category-structures
+  description: A wall light fixture. Use light bulbs.
+  icon:
+    sprite: Structures/Wallmounts/Lighting/strobe_light.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 #conveyor
 - type: construction
   name: conveyor belt
@@ -1533,6 +1568,57 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: airtight plastic flaps
+  id: PlasticFlapsAirtight
+  graph: PlasticFlapsGraph
+  startNode: start
+  targetNode: airtightFlaps
+  category: construction-category-structures
+  placementMode: SnapgridCenter
+  description: An airtight plastic flap to let items through and keep people out.
+  objectType: Structure
+  canBuildInImpassable: false
+  icon:
+    sprite: Structures/plastic_flaps.rsi
+    state: plasticflaps
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: opaque plastic flaps
+  id: PlasticFlapsOpaque
+  graph: PlasticFlapsGraph
+  startNode: start
+  targetNode: opaqueFlaps
+  category: construction-category-structures
+  placementMode: SnapgridCenter
+  description: An opaque plastic flap to let items through and keep people out.
+  objectType: Structure
+  canBuildInImpassable: false
+  icon:
+    sprite: Structures/plastic_flaps.rsi
+    state: plasticflaps
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: airtight opaque plastic flaps
+  id: PlasticFlapsAirtightOpaque
+  graph: PlasticFlapsGraph
+  startNode: start
+  targetNode: airtightopaqueFlaps
+  category: construction-category-structures
+  placementMode: SnapgridCenter
+  description: An opaque, airtight plastic flap to let items through and keep people out.
+  objectType: Structure
+  canBuildInImpassable: false
+  icon:
+    sprite: Structures/plastic_flaps.rsi
+    state: plasticflaps
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: bananium clown statue
   id: BananiumClownStatue
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index a5620fd8efe..2f280f6e46d 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1423,6 +1423,15 @@
     FoodSnackChocolateBar: 2
     FoodEgg: 3
 
+- type: microwaveMealRecipe
+  id: RecipeHarpyWings
+  name: harpy wings recipe
+  result: FoodHarpyWings
+  time: 15
+  solids:
+    LeftLegHarpy: 1
+    RightLegHarpy: 1
+ 
 #Donks i guess
 - type: microwaveMealRecipe
   id: RecipeWarmDonkpocket
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml
index 56530f443eb..cecd031f972 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml
@@ -1,13 +1,31 @@
-- type: constructionGraph
+- type: constructionGraph
   id: WoodenBat
   start: start
   graph:
     - node: start
       edges:
-        - to: bat
+        - to: incompleteBat
           steps:
             - material: WoodPlank
               amount: 5
               doAfter: 4
+        
+    - node: incompleteBat
+      entity: IncompleteBaseBallBat
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 5
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Prying
+              doAfter: 1
+        - to: bat
+          steps:
+            - tool: Slicing
+              doAfter: 4
+        
     - node: bat
       entity: BaseBallBat
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml
deleted file mode 100644
index cba454b6638..00000000000
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- type: constructionGraph
-  id: flowercrown
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: flowercrown
-          steps:
-            - tag: Flower
-              name: flower
-              icon:
-                sprite: Objects/Specific/Hydroponics/poppy.rsi
-                state: produce
-            - tag: Flower
-              name: flower
-              icon:
-                sprite: Objects/Specific/Hydroponics/poppy.rsi
-                state: produce
-            - tag: Ambrosia
-              name: ambrosia
-              icon:
-                sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi
-                state: produce
-              doAfter: 10
-    - node: flowercrown
-      entity: ClothingHeadHatFlowerCrown
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml
index a0a87a14d8e..b8e580230da 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowerwreath.yml
@@ -23,4 +23,4 @@
                 state: produce
               doAfter: 10
     - node: flowerwreath
-      entity: ClothingNeckFlowerWreath
+      entity: ClothingHeadHatFlowerWreath
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml
deleted file mode 100644
index 76bc1242901..00000000000
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: constructionGraph
-  id: hairflower
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: hairflower
-          steps:
-            - tag: Flower # TODO change to "RedFlower" or "Poppy" tag, so you cant make red flower from bluesyellow etc., when it will be
-              name: flower
-              icon:
-                sprite: Objects/Specific/Hydroponics/poppy.rsi
-                state: produce
-              doAfter: 3.5
-    - node: hairflower
-      entity: ClothingHeadHatHairflower
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
index e72c56ff44c..7e450513afe 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
@@ -19,6 +19,8 @@
       conditions:
       - !type:StorageWelded
         welded: false
+      - !type:Locked
+        locked: false
       completed:
       - !type:SpawnPrototype
         prototype: SheetSteel1
diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml
index 9d13ac11f22..db7edc89801 100644
--- a/Resources/Prototypes/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -106,34 +106,6 @@
     state: icon
   hide: false
 
-- type: construction
-  name: hairflower
-  id: hairflower
-  graph: hairflower
-  startNode: start
-  targetNode: hairflower
-  category: construction-category-clothing
-  description: "A red flower for beautiful ladies."
-  icon:
-    sprite: Clothing/Head/Misc/hairflower.rsi
-    state: icon
-  objectType: Item
-  hide: false
-
-- type: construction
-  name: flower crown
-  id: flowercrown
-  graph: flowercrown
-  startNode: start
-  targetNode: flowercrown
-  category: construction-category-clothing
-  description: "A coronet of fresh and fragrant flowers."
-  icon:
-    sprite: Clothing/Head/Misc/flower-crown.rsi
-    state: icon
-  objectType: Item
-  hide: false
-
 - type: construction
   name: flower wreath
   id: flowerwreath
@@ -141,9 +113,9 @@
   startNode: start
   targetNode: flowerwreath
   category: construction-category-clothing
-  description: "A wreath of colourful flowers."
+  description: A wreath of colourful flowers. Can be worn both on head and neck.
   icon:
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
     state: icon
   objectType: Item
   hide: false
diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
index 3a54bfe1b33..7ee8f1ed499 100644
--- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml
+++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -84,7 +84,7 @@
 # - type: latheRecipe # DeltaV - Disable the Vape
 #   id: Vape
 #   icon:
-#     sprite: Objects/Consumable/Smokeables/Vapes/vape-standart.rsi
+#     sprite: Objects/Consumable/Smokeables/Vapes/vape-standard.rsi
 #     state: icon
 #   result: Vape
 #   completetime: 2
diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index f0c59a0bdf9..050dfa05cf8 100644
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -604,7 +604,7 @@
   completetime: 4
   materials:
      Steel: 50
-     Glass: 350
+     Glass: 450
 
 - type: latheRecipe
   id: SMESMachineCircuitboard
@@ -956,3 +956,12 @@
      Steel: 100
      Glass: 900
      Gold: 100
+
+- type: latheRecipe
+  id: ReagentGrinderIndustrialMachineCircuitboard
+  result: ReagentGrinderIndustrialMachineCircuitboard
+  completetime: 5
+  materials:
+     Steel: 100
+     Glass: 900
+     Gold: 100
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index 342654c46d1..631829ed53b 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -49,7 +49,7 @@
 
 - type: latheRecipe
   id: BodyBag
-  result: BodyBag_Folded
+  result: BodyBagFolded
   completetime: 2
   materials:
     Plastic: 300
diff --git a/Resources/Prototypes/Recipes/Lathes/salvage.yml b/Resources/Prototypes/Recipes/Lathes/salvage.yml
index 57ae75b6175..9b3cb086433 100644
--- a/Resources/Prototypes/Recipes/Lathes/salvage.yml
+++ b/Resources/Prototypes/Recipes/Lathes/salvage.yml
@@ -1,11 +1,10 @@
 - type: latheRecipe
   id: Fulton
   result: Fulton1
-  completetime: 5
+  completetime: 1
   materials:
     Steel: 200
-    # TODO: Need better sources of cloth as otherwise these will never get made.
-    # Cloth: 200
+    Cloth: 100
 
 - type: latheRecipe
   id: FultonBeacon
diff --git a/Resources/Prototypes/Recipes/Reactions/biological.yml b/Resources/Prototypes/Recipes/Reactions/biological.yml
index 4e94b8d85bc..604211466f4 100644
--- a/Resources/Prototypes/Recipes/Reactions/biological.yml
+++ b/Resources/Prototypes/Recipes/Reactions/biological.yml
@@ -25,6 +25,19 @@
     Water: 4
     Nitrogen: 1
 
+
+- type: reaction
+  id: SapBloodBreakdown
+  source: true
+  requiredMixerCategories:
+  - Centrifuge
+  reactants:
+    Sap:
+      amount: 10
+  products:
+    Water: 9
+    Sugar: 1
+
 - type: reaction
   id: CopperBloodBreakdown
   source: true
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 7608369b2ce..c810ebb0ce5 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -54,6 +54,16 @@
   products:
     Antifreeze: 4
 
+- type: reaction
+  id: ArnoldPalmer
+  reactants:
+    IcedTea:
+      amount: 1
+    Lemonade:
+      amount: 1
+  products:
+    ArnoldPalmer: 2
+
 - type: reaction
   id: AtomicBomb
   reactants:
@@ -76,6 +86,20 @@
   products:
     B52: 3
 
+- type: reaction
+  id: BlueHawaiian
+  reactants:
+    CoconutRum:
+      amount: 2
+    JuicePineapple:
+      amount: 1
+    JuiceLemon:
+      amount: 1
+    BlueCuracao:
+      amount: 1
+  products:
+    BlueHawaiian: 5
+
 - type: reaction
   id: CogChamp
   reactants:
@@ -90,6 +114,24 @@
   sound:
     path: /Audio/Magic/Cults/ClockCult/steam_whoosh.ogg
 
+- type: reaction
+  id: BahamaMama
+  reactants:
+    Ice:
+      amount: 1
+    JuiceOrange:
+      amount: 1
+    JuicePineapple:
+      amount: 1
+    Rum:
+      amount: 1
+    CoconutRum:
+      amount: 1
+    Grenadine:
+      amount: 1
+  products:
+    BahamaMama: 6
+
 - type: reaction
   id: Barefoot
   reactants:
@@ -182,6 +224,40 @@
   products:
     CafeLatte: 2
 
+- type: reaction
+  id: CoconutRum
+  reactants:
+    Rum:
+      amount: 2
+    CoconutWater:
+      amount: 1
+  products:
+    CoconutRum: 3
+
+- type: reaction
+  id: Cosmopolitan
+  reactants:
+    Vodka:
+      amount: 1
+    JuiceBerry:
+      amount: 1
+    JuiceLime:
+      amount: 1
+  products:
+    Cosmopolitan: 3
+
+- type: reaction
+  id: CreamOfCoconut
+  reactants:
+    CoconutWater:
+      amount: 1
+    Sugar:
+      amount: 1
+    Milk:
+      amount: 1
+  products:
+    CreamOfCoconut: 3
+
 - type: reaction
   id: CubaLibre
   reactants:
@@ -638,6 +714,34 @@
   products:
     Patron: 10
 
+- type: reaction
+  id: Painkiller
+  reactants:
+    JuicePineapple:
+      amount: 3
+    CoconutRum:
+      amount: 1
+    JuiceOrange:
+      amount: 1
+    CreamOfCoconut:
+      amount: 1
+  products:
+    Painkiller: 6
+
+- type: reaction
+  id: PinaColada
+  reactants:
+    JuicePineapple:
+      amount: 3
+    JuiceLime:
+      amount: 1
+    Rum:
+      amount: 1
+    CreamOfCoconut:
+      amount: 1
+  products:
+    PinaColada: 6
+
 - type: reaction
   id: Posca
   reactants:
@@ -680,6 +784,16 @@
   products:
     RootBeerFloat: 3
 
+- type: reaction
+  id: RoyRogers
+  reactants:
+    Cola:
+      amount: 2
+    Grenadine:
+      amount: 1
+  products:
+    RoyRogers: 3
+
 - type: reaction
   id: Sbiten
   reactants:
@@ -700,6 +814,16 @@
   products:
     ScrewdriverCocktail: 3
 
+- type: reaction
+  id: ShirleyTemple
+  reactants:
+    SolDry:
+      amount: 2
+    Grenadine:
+      amount: 1
+  products:
+    ShirleyTemple: 3
+
 - type: reaction
   id: Silencer
   reactants:
diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
index a8ccd5f0455..4e838816f20 100644
--- a/Resources/Prototypes/Recipes/Reactions/fun.yml
+++ b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -171,3 +171,17 @@
   products:
     Laughter: 2
 
+- type: reaction
+  id: CreateCrystals
+  quantized: true
+  minTemp: 374
+  reactants:
+    Sugar:
+      amount: 15
+    Water:
+      amount: 15
+    Ethanol:
+      amount: 5
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: ShardCrystalRandom
diff --git a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
index 5a40435471d..46830234faa 100644
--- a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
+++ b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
@@ -18,6 +18,21 @@
   products:
     EggCooked: 0.5
 
+- type: reaction
+  id: SapBoiling
+  impact: Low
+  minTemp: 377
+  reactants:
+    Sap:
+      amount: 1.2
+  effects:
+  - !type:CreateGas
+    gas: WaterVapor
+  products:
+    Syrup: 0.1 #12:1 sap to syruop
+
+# Holy - TODO: make it so only the chaplain can use the bible to start these reactions, not anyone with a bible
+
 - type: reaction
   id: BloodToWine
   impact: Low
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index acb6a2498d4..de965889678 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -14,6 +14,7 @@
   - BorgModuleHarvesting
   - SeedExtractorMachineCircuitboard
   - HydroponicsTrayMachineCircuitboard
+  - ReagentGrinderIndustrialMachineCircuitboard
 
 - type: technology
   id: CritterMechs
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
index e2733c6928c..65186340d7f 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -4,8 +4,8 @@
   id: BasicRobotics
   name: research-technology-basic-robotics
   icon:
-    sprite: Mobs/Silicon/drone.rsi
-    state: drone
+    sprite: Structures/Machines/exosuit_fabricator.rsi
+    state: fab-idle
   discipline: Experimental
   tier: 1
   cost: 5000
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index 49969c0f4ef..1f0ae2df058 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -23,11 +23,10 @@
           Piercing: 4
         groups:
           Burn: 3
-# DeltaV - Commenting out the clown snore sound because I am not fond of it (it makes me itchy and feral). By "I", I mean Leonardo_DaBepis. 
+# DeltaV - Commenting out the clown snore sound because I am not fond of it (it makes me itchy and feral). By "I", I mean Leonardo_DaBepis.
 #    - type: SleepEmitSound
 #      snore: /Audio/Voice/Misc/silly_snore.ogg
 #      interval: 10
-#      chance: 1.0
   - !type:AddImplantSpecial
     implants: [ SadTromboneImplant ]
   setPreference: false
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 095cbac9f4d..57d86e1f9b9 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -51,7 +51,7 @@
 #  - Security # NoooOoOo!! My HoPcurity!1
 #  - Brig
   - Lawyer
-#  - Cargo
+  - Cargo
 #  - Atmospherics
 #  - Medical
   - Boxer # DeltaV - Add Boxer access
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
index d54baba3dbd..22d0a4d77ff 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -66,6 +66,61 @@
   inhand:
     - AirTankFilled
 
+# Chaplain
+- type: job
+  id: ERTChaplain
+  name: job-name-ertchaplain
+  description: job-description-ertchaplain
+  playTimeTracker: JobERTChaplain
+  setPreference: false
+  startingGear: ERTEngineerGearEVA
+  icon: "JobIconNanotrasen"
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
+  special:
+  - !type:AddComponentSpecial
+    components:
+    - type: BibleUser #Lets them heal with bibles
+
+- type: startingGear
+  id: ERTChaplainGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitERTChaplain
+    back: ClothingBackpackERTChaplainFilled
+    shoes: ClothingShoesLeather
+    head: ClothingHeadHatFez
+    eyes: ClothingEyesGlasses
+    neck: ClothingNeckStoleChaplain
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterArmorBasicSlim
+    id: ERTEngineerPDA
+    ears: ClothingHeadsetAltCentCom
+    belt: ClothingBeltStorageWaistbag
+    pocket1: Flare
+    pocket2: DrinkWaterBottleFull
+
+- type: startingGear
+  id: ERTChaplainGearEVA
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitERTChaplain
+    back: ClothingBackpackERTChaplainFilled
+    shoes: ClothingShoesBootsMagAdv
+    mask: ClothingMaskGasERT
+    eyes: ClothingEyesGlasses
+    neck: ClothingNeckStoleChaplain
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterHardsuitERTChaplain
+    suitstorage: AirTankFilled
+    id: ERTChaplainPDA
+    ears: ClothingHeadsetAltCentCom
+    belt: ClothingBeltStorageWaistbag
+    pocket1: Flare
+    pocket2: DrinkWaterBottleFull
+
 # Engineer
 - type: job
   id: ERTEngineer
diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml
index c3dd65893c3..35b92357702 100644
--- a/Resources/Prototypes/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -46,6 +46,9 @@
 - type: playTimeTracker
   id: JobDetective
 
+- type: playTimeTracker
+  id: JobERTChaplain
+
 - type: playTimeTracker
   id: JobERTEngineer
 
diff --git a/Resources/Prototypes/SoundCollections/Announcers/intern.yml b/Resources/Prototypes/SoundCollections/Announcers/intern.yml
new file mode 100644
index 00000000000..46172713dc8
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/Announcers/intern.yml
@@ -0,0 +1,34 @@
+- type: soundCollection
+  id: InternAnnouncements
+  files:
+    - /Audio/Announcers/Intern/comms/announce/1.ogg
+    - /Audio/Announcers/Intern/comms/announce/2.ogg
+    - /Audio/Announcers/Intern/comms/announce/3.ogg
+    - /Audio/Announcers/Intern/comms/announce/4.ogg
+    - /Audio/Announcers/Intern/comms/announce/5.ogg
+    - /Audio/Announcers/Intern/comms/announce/6.ogg
+    - /Audio/Announcers/Intern/comms/announce/7.ogg
+    - /Audio/Announcers/Intern/comms/announce/8.ogg
+    - /Audio/Announcers/Intern/comms/announce/9.ogg
+    - /Audio/Announcers/Intern/comms/announce/10.ogg
+    - /Audio/Announcers/Intern/comms/announce/11.ogg
+    - /Audio/Announcers/Intern/comms/announce/12.ogg
+    - /Audio/Announcers/Intern/comms/announce/13.ogg
+    - /Audio/Announcers/Intern/comms/announce/14.ogg
+
+- type: soundCollection
+  id: InternCommandReportAnnouncements
+  files:
+    - /Audio/Announcers/Intern/comms/commandReport/1.ogg
+    - /Audio/Announcers/Intern/comms/commandReport/2.ogg
+    - /Audio/Announcers/Intern/comms/commandReport/3.ogg
+
+- type: soundCollection
+  id: InternWelcomeAnnouncements
+  files:
+    - /Audio/Announcers/Intern/comms/welcome/1.ogg
+    - /Audio/Announcers/Intern/comms/welcome/2.ogg
+    - /Audio/Announcers/Intern/comms/welcome/3.ogg
+    - /Audio/Announcers/Intern/comms/welcome/4.ogg
+    - /Audio/Announcers/Intern/comms/welcome/5.ogg
+    - /Audio/Announcers/Intern/comms/welcome/6.ogg
diff --git a/Resources/Prototypes/SoundCollections/arcade.yml b/Resources/Prototypes/SoundCollections/arcade.yml
new file mode 100644
index 00000000000..40c8a0bc1ee
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/arcade.yml
@@ -0,0 +1,11 @@
+- type: soundCollection
+  id: ArcadeNoise
+  files:
+    - /Audio/Machines/Arcade/hahaha.ogg
+    - /Audio/Machines/Arcade/pew_pew.ogg
+    - /Audio/Machines/Arcade/sting_01.ogg
+    - /Audio/Machines/Arcade/sting_02.ogg
+    - /Audio/Machines/Arcade/sting_03.ogg
+    - /Audio/Machines/Arcade/sting_04.ogg
+    - /Audio/Machines/Arcade/sting_05.ogg
+    - /Audio/Machines/Arcade/sting_06.ogg
diff --git a/Resources/Prototypes/SoundCollections/harpy.yml b/Resources/Prototypes/SoundCollections/harpy.yml
new file mode 100644
index 00000000000..68133faac09
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/harpy.yml
@@ -0,0 +1,251 @@
+- type: soundCollection
+  id: HarpyScreams
+  files:
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_scream1.ogg
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_scream2.ogg
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_scream3.ogg
+    - /Audio/Animals/monkey_scream.ogg
+    - /Audio/Voice/Human/malescream_1.ogg
+    - /Audio/Voice/Human/malescream_2.ogg
+    - /Audio/Voice/Human/malescream_3.ogg
+    - /Audio/Voice/Human/malescream_4.ogg
+    - /Audio/Voice/Human/malescream_5.ogg
+    - /Audio/Voice/Human/malescream_6.ogg
+    - /Audio/Voice/Human/femalescream_1.ogg
+    - /Audio/Voice/Human/femalescream_2.ogg
+    - /Audio/Voice/Human/femalescream_3.ogg
+    - /Audio/Voice/Human/femalescream_4.ogg
+    - /Audio/Voice/Human/femalescream_5.ogg
+    - /Audio/Voice/Moth/moth_scream.ogg
+    - /Audio/Voice/Skeleton/skeleton_scream.ogg
+    - /Audio/Voice/Reptilian/reptilian_scream.ogg
+    - /Audio/Voice/Slime/slime_scream_m1.ogg
+    - /Audio/Voice/Slime/slime_scream_m2.ogg
+    - /Audio/Voice/Slime/slime_scream_f1.ogg
+    - /Audio/Voice/Slime/slime_scream_f2.ogg
+
+- type: soundCollection
+  id: HarpyLaugh
+  files:
+    - /Audio/Voice/Human/manlaugh1.ogg
+    - /Audio/Voice/Human/manlaugh2.ogg
+    - /Audio/Voice/Human/womanlaugh.ogg
+    - /Audio/Voice/Diona/diona_rustle1.ogg
+    - /Audio/Voice/Diona/diona_rustle2.ogg
+    - /Audio/Voice/Diona/diona_rustle3.ogg
+    - /Audio/Animals/lizard_happy.ogg
+    - /Audio/Animals/ferret_happy.ogg
+    - /Audio/Voice/Moth/moth_laugh.ogg
+    - /Audio/Voice/Slime/slime_laugh_m1.ogg
+    - /Audio/Voice/Slime/slime_laugh_m2.ogg
+    - /Audio/Voice/Slime/slime_laugh_f1.ogg
+
+- type: soundCollection
+  id: HarpyHisses
+  files:
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss1.ogg
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss2.ogg
+    - /Audio/Weapons/ebladeon.ogg
+    - /Audio/Weapons/eblade1.ogg
+    - /Audio/Items/hiss.ogg
+    - /Audio/Items/hypospray.ogg
+    - /Audio/Items/ratchet.ogg
+    - /Audio/Items/welder.ogg
+    - /Audio/Machines/airlock_close.ogg
+    - /Audio/Machines/airlock_ext_close.ogg
+    - /Audio/Machines/airlock_ext_open.ogg
+    - /Audio/Machines/airlock_open.ogg
+    - /Audio/Machines/disposalflush.ogg
+    - /Audio/Machines/printer.ogg
+    - /Audio/Machines/windoor_open.ogg
+    - /Audio/Effects/spray.ogg
+    - /Audio/Effects/spray2.ogg
+
+- type: soundCollection
+  id: HarpySigh
+  files:
+    - /Audio/Voice/Human/male_sigh.ogg
+    - /Audio/Voice/Human/female_sigh.ogg
+
+- type: soundCollection
+  id: HarpyCry
+  files:
+    - /Audio/Voice/Human/cry_male_1.ogg
+    - /Audio/Voice/Human/cry_male_2.ogg
+    - /Audio/Voice/Human/cry_male_3.ogg
+    - /Audio/Voice/Human/cry_male_4.ogg
+    - /Audio/Voice/Human/cry_female_1.ogg
+    - /Audio/Voice/Human/cry_female_2.ogg
+    - /Audio/Voice/Human/cry_female_3.ogg
+    - /Audio/Voice/Human/cry_female_4.ogg
+
+- type: soundCollection
+  id: HarpyMeows
+  files:
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_meow2.ogg
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_meow3.ogg
+    - /Audio/Items/Toys/meow1.ogg
+    - /Audio/Animals/cat_meow.ogg
+
+- type: soundCollection
+  id: HarpyMews
+  files:
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_mew1.ogg
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_mew2.ogg
+
+- type: soundCollection
+  id: HarpyGrowls
+  files:
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_growl1.ogg
+    - /Audio/Animals/bear.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl1.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl2.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl3.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg
+
+- type: soundCollection
+  id: HarpyPurrs
+  files:
+    - /Audio/Nyanotrasen/Voice/Felinid/cat_purr1.ogg
+    - /Audio/Mecha/sound_mecha_hydraulic.ogg
+
+- type: soundCollection
+  id: HarpyRings
+  files:
+    - /Audio/Items/desk_bell_ring.ogg
+    - /Audio/Items/ring.ogg
+    - /Audio/Machines/ding.ogg
+    - /Audio/Machines/warning_buzzer.ogg
+
+- type: soundCollection
+  id: HarpyHonks
+  files:
+    - /Audio/Items/bikehorn.ogg
+    - /Audio/Items/brokenbikehorn.ogg
+
+- type: soundCollection
+  id: HarpyPews
+  files:
+    - /Audio/Weapons/Guns/Gunshots/silenced.ogg
+    - /Audio/Weapons/Guns/Gunshots/taser.ogg
+    - /Audio/Weapons/Guns/Gunshots/taser2.ogg
+    - /Audio/Weapons/Guns/Gunshots/laser.ogg
+    - /Audio/Weapons/Guns/Gunshots/laser3.ogg
+    - /Audio/Weapons/emitter.ogg
+    - /Audio/Effects/Arcade/player_attack.ogg
+    - /Audio/Effects/Arcade/player_charge.ogg
+    - /Audio/Effects/Arcade/player_heal.ogg
+    - /Audio/Magic/staff_animation.ogg
+    - /Audio/Magic/staff_change.ogg
+    - /Audio/Magic/staff_chaos.ogg
+    - /Audio/Magic/staff_door.ogg
+    - /Audio/Magic/staff_healing.ogg
+
+- type: soundCollection
+  id: HarpyBangs
+  files:
+    - /Audio/Weapons/Guns/Gunshots/atreides.ogg
+    - /Audio/Weapons/Guns/Gunshots/bang.ogg
+    - /Audio/Weapons/Guns/Gunshots/mk58.ogg
+    - /Audio/Weapons/Guns/Gunshots/pistol.ogg
+    - /Audio/Weapons/Guns/Gunshots/c-20r.ogg
+    - /Audio/Items/snap.ogg
+    - /Audio/Machines/blastdoor.ogg
+    - /Audio/Machines/machine_vend.ogg
+    - /Audio/Magic/disintegrate.ogg
+    - /Audio/Magic/fireball.ogg
+    - /Audio/Magic/forcewall.ogg
+    - /Audio/Magic/knock.ogg
+
+- type: soundCollection
+  id: HarpyBeeps
+  files:
+    - /Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg
+    - /Audio/Items/beep.ogg
+    - /Audio/Items/flashlight_pda.ogg
+    - /Audio/Items/locator_beep.ogg
+    - /Audio/Items/toolbox_drop.ogg
+    - /Audio/Items/Defib/defib_charge.ogg
+    - /Audio/Items/Defib/defib_ready.ogg
+    - /Audio/Items/Defib/defib_safety_off.ogg
+    - /Audio/Items/Defib/defib_safety_on.ogg
+    - /Audio/Items/Medical/healthscanner.ogg
+    - /Audio/Effects/RingtoneNotes/a.ogg
+    - /Audio/Effects/RingtoneNotes/asharp.ogg
+    - /Audio/Effects/RingtoneNotes/b.ogg
+    - /Audio/Effects/RingtoneNotes/c.ogg
+    - /Audio/Effects/RingtoneNotes/csharp.ogg
+    - /Audio/Effects/RingtoneNotes/d.ogg
+    - /Audio/Effects/RingtoneNotes/dsharp.ogg
+    - /Audio/Effects/RingtoneNotes/e.ogg
+    - /Audio/Effects/RingtoneNotes/f.ogg
+    - /Audio/Effects/RingtoneNotes/fsharp.ogg
+    - /Audio/Effects/RingtoneNotes/g.ogg
+    - /Audio/Effects/RingtoneNotes/gsharp.ogg
+    - /Audio/Effects/Arcade/gameover.ogg
+    - /Audio/Effects/Arcade/win.ogg
+    - /Audio/Machines/airlock_deny.ogg
+    - /Audio/Machines/alarm.ogg
+    - /Audio/Machines/beep.ogg
+    - /Audio/Machines/boltsdown.ogg
+    - /Audio/Machines/boltsup.ogg
+    - /Audio/Machines/custom_deny.ogg
+    - /Audio/Machines/high_tech_confirm.ogg
+    - /Audio/Machines/microwave_done_beep.ogg
+    - /Audio/Machines/scan_finish.ogg
+    - /Audio/Machines/vending_jingle.ogg
+
+- type: soundCollection
+  id: HarpyRevs
+  files:
+    - /Audio/Weapons/chainsawwield.ogg
+    - /Audio/Machines/blender.ogg
+    - /Audio/Machines/juicer.ogg
+    - /Audio/Machines/reclaimer_startup.ogg
+
+- type: soundCollection
+  id: HarpyClicks
+  files:
+    - /Audio/Items/deconstruct.ogg
+    - /Audio/Items/flashlight_off.ogg
+    - /Audio/Items/flashlight_on.ogg
+    - /Audio/Items/pistol_cock.ogg
+    - /Audio/Items/pistol_magin.ogg
+    - /Audio/Items/pistol_magout.ogg
+    - /Audio/Items/rped.ogg
+    - /Audio/Machines/door_lock_off.ogg
+    - /Audio/Machines/door_lock_on.ogg
+    - /Audio/Machines/id_swipe.ogg
+    - /Audio/Machines/machine_switch.ogg
+    - /Audio/Machines/screwdriveropen.ogg
+
+- type: soundCollection
+  id: HarpyChitter
+  files:
+    - /Audio/Voice/Moth/moth_chitter.ogg
+    - /Audio/Machines/circuitprinter.ogg
+    - /Audio/Machines/diagnoser_printing.ogg
+    - /Audio/Machines/uniformprinter.ogg
+    - /Audio/Machines/vaccinator_running.ogg
+
+- type: soundCollection
+  id: HarpySqueak
+  files:
+    - /Audio/Voice/Moth/moth_squeak.ogg
+    - /Audio/Animals/mouse_squeak.ogg
+
+- type: soundCollection
+  id: HarpyCaws
+  files:
+    - /Audio/DeltaV/Voice/Harpy/caw1.ogg
+
+- type: soundCollection
+  id: HarpyChirps
+  files:
+    - /Audio/DeltaV/Voice/Harpy/chirp1.ogg
+    - /Audio/Voice/Talk/pai.ogg
+    - /Audio/Voice/Talk/pai_ask.ogg
+    - /Audio/Voice/Talk/pai_exclaim.ogg
diff --git a/Resources/Prototypes/SoundCollections/screams.yml b/Resources/Prototypes/SoundCollections/screams.yml
index 46965712b0e..518bbf72bb7 100644
--- a/Resources/Prototypes/SoundCollections/screams.yml
+++ b/Resources/Prototypes/SoundCollections/screams.yml
@@ -30,3 +30,41 @@
     - /Audio/Voice/Cluwne/cluwnelaugh1.ogg
     - /Audio/Voice/Cluwne/cluwnelaugh2.ogg
     - /Audio/Voice/Cluwne/cluwnelaugh3.ogg
+
+- type: soundCollection
+  id: SlimeMaleLaughs
+  files:
+    - /Audio/Voice/Slime/slime_laugh_m1.ogg
+    - /Audio/Voice/Slime/slime_laugh_m2.ogg
+
+- type: soundCollection
+  id: SlimeFemaleLaughs
+  files:
+    - /Audio/Voice/Slime/slime_laugh_f1.ogg
+
+- type: soundCollection
+  id: SlimeUnisexLaughs
+  files:
+    - /Audio/Voice/Slime/slime_laugh_m1.ogg
+    - /Audio/Voice/Slime/slime_laugh_m2.ogg
+    - /Audio/Voice/Slime/slime_laugh_f1.ogg
+
+- type: soundCollection
+  id: SlimeMaleScreams
+  files:
+    - /Audio/Voice/Slime/slime_scream_m1.ogg
+    - /Audio/Voice/Slime/slime_scream_m2.ogg
+
+- type: soundCollection
+  id: SlimeFemaleScreams
+  files:
+    - /Audio/Voice/Slime/slime_scream_f1.ogg
+    - /Audio/Voice/Slime/slime_scream_f2.ogg
+
+- type: soundCollection
+  id: SlimeUnisexScreams
+  files:
+    - /Audio/Voice/Slime/slime_scream_m1.ogg
+    - /Audio/Voice/Slime/slime_scream_m2.ogg
+    - /Audio/Voice/Slime/slime_scream_f1.ogg
+    - /Audio/Voice/Slime/slime_scream_f2.ogg
diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml
deleted file mode 100644
index d7182128ca5..00000000000
--- a/Resources/Prototypes/Species/arachnid.yml
+++ /dev/null
@@ -1,155 +0,0 @@
-- type: species
-  id: Arachnid
-  name: species-name-arachnid
-  roundStart: false
-  prototype: MobArachnid
-  sprites: MobArachnidSprites
-  defaultSkinTone: "#385878"
-  markingLimits: MobArachnidMarkingLimits
-  dollPrototype: MobArachnidDummy
-  skinColoration: Hues
-  maleFirstNames: names_arachnid_first
-  femaleFirstNames: names_arachnid_first
-  lastNames: names_arachnid_last
-  sexes:
-  - Unsexed
-
-- type: speciesBaseSprites
-  id: MobArachnidSprites
-  sprites:
-    Head: MobArachnidHead
-    Snout: MobHumanoidAnyMarking
-    Chest: MobArachnidTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobArachnidEyes
-    LArm: MobArachnidLArm
-    RArm: MobArachnidRArm
-    LHand: MobArachnidLHand
-    RHand: MobArachnidRHand
-    LLeg: MobArachnidLLeg
-    RLeg: MobArachnidRLeg
-    LFoot: MobArachnidLFoot
-    RFoot: MobArachnidRFoot
-
-- type: humanoidBaseSprite
-  id: MobArachnidEyes
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: eyes
-
-- type: markingPoints
-  id: MobArachnidMarkingLimits
-  onlyWhitelisted: true
-  points:
-    Hair:
-      points: 0
-      required: false
-    FacialHair:
-      points: 0
-      required: false
-    Tail:
-      points: 1
-      required: true
-      defaultMarkings: [ ArachnidAppendagesDefault ]
-    HeadTop:
-      points: 1
-      required: false
-    HeadSide:
-      points: 1
-      required: true
-      defaultMarkings: [ ArachnidCheliceraeDownwards ]
-    Chest:
-      points: 1
-      required: false
-    Legs:
-      points: 2
-      required: false
-    Arms:
-      points: 2
-      required: false
-
-- type: humanoidBaseSprite
-  id: MobArachnidHead
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobArachnidHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobArachnidHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobArachnidTorso
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobArachnidTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobArachnidTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobArachnidLLeg
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobArachnidLHand
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobArachnidLArm
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobArachnidLFoot
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobArachnidRLeg
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobArachnidRHand
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobArachnidRArm
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobArachnidRFoot
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/gingerbread.yml b/Resources/Prototypes/Species/gingerbread.yml
deleted file mode 100644
index e6fc0d20df5..00000000000
--- a/Resources/Prototypes/Species/gingerbread.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-- type: species
-  id: Gingerbread
-  name: species-name-human
-  roundStart: false
-  prototype: MobGingerbread
-  sprites: MobGingerbreadSprites
-  markingLimits: MobHumanMarkingLimits
-  dollPrototype: MobGingerbreadDummy
-  skinColoration: HumanToned
-  defaultSkinTone: "#9a7c5a"
-
-- type: speciesBaseSprites
-  id: MobGingerbreadSprites
-  sprites:
-    Head: MobGingerbreadHead
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Chest: MobGingerbreadTorso
-    Eyes: MobGingerbreadEyes
-    LArm: MobGingerbreadLArm
-    RArm: MobGingerbreadRArm
-    LHand: MobGingerbreadLHand
-    RHand: MobGingerbreadRHand
-    LLeg: MobGingerbreadLLeg
-    RLeg: MobGingerbreadRLeg
-    LFoot: MobGingerbreadLFoot
-    RFoot: MobGingerbreadRFoot
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadEyes
-  baseSprite:
-    sprite: Mobs/Customization/eyes.rsi
-    state: no_eyes
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadHead
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadTorso
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadLLeg
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadLHand
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadLArm
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadLFoot
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadRLeg
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadRHand
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadRArm
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadRFoot
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml
deleted file mode 100644
index bb5edf389a3..00000000000
--- a/Resources/Prototypes/Species/moth.yml
+++ /dev/null
@@ -1,159 +0,0 @@
-- type: species
-  id: Moth
-  name: species-name-moth
-  roundStart: false
-  prototype: MobMoth
-  sprites: MobMothSprites
-  defaultSkinTone: "#ffda93"
-  markingLimits: MobMothMarkingLimits
-  dollPrototype: MobMothDummy
-  skinColoration: TintedHuesSkin # DeltaV - No rgb moths, literally 1849
-  maleFirstNames: names_moth_first_male
-  femaleFirstNames: names_moth_first_female
-  lastNames: names_moth_last
-
-- type: speciesBaseSprites
-  id: MobMothSprites
-  sprites:
-    Head: MobMothHead
-    Snout: MobHumanoidAnyMarking
-    Chest: MobMothTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobMothEyes
-    LArm: MobMothLArm
-    RArm: MobMothRArm
-    LHand: MobMothLHand
-    RHand: MobMothRHand
-    LLeg: MobMothLLeg
-    RLeg: MobMothRLeg
-    LFoot: MobMothLFoot
-    RFoot: MobMothRFoot
-
-- type: humanoidBaseSprite
-  id: MobMothEyes
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: eyes
-
-- type: markingPoints
-  id: MobMothMarkingLimits
-  onlyWhitelisted: true
-  points:
-    Hair:
-      points: 0
-      required: false
-    FacialHair:
-      points: 0
-      required: false
-    Tail:
-      points: 1
-      required: true
-      defaultMarkings: [ MothWingsDefault ]
-    Snout:
-      points: 1
-      required: false
-    HeadTop:
-      points: 1
-      required: true
-      defaultMarkings: [ MothAntennasDefault ]
-    HeadSide:
-      points: 1
-      required: false
-    Head:
-      points: 1
-      required: false
-    Chest:
-      points: 1
-      required: false
-    Legs:
-      points: 2
-      required: false
-    Arms:
-      points: 2
-      required: false
-
-- type: humanoidBaseSprite
-  id: MobMothHead
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobMothHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobMothHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobMothTorso
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobMothTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobMothTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobMothLLeg
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobMothLHand
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobMothLArm
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobMothLFoot
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobMothRLeg
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobMothRHand
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobMothRArm
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobMothRFoot
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml
deleted file mode 100644
index f4e4057e549..00000000000
--- a/Resources/Prototypes/Species/slime.yml
+++ /dev/null
@@ -1,135 +0,0 @@
-- type: species
-  id: SlimePerson
-  name: species-name-slime
-  roundStart: false
-  prototype: MobSlimePerson
-  sprites: MobSlimeSprites
-  defaultSkinTone: "#b8b8b8"
-  markingLimits: MobSlimeMarkingLimits
-  dollPrototype: MobSlimePersonDummy
-  skinColoration: Hues
-
-- type: speciesBaseSprites
-  id: MobSlimeSprites
-  sprites:
-    Head: MobSlimeHead
-    Hair: MobSlimeMarkingFollowSkin
-    FacialHair: MobSlimeMarkingFollowSkin
-    Chest: MobSlimeTorso
-    Eyes: MobHumanoidEyes
-    LArm: MobSlimeLArm
-    RArm: MobSlimeRArm
-    LHand: MobSlimeLHand
-    RHand: MobSlimeRHand
-    LLeg: MobSlimeLLeg
-    RLeg: MobSlimeRLeg
-    LFoot: MobSlimeLFoot
-    RFoot: MobSlimeRFoot
-
-- type: markingPoints
-  id: MobSlimeMarkingLimits
-  points:
-    Hair:
-      points: 1
-      required: false
-    FacialHair:
-      points: 1
-      required: false
-    Chest:
-      points: 1
-      required: false
-    Legs:
-      points: 4
-      required: false
-    Arms:
-      points: 4
-      required: false
-
-- type: humanoidBaseSprite
-  id: MobSlimeMarkingFollowSkin
-  markingsMatchSkin: true
-  layerAlpha: 0.5
-
-- type: humanoidBaseSprite
-  id: MobSlimeHead
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobSlimeHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobSlimeHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobSlimeTorso
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobSlimeTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobSlimeTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobSlimeLLeg
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobSlimeLArm
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobSlimeLHand
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobSlimeLFoot
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobSlimeRLeg
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobSlimeRArm
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobSlimeRHand
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobSlimeRFoot
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml
deleted file mode 100644
index 605087a687b..00000000000
--- a/Resources/Prototypes/Species/vox.yml
+++ /dev/null
@@ -1,144 +0,0 @@
-- type: species
-  id: Vox
-  name: species-name-vox
-  roundStart: false # sad...
-  prototype: MobVox
-  sprites: MobVoxSprites
-  markingLimits: MobVoxMarkingLimits
-  dollPrototype: MobVoxDummy
-  skinColoration: Hues
-  maleFirstNames: names_vox
-  femaleFirstNames: names_vox
-  naming: First
-  sexes:
-    - Unsexed
-
-
-- type: speciesBaseSprites
-  id: MobVoxSprites
-  sprites:
-    Head: MobVoxHead
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Chest: MobVoxTorso
-    Eyes: MobVoxEyes
-    LArm: MobVoxLArm
-    RArm: MobVoxRArm
-    LHand: MobVoxLHand
-    RHand: MobVoxRHand
-    LLeg: MobVoxLLeg
-    RLeg: MobVoxRLeg
-    LFoot: MobVoxLFoot
-    RFoot: MobVoxRFoot
-
-- type: markingPoints
-  id: MobVoxMarkingLimits
-  onlyWhitelisted: true
-  points:
-    Hair:
-      points: 1
-      required: false
-    FacialHair:
-      points: 1
-      required: false
-    Chest:
-      points: 1
-      required: false
-    Legs:
-      points: 2
-      required: false
-    Arms:
-      points: 2
-      required: false
-
-- type: humanoidBaseSprite
-  id: MobVoxEyes
-  baseSprite:
-    sprite: Mobs/Customization/eyes.rsi
-    state: vox_eyes_s
-
-- type: humanoidBaseSprite
-  id: MobVoxHead
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobVoxHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobVoxHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobVoxTorso
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobVoxTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobVoxTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobVoxLLeg
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobVoxLArm
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobVoxLHand
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobVoxLFoot
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobVoxRLeg
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobVoxRArm
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobVoxRHand
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobVoxRFoot
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: r_foot
-
-#
diff --git a/Resources/Prototypes/StatusEffects/health.yml b/Resources/Prototypes/StatusEffects/health.yml
index 12c16e57f05..562dbb336d8 100644
--- a/Resources/Prototypes/StatusEffects/health.yml
+++ b/Resources/Prototypes/StatusEffects/health.yml
@@ -1,32 +1,35 @@
 - type: statusIcon
-  id: HealthIconFine
+  id: HealthIcon
+  abstract: true
   priority: 1
+  locationPreference: Right
+  isShaded: true
+
+- type: statusIcon
+  parent: HealthIcon
+  id: HealthIconFine
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Fine
-  locationPreference: Right
 
 - type: statusIcon
   id: HealthIconCritical
-  priority: 1
+  parent: HealthIcon
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Critical
-  locationPreference: Right
 
 - type: statusIcon
   id: HealthIconDead
-  priority: 1
+  parent: HealthIcon
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Dead
-  locationPreference: Right
 
 - type: statusIcon
   id: HealthIconRotting
-  priority: 1
+  parent: HealthIcon
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Rotting
-  locationPreference: Right
 
diff --git a/Resources/Prototypes/StatusEffects/hunger.yml b/Resources/Prototypes/StatusEffects/hunger.yml
index 64366657132..9af246e06ee 100644
--- a/Resources/Prototypes/StatusEffects/hunger.yml
+++ b/Resources/Prototypes/StatusEffects/hunger.yml
@@ -1,49 +1,57 @@
 #Hunger
 - type: statusIcon
-  id: HungerIconOverfed
+  id: HungerIcon
+  abstract: true
   priority: 5
+  locationPreference: Right
+  isShaded: true
+
+- type: statusIcon
+  id: HungerIconOverfed
+  parent: HungerIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: overfed
-  locationPreference: Right
 
 - type: statusIcon
   id: HungerIconPeckish
-  priority: 5
+  parent: HungerIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: peckish
-  locationPreference: Right
 
 - type: statusIcon
   id: HungerIconStarving
-  priority: 5
+  parent: HungerIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: starving
-  locationPreference: Right
 
 #Thirst
 - type: statusIcon
-  id: ThirstIconOverhydrated
+  id: ThirstIcon
+  abstract: true
   priority: 5
+  locationPreference: Left
+  isShaded: true
+
+- type: statusIcon
+  id: ThirstIconOverhydrated
+  parent: ThirstIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: overhydrated
-  locationPreference: Left
 
 - type: statusIcon
   id: ThirstIconThirsty
-  priority: 5
+  parent: ThirstIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: thirsty
-  locationPreference: Left
 
 - type: statusIcon
   id: ThirstIconParched
-  priority: 5
+  parent: ThirstIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: parched
-  locationPreference: Left
diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml
index 782cacfdd52..30c677dd2c9 100644
--- a/Resources/Prototypes/StatusEffects/job.yml
+++ b/Resources/Prototypes/StatusEffects/job.yml
@@ -3,6 +3,7 @@
   abstract: true
   priority: 1
   locationPreference: Right
+  isShaded: true
 
 - type: statusIcon
   parent: JobIcon
diff --git a/Resources/Prototypes/StatusEffects/security.yml b/Resources/Prototypes/StatusEffects/security.yml
index aeb2c1e9d52..2a6695387b6 100644
--- a/Resources/Prototypes/StatusEffects/security.yml
+++ b/Resources/Prototypes/StatusEffects/security.yml
@@ -1,8 +1,9 @@
 - type: statusIcon
   id: SecurityIcon
   abstract: true
-  priority: 1
+  offset: 1
   locationPreference: Left
+  isShaded: true
 
 - type: statusIcon
   parent: SecurityIcon
diff --git a/Resources/Prototypes/StatusIcon/antag.yml b/Resources/Prototypes/StatusIcon/antag.yml
index 41bb0957416..0dbdfce4f97 100644
--- a/Resources/Prototypes/StatusIcon/antag.yml
+++ b/Resources/Prototypes/StatusIcon/antag.yml
@@ -31,6 +31,7 @@
   priority: 2
   locationPreference: Right
   layer: Mod
+  isShaded: true
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MindShield
diff --git a/Resources/Prototypes/Store/categories.yml b/Resources/Prototypes/Store/categories.yml
index c16972c8a31..11f8d509af3 100644
--- a/Resources/Prototypes/Store/categories.yml
+++ b/Resources/Prototypes/Store/categories.yml
@@ -63,6 +63,11 @@
   name: store-category-pointless
   priority: 9
 
+- type: storeCategory
+  id: UplinkDeception
+  name: store-category-deception
+  priority: 10
+
 #revenant
 - type: storeCategory
   id: RevenantAbilities
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 5aadcb9c006..b56134d9f60 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -15,6 +15,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelCheckerLight
@@ -33,6 +34,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteelCheckerLight
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelCheckerDark
@@ -51,6 +53,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteelCheckerDark
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelMini
@@ -69,6 +72,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelPavement
@@ -87,6 +91,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelDiagonal
@@ -105,6 +110,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelOffset
@@ -117,6 +123,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelMono
@@ -135,6 +142,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelPavementVertical
@@ -153,6 +161,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelHerringbone
@@ -171,6 +180,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelDiagonalMini
@@ -189,6 +199,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorBrassFilled
@@ -201,6 +212,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemBrassFilled
   heatCapacity: 10000
+  tileRipResistance: 220
 
 - type: tile
   id: FloorBrassReebe
@@ -213,6 +225,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemBrassReebe
   heatCapacity: 10000
+  tileRipResistance: 220
 
 - type: tile
   id: FloorPlastic
@@ -231,6 +244,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWood
@@ -251,6 +265,7 @@
     collection: BarestepWood
   itemDrop: FloorTileItemWood
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhite
@@ -269,6 +284,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteMini
@@ -287,6 +303,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhitePavement
@@ -305,6 +322,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteDiagonal
@@ -323,6 +341,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteOffset
@@ -335,6 +354,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteMono
@@ -353,6 +373,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhitePavementVertical
@@ -371,6 +392,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteHerringbone
@@ -389,6 +411,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteDiagonalMini
@@ -407,6 +430,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhitePlastic
@@ -425,6 +449,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorDark
@@ -443,6 +468,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkMini
@@ -461,6 +487,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkPavement
@@ -479,6 +506,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkDiagonal
@@ -497,6 +525,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkOffset
@@ -509,6 +538,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkMono
@@ -527,6 +557,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkPavementVertical
@@ -545,6 +576,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkHerringbone
@@ -563,6 +595,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkDiagonalMini
@@ -581,6 +614,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkPlastic
@@ -599,6 +633,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorTechMaint
@@ -611,6 +646,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemTechmaint
   heatCapacity: 10000
+  tileRipResistance: 250
 
 - type: tile
   id: FloorReinforced
@@ -623,6 +659,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemReinforced
   heatCapacity: 10000
+  reinforced: true
 
 - type: tile
   id: FloorMono
@@ -635,6 +672,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemMono
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorLino
@@ -647,6 +685,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemLino
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorSteelDirty
@@ -659,6 +698,7 @@
     collection: FootstepPlating
   itemDrop: FloorTileItemDirty
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorElevatorShaft
@@ -671,6 +711,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemElevatorShaft
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorMetalDiamond
@@ -683,6 +724,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemMetalDiamond
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorRockVault
@@ -695,6 +737,7 @@
     collection: FootstepAsteroid
   itemDrop: FloorTileItemRockVault
   heatCapacity: 10000
+  tileRipResistance:  400
 
 - type: tile
   id: FloorBlue
@@ -707,6 +750,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemBlue
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorSteelLime
@@ -725,6 +769,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemLime
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorMining
@@ -737,6 +782,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemMining
   heatCapacity: 10000
+  tileRipResistance: 250
 
 - type: tile
   id: FloorMiningDark
@@ -749,6 +795,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemMiningDark
   heatCapacity: 10000
+  tileRipResistance: 250
 
 - type: tile
   id: FloorMiningLight
@@ -761,6 +808,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemMiningLight
   heatCapacity: 10000
+  tileRipResistance: 250
 
 # Departamental
 - type: tile
@@ -774,6 +822,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemFreezer
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorShowroom
@@ -786,6 +835,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShowroom
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorHydro
@@ -798,6 +848,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemHydro
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorBar
@@ -816,6 +867,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemBar
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorClown
@@ -828,6 +880,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemClown
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorMime
@@ -840,6 +893,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemMime
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorKitchen
@@ -852,6 +906,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemKitchen
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorLaundry
@@ -864,6 +919,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemLaundry
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorSteelDamaged
@@ -883,6 +939,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel #This should probably be made null when it becomes possible to make it such, in SS13 prying destroyed tiles wouldn't give you anything.
   heatCapacity: 10000
+  tileRipResistance: 175
 
 - type: tile
   id: FloorSteelBurnt
@@ -899,6 +956,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel #Same case as FloorSteelDamaged, make it null when possible
   heatCapacity: 10000
+  tileRipResistance: 175
 
 
 # Concrete
@@ -919,6 +977,8 @@
     collection: FootstepTile
   itemDrop: FloorTileItemConcrete
   heatCapacity: 10000
+  weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorConcreteMono
@@ -937,6 +997,8 @@
     collection: FootstepTile
   itemDrop: FloorTileItemConcrete
   heatCapacity: 10000
+  weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorConcreteSmooth
@@ -955,6 +1017,8 @@
     collection: FootstepTile
   itemDrop: FloorTileItemConcrete
   heatCapacity: 10000
+  weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorGrayConcrete
@@ -973,6 +1037,8 @@
     collection: FootstepTile
   itemDrop: FloorTileItemGrayConcrete
   heatCapacity: 10000
+  weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorGrayConcreteMono
@@ -991,6 +1057,8 @@
     collection: FootstepTile
   itemDrop: FloorTileItemGrayConcrete
   heatCapacity: 10000
+  weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorGrayConcreteSmooth
@@ -1009,6 +1077,8 @@
     collection: FootstepTile
   itemDrop: FloorTileItemGrayConcrete
   heatCapacity: 10000
+  weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorOldConcrete
@@ -1027,6 +1097,8 @@
     collection: FootstepTile
   itemDrop: FloorTileItemOldConcrete
   heatCapacity: 10000
+  weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorOldConcreteMono
@@ -1045,6 +1117,8 @@
     collection: FootstepTile
   itemDrop: FloorTileItemOldConcrete
   heatCapacity: 10000
+  weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorOldConcreteSmooth
@@ -1063,6 +1137,8 @@
     collection: FootstepTile
   itemDrop: FloorTileItemOldConcrete
   heatCapacity: 10000
+  weather: true
+  tileRipResistance: 300
 
 # Carpets (non smoothing)
 - type: tile
@@ -1079,6 +1155,7 @@
   friction: 0.25
   itemDrop: FloorTileItemArcadeBlue
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorArcadeBlue2
@@ -1094,6 +1171,7 @@
   friction: 0.25
   itemDrop: FloorTileItemArcadeBlue2
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorArcadeRed
@@ -1109,6 +1187,7 @@
   friction: 0.25
   itemDrop: FloorTileItemArcadeRed
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorEighties
@@ -1124,6 +1203,7 @@
   friction: 0.25
   itemDrop: FloorTileItemEighties
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorCarpetClown
@@ -1139,6 +1219,7 @@
   friction: 0.25
   itemDrop: FloorTileItemCarpetClown
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorCarpetOffice
@@ -1154,6 +1235,7 @@
   friction: 0.25
   itemDrop: FloorTileItemCarpetOffice
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorBoxing
@@ -1173,6 +1255,7 @@
   friction: 0.25
   itemDrop: FloorTileItemBoxing
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorGym
@@ -1192,6 +1275,7 @@
   friction: 0.25
   itemDrop: FloorTileItemGym
   heatCapacity: 10000
+  tileRipResistance: 50
 
 # Shuttle
 - type: tile
@@ -1205,6 +1289,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleWhite
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttleGrey
@@ -1217,6 +1302,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleGrey
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttleBlack
@@ -1229,6 +1315,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleBlack
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttleBlue
@@ -1241,6 +1328,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleBlue
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttleOrange
@@ -1253,6 +1341,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleOrange
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttlePurple
@@ -1265,6 +1354,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttlePurple
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttleRed
@@ -1277,6 +1367,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleRed
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 
 # Materials
@@ -1291,6 +1382,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemGold
   heatCapacity: 10000
+  tileRipResistance: 600
 
 - type: tile
   id: FloorSilver
@@ -1303,6 +1395,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemSilver
   heatCapacity: 10000
+  tileRipResistance: 500
 
 - type: tile
   id: FloorGlass
@@ -1321,6 +1414,7 @@
     collection: FootstepTile
   itemDrop: SheetGlass1
   heatCapacity: 10000
+  tileRipResistance: 150
 
 - type: tile
   id: FloorRGlass
@@ -1339,6 +1433,7 @@
     collection: FootstepTile
   itemDrop: SheetRGlass1
   heatCapacity: 10000
+  tileRipResistance: 175
 
 # Circuits
 - type: tile
@@ -1352,6 +1447,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemGCircuit
   heatCapacity: 10000
+  tileRipResistance: 225
 
 - type: tile
   id: FloorBlueCircuit
@@ -1364,6 +1460,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemBCircuit
   heatCapacity: 10000
+  tileRipResistance: 225
 
 # Terrain
 - type: tile
@@ -1383,7 +1480,7 @@
   - 1.0
   - 1.0
   baseTurf: FloorDirt
-  isSubfloor: true
+  isSubfloor: false
   footstepSounds:
     collection: FootstepTile
   heatCapacity: 10000
@@ -1393,7 +1490,7 @@
   name: tiles-planet-grass-floor
   sprite: /Textures/Tiles/grass.png
   baseTurf: FloorDirt
-  isSubfloor: true
+  isSubfloor: false
   canShovel: true #DV
   footstepSounds:
     collection: FootstepGrass
@@ -1406,7 +1503,7 @@
   name: tiles-jungle-grass-floor
   sprite: /Textures/Tiles/grassjungle.png
   baseTurf: FloorDirt
-  isSubfloor: true
+  isSubfloor: false
   canShovel: true # Delta V
   footstepSounds:
     collection: FootstepGrass
@@ -1425,7 +1522,7 @@
   - 1.0
   - 1.0
   baseTurf: FloorDirt
-  isSubfloor: true
+  isSubfloor: false
   canShovel: true # Delta V
   footstepSounds:
     collection: FootstepGrass
@@ -1444,7 +1541,7 @@
   - 1.0
   - 1.0
   baseTurf: FloorDirt
-  isSubfloor: true
+  isSubfloor: false
   canShovel: true # Delta V
   footstepSounds:
     collection: FootstepGrass
@@ -1656,6 +1753,7 @@
   itemDrop: FloorTileItemFlesh
   friction: 0.05 #slippy
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorTechMaint2
@@ -1668,6 +1766,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemSteelMaint
   heatCapacity: 10000
+  tileRipResistance: 225
 
 - type: tile
   id: FloorTechMaint3
@@ -1686,6 +1785,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemGratingMaint
   heatCapacity: 10000
+  tileRipResistance: 225
 
 - type: tile
   id: FloorWoodTile
@@ -1706,6 +1806,7 @@
     collection: BarestepWood
   itemDrop: FloorTileItemWoodPattern
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorBrokenWood
@@ -1729,6 +1830,7 @@
     collection: BarestepWood
   itemDrop: MaterialWoodPlank1
   heatCapacity: 10000
+  tileRipResistance: 60
 
 - type: tile
   id: FloorWebTile
@@ -1743,6 +1845,7 @@
     collection: BarestepCarpet
   itemDrop: FloorTileItemWeb
   heatCapacity: 10000
+  tileRipResistance: 30
 
 - type: tile
   id: FloorChromite
@@ -1774,6 +1877,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemSteel #probably should not be normally obtainable, but the game shits itself and dies when you try to put null here
   heatCapacity: 10000
+  tileRipResistance: 500
 
 - type: tile
   id: FloorHullReinforced
@@ -1786,6 +1890,7 @@
   itemDrop: FloorTileItemSteel
   heatCapacity: 100000 #/tg/ has this set as "INFINITY." I don't know if that exists here so I've just added an extra 0
   indestructible: true
+  reinforced: true
 
 - type: tile
   id: FloorReinforcedHardened
@@ -1796,6 +1901,7 @@
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemReinforced #same case as FloorHull
+  reinforced: true
 
 # Faux sci tiles
 
@@ -1827,6 +1933,7 @@
     collection: FootstepGrass
   itemDrop: FloorTileItemAstroGrass
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorMowedAstroGrass
@@ -1836,6 +1943,7 @@
   isSubfloor: false
   deconstructTools: [ Cutting ]
   itemDrop: FloorTileItemMowedAstroGrass
+  tileRipResistance: 50
 
 - type: tile
   id: FloorJungleAstroGrass
@@ -1845,6 +1953,7 @@
   isSubfloor: false
   deconstructTools: [ Cutting ]
   itemDrop: FloorTileItemJungleAstroGrass
+  tileRipResistance: 50
 
 # Ice
 - type: tile
@@ -1860,6 +1969,7 @@
   mobFrictionNoInput: 0.05
   mobAcceleration: 2
   itemDrop: FloorTileItemAstroIce
+  tileRipResistance: 50
 
 - type: tile
   id: FloorAstroSnow
@@ -1869,6 +1979,7 @@
   isSubfloor: false
   deconstructTools: [ Prying ]
   itemDrop: FloorTileItemAstroSnow
+  tileRipResistance: 50
 
 - type: tile
   id: FloorWoodLarge
@@ -1889,3 +2000,4 @@
     collection: BarestepWood
   itemDrop: FloorTileItemWoodLarge
   heatCapacity: 10000
+  tileRipResistance: 100
diff --git a/Resources/Prototypes/Traits/inconveniences.yml b/Resources/Prototypes/Traits/inconveniences.yml
index dcf53d9ab7f..fee312593da 100644
--- a/Resources/Prototypes/Traits/inconveniences.yml
+++ b/Resources/Prototypes/Traits/inconveniences.yml
@@ -7,6 +7,10 @@
       jobs:
         - Borg
         - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - HeavyweightDrunk
   components:
     - type: LightweightDrunk
       boozeStrengthMultiplier: 2
@@ -26,3 +30,26 @@
       fourRandomProb: 0
       threeRandomProb: 0
       cutRandomProb: 0
+
+- type: trait
+  id: ForeignerLight
+  category: Mental
+  points: 1
+  requirements:
+    - !type:TraitGroupExclusionRequirement
+      prototypes: [ Foreigner ]
+  components:
+    - type: ForeignerTrait
+      cantUnderstand: false # Allows to understand
+      baseTranslator: TranslatorForeigner
+
+- type: trait
+  id: Foreigner
+  category: Mental
+  points: 2
+  requirements: # TODO: Add a requirement to know at least 1 non-gc language
+    - !type:TraitGroupExclusionRequirement
+      prototypes: [ ForeignerLight ]
+  components:
+    - type: ForeignerTrait
+      baseTranslator: TranslatorForeigner
diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml
index 3a3dc943cd7..3b86132b75a 100644
--- a/Resources/Prototypes/Traits/neutral.yml
+++ b/Resources/Prototypes/Traits/neutral.yml
@@ -21,3 +21,9 @@
       - type: MothAccent
       - type: ReplacementAccent
         accent: dwarf
+
+- type: trait
+  id: Southern
+  category: Speech
+  components:
+    - type: SouthernAccent
\ No newline at end of file
diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
new file mode 100644
index 00000000000..988307f58e4
--- /dev/null
+++ b/Resources/Prototypes/Traits/skills.yml
@@ -0,0 +1,32 @@
+- type: trait
+  id: HeavyweightDrunk
+  category: Physical
+  points: -2
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - LightweightDrunk
+  components:
+    - type: LightweightDrunk
+      boozeStrengthMultiplier: 0.5
+  
+- type: trait
+  id: Thieving
+  category: Physical
+  points: -4
+  components:
+    - type: Thieving
+      ignoreStripHidden: true
+      stealth: Subtle
+      stripTimeReduction: 0
+      stripTimeMultiplier: 0.667
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species: Felinid
diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml
index af93025cae0..7845fd3e6d2 100644
--- a/Resources/Prototypes/Voice/disease_emotes.yml
+++ b/Resources/Prototypes/Voice/disease_emotes.yml
@@ -1,45 +1,43 @@
 - type: emote
   id: Sneeze
   category: Vocal
-  chatMessages: [sneezes]
-    
+  chatMessages: [ sneezes ]
+
 - type: emote
   id: Cough
   category: Vocal
-  chatMessages: [coughs]
+  chatMessages: [ coughs ]
   chatTriggers:
-    - cough
     - coughs
 
 - type: emote
   id: CatMeow
   category: Vocal
-  chatMessages: [meows]
+  chatMessages: [ meows ]
 
 - type: emote
   id: CatHisses
   category: Vocal
-  chatMessages: [hisses]
+  chatMessages: [ hisses ]
 
 - type: emote
   id: MonkeyScreeches
   category: Vocal
-  chatMessages: [screeches]
+  chatMessages: [ screeches ]
 
 - type: emote
   id: RobotBeep
   category: Vocal
-  chatMessages: [beeps]
+  chatMessages: [ beeps ]
 
 - type: emote
   id: Yawn
   category: Vocal
-  chatMessages: [yawns]
+  chatMessages: [ yawns ]
   chatTriggers:
-    - yawn
     - yawns
 
 - type: emote
   id: Snore
   category: Vocal
-  chatMessages: [snores]
+  chatMessages: [ snores ]
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 01fabbadf30..c015ca79453 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -95,9 +95,9 @@
     Squish:
       collection: Squishes
     Scream:
-      collection: MaleScreams
+      collection: SlimeMaleScreams
     Laugh:
-      collection: MaleLaugh
+      collection: SlimeMaleLaughs
     Sneeze:
       collection: MaleSneezes
     Cough:
@@ -133,9 +133,9 @@
     Squish:
       collection: Squishes
     Scream:
-      collection: FemaleScreams
+      collection: SlimeFemaleScreams
     Laugh:
-      collection: FemaleLaugh
+      collection: SlimeFemaleLaughs
     Sneeze:
       collection: FemaleSneezes
     Cough:
@@ -298,6 +298,24 @@
     Weh:
       collection: Weh
 
+- type: emoteSounds
+  id: UnisexSilicon
+  params:
+    variation: 0.05
+  sounds:
+    Beep:
+      path: /Audio/Machines/twobeep.ogg
+    Chime:
+      path: /Audio/Machines/chime.ogg
+    Buzz:
+      path: /Audio/Machines/buzz-sigh.ogg
+    Buzz-Two:
+      path: /Audio/Machines/buzz-two.ogg
+    Honk:
+      path: /Audio/Items/bikehorn.ogg
+    Ping:
+      path: /Audio/Effects/Cargo/ping.ogg
+
 # body emotes
 - type: emoteSounds
   id: GeneralBodyEmotes
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 7eb2bd4f6a0..6c94294e2be 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -2,231 +2,107 @@
 - type: emote
   id: Scream
   category: Vocal
-  chatMessages: [screams!]
+  chatMessages: [ screams ]
   chatTriggers:
-    - scream
     - screams
-    - screams.
-    - screams!
-    - screaming
-    - screamed
-    - shriek
     - shrieks
-    - shrieks.
-    - shrieks!
-    - shrieking
-    - shrieked
-    - screech
     - screeches
-    - screeches.
-    - screeches!
-    - screeching
-    - screeched
-    - yell
     - yells
-    - yells.
-    - yells!
-    - yelled
-    - yelling
 
 - type: emote
   id: Laugh
   category: Vocal
-  chatMessages: [laughs]
+  chatMessages: [ laughs ]
   chatTriggers:
-    - laugh
     - laughs
-    - laughs.
-    - laughs!
-    - laughing
-    - laughed
-    - chuckle
     - chuckles
-    - chuckles.
-    - chuckles!
-    - chuckled
-    - chuckling
-    - giggle
     - giggles
-    - giggles.
-    - giggles!
-    - giggling
-    - giggled
-    - chortle
-    - chortle.
-    - chortle!
     - chortles
-    - chortles.
-    - chortles!
-    - chortling
-    - chortling.
-    - chortling!
 
 - type: emote
   id: Honk
   category: Vocal
-  chatMessages: [honks]
+  chatMessages: [ honks ]
+  chatTriggers:
+    - honks
 
 - type: emote
   id: Sigh
   category: Vocal
-  chatMessages: [sighs]
+  chatMessages: [ sighs ]
   chatTriggers:
-    - sigh
     - sighs
-    - sighed
-    - sigh.
-    - sighs.
-    - sighed.
 
 - type: emote
   id: Whistle
   category: Vocal
-  chatMessages: [whistle]
+  chatMessages: [ whistles ]
   chatTriggers:
-    - whistle
-    - whistle.
-    - whistle!
     - whistles
-    - whistles.
-    - whistles!
-    - whistleblowing
-    - whistleblowing.
-    - whistleblowing!
 
 - type: emote
   id: Crying
   category: Vocal
-  chatMessages: [crying]
+  chatMessages: [ cries ]
   chatTriggers:
-    - cry
-    - cry.
-    - cry!
-    - crying
-    - crying.
-    - crying!
     - cries
-    - cries.
-    - cries!
-    - sob
-    - sob.
     - sobs
-    - sobs.
-    - sobs!
-    - sobbing
-    - sobbing.
-    - sobbing!
 
 - type: emote
   id: Squish
   category: Vocal
-  chatMessages: [squishing]
+  chatMessages: [ squishes ]
   chatTriggers:
-    - squish
-    - squish.
-    - squish!
-    - squishing
-    - squishing.
-    - squishing!
     - squishes
-    - squishes.
-    - squishes!
 
 - type: emote
   id: Chitter
   category: Vocal
-  chatMessages: [chitters.]
+  chatMessages: [ chitters ]
   chatTriggers:
-   - chitter
-   - chitter.
-   - chitter!
    - chitters
-   - chitters.
-   - chitters!
-   - chittered
-   - chittered.
-   - chittered!
 
 - type: emote
   id: Squeak
   category: Vocal
-  chatMessages: [squeaks.]
+  chatMessages: [ squeaks ]
   chatTriggers:
-   - squeak
-   - squeak.
-   - squeak!
    - squeaks
-   - squeaks.
-   - squeaks!
-   - squeaked
-   - squeaked.
-   - squeaked!
 
 - type: emote
   id: Click
   category: Vocal
-  chatMessages: [click.]
+  chatMessages: [ clicks ]
   chatTriggers:
-   - click
-   - click.
-   - click!
-   - click?
    - clicks
-   - clicks.
-   - clicks!
-   - clicks?
-   - clicked
-   - clicked.
-   - clicked!
-   - clicked?
-   - clicking
-   - clicking.
-   - clicking!
-   - clicking?
 
 # hand emotes
 - type: emote
   id: Clap
   category: Hands
-  chatMessages: [claps!]
+  chatMessages: [ claps ]
   chatTriggers:
-    - clap
     - claps
-    - claps.
-    - claps!
-    - clapping
-    - clapped
 
 - type: emote
   id: Snap
   category: Hands
-  chatMessages: [snaps fingers] # snaps <{THEIR($ent)}> fingers?
+  chatMessages: [ snaps ] # snaps <{THEIR($ent)}> fingers?
   chatTriggers:
-    - snap
     - snaps
-    - snapping
-    - snapped
-    - snap fingers
     - snaps fingers
-    - snaps fingers.
-    - snaps fingers!
+    - snaps his fingers
+    - snaps her fingers
     - snaps their fingers
-    - snaps their fingers.
-    - snaps their fingers!
-    - snapping fingers
-    - snapped fingers
+    - snaps its fingers
+    - snaps its' fingers
 
 - type: emote
   id: Salute
   category: Hands
-  chatMessages: [Salute]
+  chatMessages: [ salutes ]
   chatTriggers:
-    - salute
-    - salute.
-    - salute!
     - salutes
-    - salutes.
-    - salutes!
 
 - type: emote
   id: DefaultDeathgasp
@@ -237,44 +113,47 @@
 - type: emote
   id: Buzz
   category: Vocal
-  chatMessages: [buzz!]
+  chatMessages: [ buzzes ]
   chatTriggers:
-    - buzzing
-    - buzzing!
-    - buzzing.
-    - buzz
-    - buzz.
-    - buzz!
-    - buzzed
-    - buzzed.
-    - buzzed!
     - buzzes
-    - buzzes.
-    - buzzes!
 
 - type: emote
   id: Weh
   category: Vocal
-  chatMessages: [Wehs!]
+  chatMessages: [ wehs ]
 
 - type: emote
   id: Chirp
   category: Vocal
-  chatMessages: [chirps!]
+  chatMessages: [ chirps ]
   chatTriggers:
-    - chirp
-    - chirp.
-    - chirp!
-    - chirp?
     - chirps
-    - chirps.
-    - chirps!
-    - chirps?
-    - chirped
-    - chirped.
-    - chirped!
-    - chirped?
-    - chirping
-    - chirping.
-    - chirping!
-    - chirping?
+
+# Machine Emotes
+- type: emote
+  id: Beep
+  category: Vocal
+  chatMessages: [ beeps ]
+  chatTriggers:
+    - beeps
+
+- type: emote
+  id: Chime
+  category: Vocal
+  chatMessages: [ chimes ]
+  chatTriggers:
+    - chimes
+
+- type: emote
+  id: Buzz-Two
+  category: Vocal
+  chatMessages: [ "buzzes twice" ]
+  chatTriggers:
+    - buzzes twice
+
+- type: emote
+  id: Ping
+  category: Vocal
+  chatMessages: [ pings ]
+  chatTriggers:
+    - pings
diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml
index 26e9370c017..9879cefb75d 100644
--- a/Resources/Prototypes/Voice/speech_verbs.yml
+++ b/Resources/Prototypes/Voice/speech_verbs.yml
@@ -1,30 +1,36 @@
 - type: speechVerb
   id: Default
+  name: chat-speech-verb-name-default
   speechVerbStrings:
   - chat-speech-verb-default
 
 - type: speechVerb
   id: DefaultQuestion
+  name: chat-speech-verb-name-question
   speechVerbStrings:
   - chat-speech-verb-question
 
 - type: speechVerb
   id: DefaultStutter
+  name: chat-speech-verb-name-stutter
   speechVerbStrings:
   - chat-speech-verb-stutter
 
 - type: speechVerb
   id: DefaultMumble
+  name: chat-speech-verb-name-mumble
   speechVerbStrings:
   - chat-speech-verb-mumble
 
 - type: speechVerb
   id: DefaultExclamation
+  name: chat-speech-verb-name-exclamation
   speechVerbStrings:
   - chat-speech-verb-exclamation
 
 - type: speechVerb
   id: DefaultExclamationStrong
+  name: chat-speech-verb-name-exclamation-strong
   bold: true
   speechVerbStrings:
   - chat-speech-verb-exclamation-strong
@@ -32,6 +38,7 @@
 
 - type: speechVerb
   id: Arachnid
+  name: chat-speech-verb-name-arachnid
   speechVerbStrings:
   - chat-speech-verb-insect-1
   - chat-speech-verb-insect-2
@@ -40,6 +47,7 @@
 
 - type: speechVerb
   id: Moth
+  name: chat-speech-verb-name-moth
   speechVerbStrings:
   - chat-speech-verb-winged-1
   - chat-speech-verb-winged-2
@@ -48,12 +56,14 @@
 
 - type: speechVerb
   id: Robotic
+  name: chat-speech-verb-name-robotic
   speechVerbStrings:
   - chat-speech-verb-robotic-1
   - chat-speech-verb-robotic-2
 
 - type: speechVerb
   id: Reptilian
+  name: chat-speech-verb-name-reptilian
   speechVerbStrings:
   - chat-speech-verb-reptilian-1
   - chat-speech-verb-reptilian-2
@@ -62,6 +72,7 @@
 
 - type: speechVerb
   id: Skeleton
+  name: chat-speech-verb-name-skeleton
   speechVerbStrings:
   - chat-speech-verb-skeleton-1
   - chat-speech-verb-skeleton-2
@@ -69,6 +80,7 @@
 
 - type: speechVerb
   id: Slime
+  name: chat-speech-verb-name-slime
   speechVerbStrings:
   - chat-speech-verb-slime-1
   - chat-speech-verb-slime-2
@@ -76,13 +88,15 @@
 
 - type: speechVerb
   id: Vox
+  name: chat-speech-verb-name-vox
   speechVerbStrings:
-    - chat-speech-verb-vox-1
-    - chat-speech-verb-vox-2
-    - chat-speech-verb-vox-3
+  - chat-speech-verb-vox-1
+  - chat-speech-verb-vox-2
+  - chat-speech-verb-vox-3
 
 - type: speechVerb
   id: Plant
+  name: chat-speech-verb-name-plant
   speechVerbStrings:
   - chat-speech-verb-plant-1
   - chat-speech-verb-plant-2
@@ -90,6 +104,7 @@
 
 - type: speechVerb
   id: Canine
+  name: chat-speech-verb-name-canine
   speechVerbStrings:
   - chat-speech-verb-canine-1
   - chat-speech-verb-canine-2
@@ -97,24 +112,28 @@
 
 - type: speechVerb
   id: LargeMob
+  name: chat-speech-verb-name-large-mob
   speechVerbStrings:
   - chat-speech-verb-large-mob-1
   - chat-speech-verb-large-mob-2
 
 - type: speechVerb
   id: SmallMob
+  name: chat-speech-verb-name-small-mob
   speechVerbStrings:
   - chat-speech-verb-small-mob-1
   - chat-speech-verb-small-mob-2
 
 - type: speechVerb
   id: Monkey
+  name: chat-speech-verb-name-monkey
   speechVerbStrings:
   - chat-speech-verb-monkey-1
   - chat-speech-verb-monkey-2
 
 - type: speechVerb
   id: Parrot
+  name: chat-speech-verb-name-parrot
   speechVerbStrings:
   - chat-speech-verb-parrot-1
   - chat-speech-verb-parrot-2
@@ -122,6 +141,7 @@
 
 - type: speechVerb
   id: Cluwne
+  name: chat-speech-verb-name-cluwne
   speechVerbStrings:
   - chat-speech-verb-cluwne-1
   - chat-speech-verb-cluwne-2
@@ -129,6 +149,7 @@
 
 - type: speechVerb
   id: Ghost
+  name: chat-speech-verb-name-ghost
   speechVerbStrings:
   - chat-speech-verb-ghost-1
   - chat-speech-verb-ghost-2
@@ -138,6 +159,7 @@
 
 - type: speechVerb
   id: Electricity
+  name: chat-speech-verb-name-electricity
   speechVerbStrings:
   - chat-speech-verb-electricity-1
   - chat-speech-verb-electricity-2
diff --git a/Resources/Prototypes/Voice/tail_emotes.yml b/Resources/Prototypes/Voice/tail_emotes.yml
index 610a2ea8015..be6064b652a 100644
--- a/Resources/Prototypes/Voice/tail_emotes.yml
+++ b/Resources/Prototypes/Voice/tail_emotes.yml
@@ -2,13 +2,9 @@
   id: WagTail
   chatMessages: [wags tail]
   chatTriggers:
-    - wag
-    - wag.
-    - wags
-    - wags.
-    - wagging
-    - wagging.
-    - wag tail
-    - wag tail.
     - wags tail
-    - wags tail.
+    - wags his tail
+    - wags her tail
+    - wags their tail
+    - wags its tail
+    - wags its' tail
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index b30e68545df..8d6be674e80 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -87,6 +87,7 @@
   id: Arcade
   wires:
   - !type:PowerWireAction
+  - !type:SpeechWireAction
   - !type:ArcadeOverflowWireAction
   - !type:ArcadePlayerInvincibleWireAction
   - !type:ArcadeEnemyInvincibleWireAction
diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
index 0fdaa5b9565..911c1c2e88e 100644
--- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
@@ -1,4 +1,4 @@
-# Utility effects permanently modify the entity in some way when triggered, and they generally make it 'useful' for some purpose,
+# Utility effects permanently modify the entity in some way when triggered, and they generally make it 'useful' for some purpose,
 # like turning the artifact into a tool, or gun, or whatever.
 - type: artifactEffect
   id: EffectIntercom
@@ -106,7 +106,6 @@
   - type: SolutionTransfer
     canChangeTransferAmount: true
   - type: Drink
-    isOpen: true
     solution: beaker
 
 - type: artifactEffect
@@ -198,10 +197,8 @@
     allowMovement: true
     allowSpeech: true
     makeSentient: true
-    name: sentient artifact
-    description: |
-      Enact your eldritch whims.
-      Forcibly activate your nodes for good or for evil.
+    name: ghost-role-information-artifact-name
+    description: ghost-role-information-artifact-description
   - type: GhostTakeoverAvailable
   - type: MovementSpeedModifier
     baseWalkSpeed: 0.25
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/identification.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/identification.yml
index 25fbb4eb700..e6beb666bcf 100644
--- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/identification.yml
+++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/identification.yml
@@ -30,7 +30,7 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idpassenger
+    - state: passenger
   - type: PresetIdCard
     job: VaultDweller
 
@@ -42,7 +42,7 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idstationengineer
+    - state: stationengineer
   - type: PresetIdCard
     job: VaultEngineer
 
@@ -54,7 +54,7 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idsecurityofficer
+    - state: securityofficer
   - type: PresetIdCard
     job: VaultSecurity
 
@@ -66,7 +66,7 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idmedicaldoctor
+    - state: medicaldoctor
   - type: PresetIdCard
     job: VaultDoctor
 
@@ -78,7 +78,7 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idmedicaldoctor
+    - state: medicaldoctor
   - type: PresetIdCard
     job: Overseer
 
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml
index 8e4d12ea710..a5f5e12d354 100644
--- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml
@@ -63,10 +63,9 @@
     solution: melee
   - type: InjectableSolution
     solution: melee
-  - type: SolutionInjectOnCollide
-    transferAmount: 5
-    fixtureId: "throw-fixture"
-    blockSlots: NONE
+  - type: SolutionInjectOnEmbed
+    transferAmount: 2
+    solution: melee
   - type: SolutionTransfer
     maxTransferAmount: 5
   - type: DamageOnLand
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access.yml
index 4800e3b16c8..35745df842b 100644
--- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access.yml
+++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access.yml
@@ -138,7 +138,7 @@
   suffix: Oasis, Locked, Sheriff
   components:
   - type: AccessReader
-    access: [["Sheriff"]]
+    access: [["OasisSheriff"]]
   - type: Wires
     layoutId: AirlockService
 
@@ -148,7 +148,7 @@
   suffix: Oasis, Locked, Sheriff
   components:
   - type: AccessReader
-    access: [["Sheriff"]]
+    access: [["OasisSheriff"]]
   - type: Wires
     layoutId: AirlockService
 
@@ -158,7 +158,7 @@
   suffix: Oasis, Locked, Mayor
   components:
   - type: AccessReader
-    access: [["Mayor"]]
+    access: [["OasisMayor"]]
   - type: Wires
     layoutId: AirlockService
 
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Machines/vending_machines.yml
index cb2ad0bdc25..59350071371 100644
--- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Machines/vending_machines.yml
@@ -1,3 +1,95 @@
+# Base
+- type: entity
+  id: N14VendingMachineStorageBase # This is for vending machines that are storage and not actual vending machines.
+  parent: BaseMachinePowered
+  name: vending machine
+  description: Just add capitalism!
+  abstract: true
+  components:
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -9
+    range: 3
+    enabled: false
+    sound:
+      path: /Audio/Ambience/Objects/vending_machine_hum.ogg
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/empty.rsi
+    snapCardinals: false
+  - type: Physics
+    bodyType: Static
+  - type: Transform
+    noRot: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.45,0.25,0.45"
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+        density: 1000
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Breakage"]
+      - !type:EjectVendorItems
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+  - type: Repairable
+    doAfterDelay: 8
+  - type: Anchorable
+  - type: TypingIndicator
+    proto: robot
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: Vending
+  - type: DoAfter
+  - type: Electrified
+    enabled: false
+    usesApcPower: true
+  - type: PointLight
+    enabled: false
+    castShadows: false
+    radius: 2
+    energy: 1.5
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: LitOnPowered
+  - type: ApcPowerReceiver
+    powerLoad: 200
+  - type: Actions
+  - type: StaticPrice
+    price: 100
+  - type: Appearance
+  - type: LanguageKnowledge
+    speaks:
+    - GalacticCommon
+    - RobotTalk
+    understands:
+    - GalacticCommon
+    - RobotTalk
+
+#
+
 - type: entity
   parent: VendingMachine
   id: N14VendingMachineNukaCola
@@ -41,7 +133,7 @@
 
 # vendors as storage type
 - type: entity
-  parent: VendingMachine
+  parent: N14VendingMachineStorageBase
   id: N14VendingMachineNukaColaNew
   suffix: storage, empty
   name: Nuka-Cola machine
@@ -111,7 +203,7 @@
         prob: 0.05
         
 - type: entity
-  parent: VendingMachine
+  parent: N14VendingMachineStorageBase
   id: N14VendingMachineVim
   suffix: storage, empty
   name: Vim machine
diff --git a/Resources/Prototypes/explosion.yml b/Resources/Prototypes/explosion.yml
index ff0c78d86e7..1eaf4f52ff4 100644
--- a/Resources/Prototypes/explosion.yml
+++ b/Resources/Prototypes/explosion.yml
@@ -110,9 +110,9 @@
       Blunt: 15
       Piercing: 6
       Structural: 40
-  tileBreakChance: [ 0.75, 0.95, 1 ]
-  tileBreakIntensity: [ 1, 10, 15 ]
-  tileBreakRerollReduction: 30
+  tileBreakChance: [ 0, 0.5, 1 ]
+  tileBreakIntensity: [ 0, 10, 30 ]
+  tileBreakRerollReduction: 10
   intensityPerState: 20
   lightColor: Orange
   texturePath: /Textures/Effects/fire.rsi
diff --git a/Resources/Prototypes/fonts.yml b/Resources/Prototypes/fonts.yml
index 03102cd341b..92c2947258c 100644
--- a/Resources/Prototypes/fonts.yml
+++ b/Resources/Prototypes/fonts.yml
@@ -45,3 +45,19 @@
 - type: font
   id: Emoji
   path: /Fonts/NotoEmoji.ttf
+
+- type: font
+  id: RubikBubbles
+  path: /Fonts/RubikBubbles.ttf
+
+- type: font
+  id: Copperplate
+  path: /Fonts/Copperplate.otf
+
+- type: font
+  id: Manga
+  path: /Fonts/Mangat.ttf
+
+- type: font
+  id: Noganas
+  path: /Fonts/Noganas.ttf
diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml
index 1554710013c..2e7dc45b8d7 100644
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -9,6 +9,17 @@
     - RampingStationEventScheduler
     - BasicRoundstartVariation
 
+- type: gamePreset
+  id: SurvivalHellshift
+  alias:
+    - hellshift
+  showInVote: true
+  name: hellshift-title
+  description: hellshift-description
+  rules:
+    - HellshiftStationEventScheduler
+    - BasicRoundstartVariation
+
 - type: gamePreset
   id: AllAtOnce
   name: all-at-once-title
@@ -90,7 +101,7 @@
     - traitor
   name: traitor-title
   description: traitor-description
-  showInVote: false
+  showInVote: true
   rules:
     - Traitor
     - SubGamemodesRule
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index c6a0ab3f8fd..c2e46d5f590 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -31,18 +31,30 @@
 - type: Tag
   id: Balloon
 
+- type: Tag
+  id: Banana
+
 - type: Tag
   id: BananaPeel
 
+- type: Tag
+  id: Bandana
+
 - type: Tag
   id: BaseballBat
 
 - type: Tag
   id: BBQsauce
 
+- type: Tag
+  id: Bedsheet
+
 - type: Tag
   id: Bee
 
+- type: Tag
+  id: Beer
+
 - type: Tag
   id: BikeHorn
 
@@ -202,6 +214,9 @@
 - type: Tag
   id: Bottle
 
+- type: Tag
+  id: BoxCardboard
+
 - type: Tag
   id: BoxHug
 
@@ -347,6 +362,9 @@
 - type: Tag
   id: ChemDispensable # container that can go into the chem dispenser
 
+- type: Tag
+  id: ChiliBowl
+
 - type: Tag
   id: Cigarette
 
@@ -383,11 +401,17 @@
 - type: Tag
   id: CluwneHorn
 
-- type: Tag #Ohioans die happy
+- type: Tag
+  id: Coldsauce
+
+- type: Tag
+  id: CoordinatesDisk
+
+- type: Tag
   id: Corn
 
 - type: Tag
-  id: Coldsauce
+  id: CottonBoll
 
 - type: Tag
   id: Cow
@@ -491,6 +515,9 @@
 - type: Tag
   id: DoorElectronics
 
+- type: Tag
+  id: DoorElectronicsConfigurator
+
 - type: Tag
   id: DonkPocket
 
@@ -677,6 +704,9 @@
 - type: Tag
   id: HighSecDoor
 
+- type: Tag
+  id: HiViz
+
 - type: Tag
   id: Hoe
 
@@ -764,9 +794,6 @@
 - type: Tag
   id: MacroBomb
 
-- type: Tag
-  id: MicroBomb
-
 - type: Tag
   id: MimeBelt
 
@@ -847,6 +874,12 @@
 - type: Tag
   id: Metal
 
+- type: Tag
+  id: MicroBomb
+
+- type: Tag
+  id: MicrowaveMachineBoard
+
 - type: Tag
   id: MindShield
 
@@ -877,9 +910,6 @@
 - type: Tag
   id: NoBlockAnchoring
 
-- type: Tag
-  id: NoPaint
-
 - type: Tag
   id: NozzleBackTank
 
@@ -1003,9 +1033,6 @@
 - type: Tag
   id: RawMaterial
 
-- type: Tag
-  id: RCDDeconstructWhitelist
-
 # Give this to something that doesn't need any special recycler behavior and just needs deleting.
 - type: Tag
   id: Recyclable
@@ -1142,6 +1169,9 @@
 - type: Tag
   id: StationMapElectronics
 
+- type: Tag
+  id: Steak
+
 - type: Tag
   id: SubdermalImplant
 
@@ -1211,6 +1241,9 @@
 - type: Tag
   id: UraniumGlassShard
 
+- type: Tag
+  id: Vegetable
+
 - type: Tag
   id: VimPilot
 
@@ -1250,6 +1283,9 @@
 - type: Tag
   id: Window
 
+- type: Tag
+  id: Wine
+
 - type: Tag
   id: WizardWand # that evil vvizard vvand
 
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..4bcff09c29d
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/icon.png
new file mode 100644
index 00000000000..02b99ef372d
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-left.png
new file mode 100644
index 00000000000..f6bb0731342
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-right.png
new file mode 100644
index 00000000000..d527a7daf96
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/meta.json
new file mode 100644
index 00000000000..e2732ec02cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6, inhands by peptide",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/equipped-HAND.png
deleted file mode 100644
index 61a4591b67f..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/equipped-HAND.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/icon.png
deleted file mode 100644
index 5904f18aff2..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-left.png
deleted file mode 100644
index 6c05483432b..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-right.png
deleted file mode 100644
index 1b786b19c77..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/meta.json
deleted file mode 100644
index 88e3ebd509d..00000000000
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/equipped-HAND.png
deleted file mode 100644
index 56cb86d5723..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/equipped-HAND.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/icon.png
deleted file mode 100644
index 20d31294525..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-left.png
deleted file mode 100644
index fe5f356b274..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-right.png
deleted file mode 100644
index 535677138ae..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json
deleted file mode 100644
index 88e3ebd509d..00000000000
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/icon.png
new file mode 100644
index 00000000000..d01ea7d9129
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json
new file mode 100644
index 00000000000..7a0bf77e1bf
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy for Space Station 14",
+  "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/Hands/Gloves/Color/gray.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/equipped-HAND.png
deleted file mode 100644
index 92fd0f3d729..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/equipped-HAND.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/icon.png
deleted file mode 100644
index 10fc55c579a..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-left.png
deleted file mode 100644
index cfbe7a4066b..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-right.png
deleted file mode 100644
index 1878f635198..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json
deleted file mode 100644
index 88e3ebd509d..00000000000
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/equipped-HAND.png
deleted file mode 100644
index 089be844882..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/equipped-HAND.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/icon.png
deleted file mode 100644
index 9c84c803b92..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/inhand-left.png
deleted file mode 100644
index 64a1ce54ca9..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/inhand-right.png
deleted file mode 100644
index 1405a9195d6..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json
deleted file mode 100644
index 88e3ebd509d..00000000000
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/equipped-HAND.png
deleted file mode 100644
index e1a9bf6860e..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/equipped-HAND.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/icon.png
deleted file mode 100644
index 09b2d39429f..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-left.png
deleted file mode 100644
index 16e615d2224..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-right.png
deleted file mode 100644
index 9ef6856a371..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json
deleted file mode 100644
index 88e3ebd509d..00000000000
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/equipped-HAND.png
deleted file mode 100644
index ebb73fed1b4..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/equipped-HAND.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/icon.png
deleted file mode 100644
index b879d6144c1..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-left.png
deleted file mode 100644
index 0ac2935cb13..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-right.png
deleted file mode 100644
index e0241e65fed..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json
deleted file mode 100644
index 88e3ebd509d..00000000000
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/equipped-HAND.png
deleted file mode 100644
index 9c05f89fe26..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/equipped-HAND.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/icon.png
deleted file mode 100644
index 04f8fb677df..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-left.png
deleted file mode 100644
index 7440a5a458a..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-right.png
deleted file mode 100644
index ceace967925..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json
deleted file mode 100644
index 88e3ebd509d..00000000000
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/equipped-HAND.png
deleted file mode 100644
index 72465e0ae47..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/equipped-HAND.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/icon.png
deleted file mode 100644
index a7cf36f869e..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-left.png
deleted file mode 100644
index a3e036119bb..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-right.png
deleted file mode 100644
index f8ea1028064..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json
deleted file mode 100644
index 88e3ebd509d..00000000000
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/icon.png
deleted file mode 100644
index a59b2c401dd..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json
deleted file mode 100644
index 88e3ebd509d..00000000000
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/equipped-HAND.png
deleted file mode 100644
index 6d366273974..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/equipped-HAND.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/icon.png
deleted file mode 100644
index 1eca25df500..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/inhand-left.png
deleted file mode 100644
index 5a4586c2f9d..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/inhand-right.png
deleted file mode 100644
index c993e20080e..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/meta.json
deleted file mode 100644
index dd95d954465..00000000000
--- a/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/55d823b97dda098a1b2ee9edfca7155c753e456e",
-  "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/Hardsuits/ERThelmets/ertchaplain.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon-flash.png
new file mode 100644
index 00000000000..7eaaa91e721
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon.png
new file mode 100644
index 00000000000..32457b19164
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/meta.json
new file mode 100644
index 00000000000..7cbcf430560
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "created by IProduceWidgets",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png
new file mode 100644
index 00000000000..67b29508a9b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-left.png
new file mode 100644
index 00000000000..c60c8172624
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-right.png
new file mode 100644
index 00000000000..2b20dab1727
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png
new file mode 100644
index 00000000000..c626307585b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-left.png
new file mode 100644
index 00000000000..d2126f33cb3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-right.png
new file mode 100644
index 00000000000..dea3b363356
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png
deleted file mode 100644
index ec1c408550d..00000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png
deleted file mode 100644
index 7a44f388c84..00000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png
deleted file mode 100644
index 4432f6604a1..00000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png
deleted file mode 100644
index c90ef794560..00000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json
deleted file mode 100644
index e0ee93d642c..00000000000
--- a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png
deleted file mode 100644
index e1e80b9293d..00000000000
Binary files a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json
deleted file mode 100644
index 2899868b907..00000000000
--- a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-4.0",
-  "copyright": "Kevin Zheng 2022",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Misc/flower-crown.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/equipped-NECK.png
rename to Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json
new file mode 100644
index 00000000000..c3dc06f19c5
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Kevin Zheng 2022 | equipped-NECK and icon Drawn by Ubaser.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png
deleted file mode 100644
index a87d0676fb4..00000000000
Binary files a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png
deleted file mode 100644
index f838e54e741..00000000000
Binary files a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png
deleted file mode 100644
index d56cbfde876..00000000000
Binary files a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json
deleted file mode 100644
index a470e009443..00000000000
--- a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism-equipped.png b/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism-equipped.png
new file mode 100644
index 00000000000..49e264e16ec
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism-equipped.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism.png b/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism.png
new file mode 100644
index 00000000000..16a2ce09cd0
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json
new file mode 100644
index 00000000000..e82672f071c
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-4.0",
+  "copyright": "Terraspark's work",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "autism"
+        },
+        {
+            "name": "autism-equipped",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/meta.json
deleted file mode 100644
index 71f798f2c4a..00000000000
--- a/Resources/Textures/Clothing/Neck/Misc/flower-wreath.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-
-  "states": [
-    {
-      "name": "equipped-NECK",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism-equipped.png b/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism-equipped.png
new file mode 100644
index 00000000000..39560cafa61
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism-equipped.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism.png b/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism.png
new file mode 100644
index 00000000000..22e9102e2ba
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json
new file mode 100644
index 00000000000..6848744ab8a
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-4.0",
+  "copyright": "Terraspark's work",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "goldautism"
+        },
+        {
+            "name": "goldautism-equipped",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
index 57fab6a8ba5..46b04963997 100644
--- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
@@ -6,69 +6,70 @@
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "aro"
-    },
-    {
-      "name": "aro-equipped",
-      "directions": 4
-    },
-	{
-      "name": "asex"
-    },
-    {
-      "name": "asex-equipped",
-      "directions": 4
-    },
-	{
-      "name": "bi"
-    },
-    {
-      "name": "bi-equipped",
-      "directions": 4
-    },
-	{
-      "name": "inter"
-    },
-    {
-      "name": "inter-equipped",
-      "directions": 4
-    },
-	{
-      "name": "les"
-    },
-    {
-      "name": "les-equipped",
-      "directions": 4
-    },
-	{
-      "name": "lgbt"
-    },
-    {
-      "name": "lgbt-equipped",
-      "directions": 4
-    },
-	{
-      "name": "non"
-    },
-    {
-      "name": "non-equipped",
-      "directions": 4
-    },
-	{
-      "name": "pan"
-    },
-    {
-      "name": "pan-equipped",
-      "directions": 4
-    },
-	{
-      "name": "trans"
-    },
-    {
-      "name": "trans-equipped",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "aro"
+        },
+        {
+            "name": "aro-equipped",
+            "directions": 4
+        },
+        {
+            "name": "asex"
+        },
+        {
+            "name": "asex-equipped",
+            "directions": 4
+        },
+        {
+            "name": "bi"
+        },
+        {
+            "name": "bi-equipped",
+            "directions": 4
+        },
+        {
+            "name": "inter"
+        },
+        {
+            "name": "inter-equipped",
+            "directions": 4
+        },
+        {
+            "name": "les"
+        },
+        {
+            "name": "les-equipped",
+            "directions": 4
+        },
+        {
+            "name": "lgbt"
+        },
+        {
+            "name": "lgbt-equipped",
+            "directions": 4
+        },
+        {
+            "name": "non"
+        },
+        {
+            "name": "non-equipped",
+            "directions": 4
+        },
+        {
+            "name": "pan"
+        },
+        {
+            "name": "pan-equipped",
+            "directions": 4
+        },
+        {
+            "name": "trans"
+        },
+        {
+            "name": "trans-equipped",
+            "directions": 4
+        }
+    ]
 }
+
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index e93c024893a..00000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png
deleted file mode 100644
index cd7f486a897..00000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png
deleted file mode 100644
index ce718ad3009..00000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png
deleted file mode 100644
index 6bfef738a45..00000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json
deleted file mode 100644
index 659ed1dddfd..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
-  "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/Coats/labcoat.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
index 50e9c6c8c60..489f958b9e9 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
index 5e6a8ee41d7..54bd14c8aac 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
index f60e234177d..57d36185047 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
index e171e8997e6..5f3b6bdd5dc 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png
new file mode 100644
index 00000000000..31025b7ddad
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png
new file mode 100644
index 00000000000..01e8e0fbc11
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
index 0420fe07990..02abb078069 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
@@ -20,6 +20,22 @@
     {
       "name": "open-equipped-OUTERCLOTHING",
       "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "open-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "open-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png
new file mode 100644
index 00000000000..31025b7ddad
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png
new file mode 100644
index 00000000000..01e8e0fbc11
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png
index 708dea3d7b7..d95cfab8a7f 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png
index 04f6c36d3f4..2fbbaa54df7 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png
index 8f0c1347218..83d3f527c8c 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png
index 3c7f5e1abdb..99937faf28e 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png
index 0fd1c0d8401..2dde993a3df 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png
index b2596585fae..285c57c33f3 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png
index 380a7eb5de4..3a3f3f85b0d 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png
index c016a74bc35..7be0d597256 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png
index 26764735cc4..5dc3a92fdcd 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png
index 5d9906772f0..c28ef522612 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..2acce2e63e8
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/icon.png
new file mode 100644
index 00000000000..4f4bb2b8fb2
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-left.png
new file mode 100644
index 00000000000..4ae23f153e4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-right.png
new file mode 100644
index 00000000000..d86d8ce96a1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/meta.json
new file mode 100644
index 00000000000..dac47ccdf59
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by IProduceWidgets",
+  "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/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-harpy.png
index f041f046bbc..b52bd4a7eb2 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..1a896e64f55
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
index 88e5b353cb0..3067907ba97 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.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/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14, harpy by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -18,6 +18,10 @@
       "name": "equipped-OUTERCLOTHING-monkey",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..17b5c141f6c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json
index 9ecf4115a97..6cfe1ea214d 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by PuroSlavKing (github) for SS14",
+  "copyright": "Made by PuroSlavKing (github) for SS14, harpy by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-harpy.png
index d2622538579..d914262edf5 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..7407a35a89f
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json
index 2cfc2220e1a..2de954bbf90 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by EmoGarbage404",
+  "copyright": "Made by EmoGarbage404, harpy by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..2c4083711a5
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json
index a9fe29a5892..090140fa8cd 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.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, modified by brainfood1183 (github)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github), harpy by VMSolidus",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-harpy",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-harpy.png
index 54b2f24d036..d83b9ac4f95 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..4a4bfff3389
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
index 6ba7a445cd7..f6910b12aa0 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.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, edited by Emisse for SS14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14, harpy edit by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-harpy",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-harpy.png
index 865364771e1..54657c95378 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-harpy.png
index 2510e35db9f..9eacc90753d 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-harpy.png
index 38403243634..a7194f6aae8 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-harpy.png
index 2d682adeae0..c9869a1c8d3 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png
index 8ccba9f1fca..1dc418613e9 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..2ff52d7425c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
index e482264df5f..def2d42704e 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-harpy.png
index 229b19e724d..b1873a8f626 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-harpy.png
index 43af6d982d9..72055773a3c 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-harpy.png
index 4900a6765b3..50e39fbef8e 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-harpy.png
index 9a6a1dabfb6..c07dd366a74 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..63f1e6b2873
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
index 7863947d1cc..b85c75656c4 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd",
+  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, harpy by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
@@ -23,4 +27,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-harpy.png
index 01080df27dd..6e8e808cff2 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json
index 90e3c14bb5e..88d91565d77 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github)",
+  "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github), harpy by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..3ed8b58be5a
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
index d0d17fbfba6..b05021b6c0c 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi, harpy edit by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..4c8d9b623c1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
index 659ed1dddfd..e9a9a4453d8 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..25cc5f10ac3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
index 86e27c9c1f7..4dcd7b13b58 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34",
+  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -18,6 +18,10 @@
       "name": "equipped-OUTERCLOTHING-monkey",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..8618317bfa6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
index b2c50fc4c67..8d09b75006a 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34",
+  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..2103d1f8416
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
index e164425199e..0482d086421 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -18,6 +18,10 @@
       "name": "equipped-OUTERCLOTHING-monkey",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..2284f606f34
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json
index e164425199e..0482d086421 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14, harpy edit by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -18,6 +18,10 @@
       "name": "equipped-OUTERCLOTHING-monkey",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..15592bbab1b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json
index e482264df5f..0a8c670a890 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/fire.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, harpy edit by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-harpy.png
new file mode 100644
index 00000000000..a7b07afefa2
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json
index e482264df5f..0a8c670a890 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/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/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy edit by VMSolidus",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-harpy",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Shoes/Color/black.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Color/black.rsi/equipped-FEET-vox.png
deleted file mode 100644
index 583a818e53c..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/black.rsi/equipped-FEET-vox.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/black.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/black.rsi/equipped-FEET.png
deleted file mode 100644
index 92f069be244..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/black.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/black.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/black.rsi/icon.png
deleted file mode 100644
index bf2a91927bb..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/black.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/black.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/black.rsi/inhand-left.png
deleted file mode 100644
index 0913bfe4dd6..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/black.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/black.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/black.rsi/inhand-right.png
deleted file mode 100644
index d854fb1dc21..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/black.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json
deleted file mode 100644
index 233691629aa..00000000000
--- a/Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "equipped-FEET", "directions": 4}, {"name": "inhand-left", "directions": 4}, {"name": "inhand-right", "directions": 4}, {"name": "equipped-FEET-vox", "directions": 4}]}
diff --git a/Resources/Textures/Clothing/Shoes/Color/blue.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/blue.rsi/equipped-FEET.png
deleted file mode 100644
index fdfd845fc96..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/blue.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/blue.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/blue.rsi/icon.png
deleted file mode 100644
index 5c9abb0963e..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/blue.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/blue.rsi/inhand-left.png
deleted file mode 100644
index 5d844ce09e2..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/blue.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/blue.rsi/inhand-right.png
deleted file mode 100644
index 4669e8771c5..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/blue.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/blue.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/blue.rsi/meta.json
deleted file mode 100644
index 54b1191d425..00000000000
--- a/Resources/Textures/Clothing/Shoes/Color/blue.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/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-FEET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Shoes/Color/brown.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/brown.rsi/equipped-FEET.png
deleted file mode 100644
index 6bf8932f146..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/brown.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/brown.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/brown.rsi/icon.png
deleted file mode 100644
index b2fb1eb6858..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/brown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/brown.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/brown.rsi/inhand-left.png
deleted file mode 100644
index 9b18d407419..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/brown.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/brown.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/brown.rsi/inhand-right.png
deleted file mode 100644
index d1236d63068..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/brown.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/brown.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/brown.rsi/meta.json
deleted file mode 100644
index 54b1191d425..00000000000
--- a/Resources/Textures/Clothing/Shoes/Color/brown.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/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-FEET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Shoes/Color/green.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/green.rsi/equipped-FEET.png
deleted file mode 100644
index 95a66438695..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/green.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/green.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/green.rsi/icon.png
deleted file mode 100644
index 6e2bb8cde48..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/green.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/green.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/green.rsi/inhand-left.png
deleted file mode 100644
index 5d4b837a924..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/green.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/green.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/green.rsi/inhand-right.png
deleted file mode 100644
index 15799306e80..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/green.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/green.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/green.rsi/meta.json
deleted file mode 100644
index 54b1191d425..00000000000
--- a/Resources/Textures/Clothing/Shoes/Color/green.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/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-FEET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Shoes/Color/orange.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/orange.rsi/equipped-FEET.png
deleted file mode 100644
index 6e5b72b88d7..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/orange.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/orange.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/orange.rsi/icon.png
deleted file mode 100644
index 5adb5f2d6af..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/orange.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/orange.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/orange.rsi/inhand-left.png
deleted file mode 100644
index e509ec0c4f7..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/orange.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/orange.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/orange.rsi/inhand-right.png
deleted file mode 100644
index 3516a60cd88..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/orange.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/orange.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/orange.rsi/meta.json
deleted file mode 100644
index 54b1191d425..00000000000
--- a/Resources/Textures/Clothing/Shoes/Color/orange.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/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-FEET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Shoes/Color/purple.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/purple.rsi/equipped-FEET.png
deleted file mode 100644
index 9e52d381b4e..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/purple.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/purple.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/purple.rsi/icon.png
deleted file mode 100644
index a21acc31b7c..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/purple.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/purple.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/purple.rsi/inhand-left.png
deleted file mode 100644
index 056e73d94d4..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/purple.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/purple.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/purple.rsi/inhand-right.png
deleted file mode 100644
index 01230871716..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/purple.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/purple.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/purple.rsi/meta.json
deleted file mode 100644
index 54b1191d425..00000000000
--- a/Resources/Textures/Clothing/Shoes/Color/purple.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/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-FEET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Shoes/Color/red.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/red.rsi/equipped-FEET.png
deleted file mode 100644
index 61d3dd5026c..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/red.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/red.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/red.rsi/icon.png
deleted file mode 100644
index b139627d8d4..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/red.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/red.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/red.rsi/inhand-left.png
deleted file mode 100644
index 4ae9c7e5359..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/red.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/red.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/red.rsi/inhand-right.png
deleted file mode 100644
index 73fbec68f5b..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/red.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/red.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/red.rsi/meta.json
deleted file mode 100644
index 54b1191d425..00000000000
--- a/Resources/Textures/Clothing/Shoes/Color/red.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/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-FEET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Shoes/Color/white.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/white.rsi/equipped-FEET.png
deleted file mode 100644
index db8ec2d0bb1..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/white.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/white.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/white.rsi/icon.png
deleted file mode 100644
index ac148524570..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/white.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/white.rsi/inhand-left.png
deleted file mode 100644
index a47cde63313..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/white.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/white.rsi/inhand-right.png
deleted file mode 100644
index 47119de2233..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/white.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/white.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/white.rsi/meta.json
deleted file mode 100644
index 54b1191d425..00000000000
--- a/Resources/Textures/Clothing/Shoes/Color/white.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/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-FEET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/equipped-FEET.png
deleted file mode 100644
index 083a41ec47a..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/icon.png
deleted file mode 100644
index 2398b7f04a5..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/inhand-left.png
deleted file mode 100644
index 082235b69c7..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/inhand-right.png
deleted file mode 100644
index f95c6619390..00000000000
Binary files a/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/meta.json
deleted file mode 100644
index 54b1191d425..00000000000
--- a/Resources/Textures/Clothing/Shoes/Color/yellow.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/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-FEET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/equipped-FEET.png
index 09c92cfa5f5..e62bf7af7d8 100644
Binary files a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-left.png
index 1ba8eb41732..3c4c4af0f08 100644
Binary files a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-right.png
index 7886baaeda6..0b772c7c856 100644
Binary files a/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Specific/skates.rsi/inhand-right.png differ
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
new file mode 100644
index 00000000000..a7ebf25671f
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET.png
new file mode 100644
index 00000000000..0baedaa9c0c
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET.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
new file mode 100644
index 00000000000..d81e2314b68
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET.png
new file mode 100644
index 00000000000..dd4df4b601c
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/icon.png b/Resources/Textures/Clothing/Shoes/color.rsi/icon.png
new file mode 100644
index 00000000000..8e42e5c5ce8
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/color.rsi/inhand-left.png
new file mode 100644
index 00000000000..d3741e6b7b3
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/color.rsi/inhand-right.png
new file mode 100644
index 00000000000..5a4e04ca31f
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/meta.json b/Resources/Textures/Clothing/Shoes/color.rsi/meta.json
new file mode 100644
index 00000000000..5e43acc0863
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/color.rsi/meta.json
@@ -0,0 +1,57 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "equipped-FEET-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "soles-icon"
+    },
+    {
+      "name": "soles-equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "soles-equipped-FEET-vox",
+      "directions": 4
+    },
+    {
+      "name": "soles-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "soles-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "contrastedsoles-equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "contrastedsoles-equipped-FEET-vox",
+      "directions": 4
+    }
+  ]
+}
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
new file mode 100644
index 00000000000..0255ed7b786
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET.png
new file mode 100644
index 00000000000..6d643f6f3be
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/soles-icon.png b/Resources/Textures/Clothing/Shoes/color.rsi/soles-icon.png
new file mode 100644
index 00000000000..ba918d282df
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/soles-icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/soles-inhand-left.png b/Resources/Textures/Clothing/Shoes/color.rsi/soles-inhand-left.png
new file mode 100644
index 00000000000..19945c1a590
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/soles-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/soles-inhand-right.png b/Resources/Textures/Clothing/Shoes/color.rsi/soles-inhand-right.png
new file mode 100644
index 00000000000..a33bc4d825d
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/color.rsi/soles-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 6a76cd35eff..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 8bf8b8906f0..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/icon.png
deleted file mode 100644
index d39607e94dd..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/inhand-left.png
deleted file mode 100644
index 8ca0193cb17..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/inhand-right.png
deleted file mode 100644
index f2a18bc4ebb..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 4df69fee458..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index f453ae0427a..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/icon.png
deleted file mode 100644
index 0420b506db0..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/inhand-left.png
deleted file mode 100644
index 6aad4575267..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/inhand-right.png
deleted file mode 100644
index b185b623967..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index a16b8908c21..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index fc7582154f9..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/icon.png
deleted file mode 100644
index 0c2d3ece6b6..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/inhand-left.png
deleted file mode 100644
index d316b0400e1..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/inhand-right.png
deleted file mode 100644
index 6523d6ef6de..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 21e3f5f76c2..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 3f010030040..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/icon.png
deleted file mode 100644
index 97bd52cfe97..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/inhand-left.png
deleted file mode 100644
index ea01f616e46..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/inhand-right.png
deleted file mode 100644
index 2ef7181ab07..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 11a28280d7d..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index ae2631d0da8..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/icon.png
deleted file mode 100644
index 5077680c75a..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/inhand-left.png
deleted file mode 100644
index 5456486c258..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/inhand-right.png
deleted file mode 100644
index 23855a8759e..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 161af53da25..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index c5b151b4934..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/icon.png
deleted file mode 100644
index 1407b79d7a3..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-left.png
deleted file mode 100644
index 5456486c258..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-right.png
deleted file mode 100644
index 23855a8759e..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 7edf356ec60..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 5074896bfbe..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/icon.png
deleted file mode 100644
index 3c0c3e0f9a4..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/inhand-left.png
deleted file mode 100644
index ae15d262d7a..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/inhand-right.png
deleted file mode 100644
index 60bea1b51ac..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 4d274a22827..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index d3fb22d4be0..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/icon.png
deleted file mode 100644
index a240bfd7d7a..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-left.png
deleted file mode 100644
index d316b0400e1..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-right.png
deleted file mode 100644
index 6523d6ef6de..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 80854928bf1..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 7dc954dd906..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/icon.png
deleted file mode 100644
index 61fc966e588..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/inhand-left.png
deleted file mode 100644
index 46be5288e60..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/inhand-right.png
deleted file mode 100644
index f1911c7ec0b..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 3df6ea0d92c..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 6d92e3e4504..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/icon.png
deleted file mode 100644
index 9be9ecf9d68..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/inhand-left.png
deleted file mode 100644
index a703128c963..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/inhand-right.png
deleted file mode 100644
index 8c73e1c7ce2..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index fe4dcbe7f75..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index cef8a7c5f87..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/icon.png
deleted file mode 100644
index 3f876a8b2a7..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/inhand-left.png
deleted file mode 100644
index 5e5c42697c3..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/inhand-right.png
deleted file mode 100644
index fee1dd85cd2..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 00e7198cc4c..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 6698c719ff1..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/icon.png
deleted file mode 100644
index bef1f6a308f..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/inhand-left.png
deleted file mode 100644
index 9112f9b9802..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/inhand-right.png
deleted file mode 100644
index d3df7bcb6b7..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 0e1f28b34f8..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 31cb581211a..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/icon.png
deleted file mode 100644
index 52ac071c077..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/inhand-left.png
deleted file mode 100644
index 4cd9c955ae1..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/inhand-right.png
deleted file mode 100644
index ae5a124c663..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 04ea2792e8f..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index f37256fe848..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/icon.png
deleted file mode 100644
index b2757bc0905..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/inhand-left.png
deleted file mode 100644
index 748bfb2e972..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/inhand-right.png
deleted file mode 100644
index 4944e6fc0ba..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 6c3ea56b531..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 8c7d6e406ce..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/icon.png
deleted file mode 100644
index 0d2bf73ca83..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/inhand-left.png
deleted file mode 100644
index 592cd94079c..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/inhand-right.png
deleted file mode 100644
index 3d3dd56f27e..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 07673c8fa64..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index d5575580811..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/icon.png
deleted file mode 100644
index 15670841c25..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/inhand-left.png
deleted file mode 100644
index 6959537bcea..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/inhand-right.png
deleted file mode 100644
index 148b9812320..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3faba7285ff
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
new file mode 100644
index 00000000000..64642a11589
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png
new file mode 100644
index 00000000000..0b131234865
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png
new file mode 100644
index 00000000000..ba6769d59d5
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
new file mode 100644
index 00000000000..7e6832bd12c
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
@@ -0,0 +1,56 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "trinkets-icon"
+    },
+    {
+      "name": "trinkets-equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "trinkets-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "trinkets-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "prisoner-icon"
+    },
+    {
+      "name": "prisoner-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "prisoner-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "prisoner-equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..f5230c64000
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-icon.png
new file mode 100644
index 00000000000..0cea666be50
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png
new file mode 100644
index 00000000000..f6ff6866ffc
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png
new file mode 100644
index 00000000000..45393e81a66
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..cee5a50d2ca
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-icon.png
new file mode 100644
index 00000000000..effb2ada73a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-inhand-left.png
new file mode 100644
index 00000000000..9bbcac8268a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-inhand-right.png
new file mode 100644
index 00000000000..cfd72583152
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index cf66060dca3..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 1492d76a1d4..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/icon.png
deleted file mode 100644
index e2cb52fdec7..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/inhand-left.png
deleted file mode 100644
index 0e029596526..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/inhand-right.png
deleted file mode 100644
index cfbe848c3b2..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/meta.json
deleted file mode 100644
index 36ab573091a..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index cb1a5eece64..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 445e8d01df4..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/icon.png
deleted file mode 100644
index 8cf3cc9e901..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-left.png
deleted file mode 100644
index 8ca0193cb17..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-right.png
deleted file mode 100644
index f2a18bc4ebb..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 93c02f4b754..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index ce33a56ae74..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/icon.png
deleted file mode 100644
index 54266e7972d..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-left.png
deleted file mode 100644
index 6aad4575267..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-right.png
deleted file mode 100644
index b185b623967..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 38766b03b56..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 95090dd7525..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/icon.png
deleted file mode 100644
index 9dcfac02b71..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-left.png
deleted file mode 100644
index d316b0400e1..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-right.png
deleted file mode 100644
index 6523d6ef6de..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index a5bff74a25c..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 74bab00422a..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/icon.png
deleted file mode 100644
index a054d2a82ef..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-left.png
deleted file mode 100644
index ea01f616e46..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-right.png
deleted file mode 100644
index 2ef7181ab07..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index a48109bfba1..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 4ae08467c95..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/icon.png
deleted file mode 100644
index 5f9834bf8e2..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-left.png
deleted file mode 100644
index 5456486c258..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-right.png
deleted file mode 100644
index 23855a8759e..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 947d515970f..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 029f91d0d48..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/icon.png
deleted file mode 100644
index c8b62b63ff1..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-left.png
deleted file mode 100644
index 5456486c258..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-right.png
deleted file mode 100644
index 23855a8759e..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index a1e1573d24b..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/equipped-INNERCLOTHING-vox.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/equipped-INNERCLOTHING-vox.png
deleted file mode 100644
index f312aac2977..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/equipped-INNERCLOTHING-vox.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 56c385790ea..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/icon.png
deleted file mode 100644
index 4b976a5ede7..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-left.png
deleted file mode 100644
index ae15d262d7a..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-right.png
deleted file mode 100644
index 60bea1b51ac..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/meta.json
deleted file mode 100644
index 6a2ed232047..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/meta.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 5989aa1d079..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index d77f8e18e13..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/icon.png
deleted file mode 100644
index db1bf71e11d..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-left.png
deleted file mode 100644
index d316b0400e1..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-right.png
deleted file mode 100644
index 6523d6ef6de..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 06d66a9b1ae..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index a7784172f72..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/icon.png
deleted file mode 100644
index e3825ee3d11..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-left.png
deleted file mode 100644
index 46be5288e60..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-right.png
deleted file mode 100644
index f1911c7ec0b..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 543da4f4e4f..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index ddab094d22b..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/icon.png
deleted file mode 100644
index 459de73286b..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-left.png
deleted file mode 100644
index a703128c963..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-right.png
deleted file mode 100644
index 8c73e1c7ce2..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 3ac7ea5d022..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 71e32fc8ea6..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/icon.png
deleted file mode 100644
index c443437f6ac..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-left.png
deleted file mode 100644
index 5e5c42697c3..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-right.png
deleted file mode 100644
index fee1dd85cd2..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index d69c0924ea7..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index bb3294245a5..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/icon.png
deleted file mode 100644
index db1cba5d7ef..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-left.png
deleted file mode 100644
index 9112f9b9802..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-right.png
deleted file mode 100644
index d3df7bcb6b7..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index d1274a497a1..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 27edb0b73ed..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/icon.png
deleted file mode 100644
index 871e9e5e4ea..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-left.png
deleted file mode 100644
index 4cd9c955ae1..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-right.png
deleted file mode 100644
index ae5a124c663..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 77710536580..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 2c8be92e08e..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/icon.png
deleted file mode 100644
index d2156294af5..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-left.png
deleted file mode 100644
index 748bfb2e972..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-right.png
deleted file mode 100644
index 4944e6fc0ba..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index c99223c4672..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 1196f82db6e..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/icon.png
deleted file mode 100644
index 3cf289d5ac5..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-left.png
deleted file mode 100644
index 592cd94079c..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-right.png
deleted file mode 100644
index 3d3dd56f27e..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 69166ef2e52..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index e884390be20..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/icon.png
deleted file mode 100644
index 74cc6a4f8cc..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-left.png
deleted file mode 100644
index 6959537bcea..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-right.png
deleted file mode 100644
index 148b9812320..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..5c333dfc118
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
new file mode 100644
index 00000000000..c0087d4d250
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png
new file mode 100644
index 00000000000..0b131234865
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png
new file mode 100644
index 00000000000..ba6769d59d5
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
new file mode 100644
index 00000000000..7e6832bd12c
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
@@ -0,0 +1,56 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by Flareguy for Space Station 14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "trinkets-icon"
+    },
+    {
+      "name": "trinkets-equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "trinkets-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "trinkets-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "prisoner-icon"
+    },
+    {
+      "name": "prisoner-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "prisoner-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "prisoner-equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..320db64b579
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png
new file mode 100644
index 00000000000..faebe0e0550
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png
new file mode 100644
index 00000000000..f6ff6866ffc
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-right.png
new file mode 100644
index 00000000000..45393e81a66
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..e21afe8d4eb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png
new file mode 100644
index 00000000000..c9e8398b47d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png
new file mode 100644
index 00000000000..9bbcac8268a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png
new file mode 100644
index 00000000000..cfd72583152
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 00000000000..3fb85861a1d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..ef532d7232b
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/icon.png
new file mode 100644
index 00000000000..fdaf39cf4e3
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-left.png
new file mode 100644
index 00000000000..ed878f2d310
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-right.png
new file mode 100644
index 00000000000..7cc2bc1ce22
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/meta.json
new file mode 100644
index 00000000000..dca2585d6be
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14, monkey made by brainfood1183 (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 6c1672bd7f4..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index a4ec7058a13..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/icon.png
deleted file mode 100644
index 69109945802..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-left.png
deleted file mode 100644
index 0e029596526..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-right.png
deleted file mode 100644
index cfbe848c3b2..00000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json
deleted file mode 100644
index 1fb9cf1b666..00000000000
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_standart.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_standard.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_standart.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_standard.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standard.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standard.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart2.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standard2.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart2.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standard2.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart1.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard1.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart1.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard1.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart2.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard2.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart2.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard2.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart3.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard3.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart3.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard3.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart4.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard4.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart4.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard4.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart5.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard5.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart5.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard5.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart6.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard6.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart6.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard6.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart7.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard7.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart7.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard7.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart8.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard8.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart8.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard8.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart9.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard9.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart9.png
rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard9.png
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/procedural.rsi/meta.json
index 08133fc00b0..545f209db9b 100644
--- a/Resources/Textures/Clothing/Uniforms/procedural.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/procedural.rsi/meta.json
@@ -20,7 +20,7 @@
       "directions": 4
     },
     {
-      "name": "base_leg_standart",
+      "name": "base_leg_standard",
       "directions": 4
     },
     {
@@ -36,11 +36,11 @@
       "directions": 4
     },
     {
-      "name": "base_torso_standart",
+      "name": "base_torso_standard",
       "directions": 4
     },
     {
-      "name": "base_torso_standart2",
+      "name": "base_torso_standard2",
       "directions": 4
     },
     {
@@ -116,39 +116,39 @@
       "directions": 4
     },
     {
-      "name": "decor_torso_standart1",
+      "name": "decor_torso_standard1",
       "directions": 4
     },
     {
-      "name": "decor_torso_standart2",
+      "name": "decor_torso_standard2",
       "directions": 4
     },
     {
-      "name": "decor_torso_standart3",
+      "name": "decor_torso_standard3",
       "directions": 4
     },
     {
-      "name": "decor_torso_standart4",
+      "name": "decor_torso_standard4",
       "directions": 4
     },
     {
-      "name": "decor_torso_standart5",
+      "name": "decor_torso_standard5",
       "directions": 4
     },
     {
-      "name": "decor_torso_standart6",
+      "name": "decor_torso_standard6",
       "directions": 4
     },
     {
-      "name": "decor_torso_standart7",
+      "name": "decor_torso_standard7",
       "directions": 4
     },
     {
-      "name": "decor_torso_standart8",
+      "name": "decor_torso_standard8",
       "directions": 4
     },
     {
-      "name": "decor_torso_standart9",
+      "name": "decor_torso_standard9",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/icon-open.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/icon-open.png
new file mode 100644
index 00000000000..3ff890bfe28
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/icon-open.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json
index 7ff53e30fc6..beb93d20c72 100644
--- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json
@@ -1,26 +1,29 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Art by Leonardo_DaBepis. https://leonardo-dabepis.tumblr.com/",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Art by Leonardo_DaBepis. https://leonardo-dabepis.tumblr.com/",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-        "name": "equipped-OUTERCLOTHING",
-        "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-open"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png
index ff95b7299f4..93dda474b61 100644
Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png
index dd5a7508a9a..e73d681178c 100644
Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png
index c87fddc15fe..948bdd090c8 100644
Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png
index 65bbca12fa7..13eca7f0a62 100644
Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png
index ae58f653ccb..b01d76dbb83 100644
Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png
index 16687721a7f..1e009b91c85 100644
Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png
index 1af2f8defa6..5eb7edc8a25 100644
Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png
index 81a103a0842..4a2a80204ae 100644
Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_f.png b/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_f.png
deleted file mode 100644
index 23dde35cd8e..00000000000
Binary files a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchaplain.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchaplain.png
deleted file mode 100644
index d27ec5bbfdb..00000000000
Binary files a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchaplain.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json
deleted file mode 100644
index 521c6e58fa7..00000000000
--- a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "idchaplain"
-    },
-    {
-      "name": "nyanogladiator"
-    },
-    {
-      "name": "nyanoprisonguard"
-    },
-    {
-      "name": "nyanoprisoner"
-    },
-    {
-      "name": "nyanomailcarrier"
-    },
-    {
-      "name": "nyanomartialartist"
-    },
-    {
-      "name": "nyanomantis"
-    }
-  ]
-}
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanogladiator.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanogladiator.png
deleted file mode 100644
index 17f3ea2aae1..00000000000
Binary files a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanogladiator.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomailcarrier.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomailcarrier.png
deleted file mode 100644
index ba7a3d4dcdd..00000000000
Binary files a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomailcarrier.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomantis.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomantis.png
deleted file mode 100644
index f80e175ec33..00000000000
Binary files a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomantis.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomartialartist.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomartialartist.png
deleted file mode 100644
index 1f7862d0922..00000000000
Binary files a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomartialartist.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisoner.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisoner.png
deleted file mode 100644
index 96c8f4d9825..00000000000
Binary files a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisoner.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png
deleted file mode 100644
index 0539dd50da6..00000000000
Binary files a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Effects/harpysinger.rsi/meta.json b/Resources/Textures/Effects/harpysinger.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Effects/harpysinger.rsi/meta.json
rename to Resources/Textures/Effects/harpysinger.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Effects/harpysinger.rsi/singing_music_notes.png b/Resources/Textures/Effects/harpysinger.rsi/singing_music_notes.png
similarity index 100%
rename from Resources/Textures/DeltaV/Effects/harpysinger.rsi/singing_music_notes.png
rename to Resources/Textures/Effects/harpysinger.rsi/singing_music_notes.png
diff --git a/Resources/Textures/Effects/rcd.rsi/construct.png b/Resources/Textures/Effects/rcd.rsi/construct.png
deleted file mode 100644
index f4be36c9bf4..00000000000
Binary files a/Resources/Textures/Effects/rcd.rsi/construct.png and /dev/null differ
diff --git a/Resources/Textures/Effects/rcd.rsi/construct0.png b/Resources/Textures/Effects/rcd.rsi/construct0.png
new file mode 100644
index 00000000000..d83fa0506c6
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/construct0.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/construct1.png b/Resources/Textures/Effects/rcd.rsi/construct1.png
new file mode 100644
index 00000000000..0b597fe1080
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/construct1.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/construct2.png b/Resources/Textures/Effects/rcd.rsi/construct2.png
new file mode 100644
index 00000000000..0b597fe1080
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/construct2.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/construct3.png b/Resources/Textures/Effects/rcd.rsi/construct3.png
new file mode 100644
index 00000000000..0b597fe1080
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/construct3.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/construct4.png b/Resources/Textures/Effects/rcd.rsi/construct4.png
new file mode 100644
index 00000000000..1f47a0f1eb8
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/construct4.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/deconstruct2.png b/Resources/Textures/Effects/rcd.rsi/deconstruct2.png
new file mode 100644
index 00000000000..d2144af3c78
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/deconstruct2.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/deconstruct4.png b/Resources/Textures/Effects/rcd.rsi/deconstruct4.png
new file mode 100644
index 00000000000..70771150669
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/deconstruct4.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/deconstruct6.png b/Resources/Textures/Effects/rcd.rsi/deconstruct6.png
new file mode 100644
index 00000000000..70771150669
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/deconstruct6.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/deconstruct8.png b/Resources/Textures/Effects/rcd.rsi/deconstruct8.png
new file mode 100644
index 00000000000..79d724e6ba2
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/deconstruct8.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/deconstructPreview.png b/Resources/Textures/Effects/rcd.rsi/deconstructPreview.png
new file mode 100644
index 00000000000..2d114002fb2
Binary files /dev/null and b/Resources/Textures/Effects/rcd.rsi/deconstructPreview.png differ
diff --git a/Resources/Textures/Effects/rcd.rsi/meta.json b/Resources/Textures/Effects/rcd.rsi/meta.json
index 5004a9c4fcf..c9e8320c60b 100644
--- a/Resources/Textures/Effects/rcd.rsi/meta.json
+++ b/Resources/Textures/Effects/rcd.rsi/meta.json
@@ -8,7 +8,202 @@
     "copyright": "Taken from tgStation at commit https://github.com/tgstation/tgstation/commit/d75cbd0a2900fdec4c12cd5ba986b52ccff03713/icons/effects/effects_rcd.dmi",
     "states": [
         {
-            "name": "construct",
+            "name": "construct0",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },		
+		{
+            "name": "construct1",
+            "delays": [
+                [
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    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": "construct2",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+		{
+            "name": "construct3",
+            "delays": [
+                [
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    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": "construct4",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+					0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    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": "deconstruct2",
             "delays": [
                 [
                     0.1,
@@ -45,6 +240,220 @@
                     0.1
                 ]
             ]
+        },
+		{
+            "name": "deconstruct4",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+					0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    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": "deconstruct6",
+            "delays": [
+                [
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+					0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    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": "deconstruct8",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+					0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+		{
+            "name": "deconstructPreview",
+            "delays": [
+                [
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+					0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05                    
+                ]
+            ]
         }
     ]
 }
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/0.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/0.png
new file mode 100644
index 00000000000..760a92bfe12
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/essence_counter.rsi/0.png differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/1.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/1.png
new file mode 100644
index 00000000000..a43c58356e8
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/essence_counter.rsi/1.png differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/2.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/2.png
new file mode 100644
index 00000000000..9807aa8161b
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/essence_counter.rsi/2.png differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/3.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/3.png
new file mode 100644
index 00000000000..a1776e8efdf
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/essence_counter.rsi/3.png differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/4.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/4.png
new file mode 100644
index 00000000000..a1b8c7013ef
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/essence_counter.rsi/4.png differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/5.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/5.png
new file mode 100644
index 00000000000..479ef53d644
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/essence_counter.rsi/5.png differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/6.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/6.png
new file mode 100644
index 00000000000..1222a73b5e9
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/essence_counter.rsi/6.png differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/7.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/7.png
new file mode 100644
index 00000000000..e6bef33ed5b
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/essence_counter.rsi/7.png differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/8.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/8.png
new file mode 100644
index 00000000000..c72dbb5433d
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/essence_counter.rsi/8.png differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/9.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/9.png
new file mode 100644
index 00000000000..970eeb9740e
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/essence_counter.rsi/9.png differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png
index 361fa844e16..3523928f3cd 100644
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png and b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence1.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence1.png
deleted file mode 100644
index b59f46bf28e..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence1.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence10.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence10.png
deleted file mode 100644
index 62557685d96..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence10.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence11.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence11.png
deleted file mode 100644
index 78919a5cda3..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence11.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence12.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence12.png
deleted file mode 100644
index 9a915624f39..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence12.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence13.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence13.png
deleted file mode 100644
index d853af038e3..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence13.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence14.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence14.png
deleted file mode 100644
index 90345540138..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence14.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence15.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence15.png
deleted file mode 100644
index cc2cc47756f..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence15.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png
deleted file mode 100644
index e1a641f9e8b..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence2.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence2.png
deleted file mode 100644
index 8b333510621..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence2.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence3.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence3.png
deleted file mode 100644
index 7d22c2a9b6f..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence3.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence4.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence4.png
deleted file mode 100644
index 98f6fc0764a..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence4.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence5.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence5.png
deleted file mode 100644
index 11252a4c16c..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence5.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence6.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence6.png
deleted file mode 100644
index 36211437c09..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence6.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence7.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence7.png
deleted file mode 100644
index febaf3d09c9..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence7.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence8.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence8.png
deleted file mode 100644
index 4a2ba8d13ec..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence8.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence9.png b/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence9.png
deleted file mode 100644
index 8e0c559e8e4..00000000000
Binary files a/Resources/Textures/Interface/Alerts/essence_counter.rsi/essence9.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Alerts/essence_counter.rsi/meta.json b/Resources/Textures/Interface/Alerts/essence_counter.rsi/meta.json
index 562ef369b48..08c01e6008a 100644
--- a/Resources/Textures/Interface/Alerts/essence_counter.rsi/meta.json
+++ b/Resources/Textures/Interface/Alerts/essence_counter.rsi/meta.json
@@ -11,52 +11,34 @@
       "name": "essence0"
     },
     {
-      "name": "essence1"
+      "name": "0"
     },
     {
-      "name": "essence2"
+      "name": "1"
     },
     {
-      "name": "essence3"
+      "name": "2"
     },
     {
-      "name": "essence4"
+      "name": "3"
     },
     {
-      "name": "essence5"
+      "name": "4"
     },
     {
-      "name": "essence6"
+      "name": "5"
     },
     {
-      "name": "essence7"
+      "name": "6"
     },
     {
-      "name": "essence8"
+      "name": "7"
     },
     {
-      "name": "essence9"
+      "name": "8"
     },
     {
-      "name": "essence10"
-    },
-    {
-      "name": "essence11"
-    },
-    {
-      "name": "essence12"
-    },
-    {
-      "name": "essence13"
-    },
-    {
-      "name": "essence14"
-    },
-    {
-      "name": "essence15"
-    },
-    {
-      "name": "essence16"
+      "name": "9"
     }
   ]
 }
diff --git a/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json b/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json
new file mode 100644
index 00000000000..9b5f9361314
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Original icon taken from https://github.com/ss220-space/Paradise/blob/master220/icons/mob/screen_alert.dmi, modified by Mocho",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "offer_item"
+    }
+  ]
+}
diff --git a/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png b/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png
new file mode 100644
index 00000000000..44ac380ddb1
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png differ
diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/meta.json b/Resources/Textures/Interface/Alerts/walking.rsi/meta.json
new file mode 100644
index 00000000000..d328b01a45f
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/walking.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Walking/Running icons modified by Mocho, original taken from /tg/station https://github.com/tgstation/tgstation/pull/52691/commits/6a1261187c108c8f151c99ebfa567bd1ec34044c",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "walking0"
+        },
+        {
+            "name": "walking1"
+        }
+    ]
+}
diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png b/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png
new file mode 100644
index 00000000000..1d1f048fb91
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png differ
diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/walking1.png b/Resources/Textures/Interface/Alerts/walking.rsi/walking1.png
new file mode 100644
index 00000000000..3980ee73b5d
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/walking.rsi/walking1.png differ
diff --git a/Resources/Textures/Interface/Misc/give_item.rsi/give_item.png b/Resources/Textures/Interface/Misc/give_item.rsi/give_item.png
new file mode 100644
index 00000000000..26bc88fb229
Binary files /dev/null and b/Resources/Textures/Interface/Misc/give_item.rsi/give_item.png differ
diff --git a/Resources/Textures/Interface/Misc/give_item.rsi/meta.json b/Resources/Textures/Interface/Misc/give_item.rsi/meta.json
new file mode 100644
index 00000000000..94cd6fa2e1e
--- /dev/null
+++ b/Resources/Textures/Interface/Misc/give_item.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/ss220-space/Paradise/blob/master220/icons/misc/mouse_icons/give_item.dmi",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "give_item"
+    }
+  ]
+}
diff --git a/Resources/Textures/Interface/Radial/RCD/airlock.png b/Resources/Textures/Interface/Radial/RCD/airlock.png
new file mode 100644
index 00000000000..7b1e0e9aa08
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/airlock.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/airlocks.png b/Resources/Textures/Interface/Radial/RCD/airlocks.png
new file mode 100644
index 00000000000..1195d79b58b
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/airlocks.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/bulb_light.png b/Resources/Textures/Interface/Radial/RCD/bulb_light.png
new file mode 100644
index 00000000000..d607bebf77d
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/bulb_light.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/cable_terminal.png b/Resources/Textures/Interface/Radial/RCD/cable_terminal.png
new file mode 100644
index 00000000000..7634566ca36
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/cable_terminal.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/catwalk.png b/Resources/Textures/Interface/Radial/RCD/catwalk.png
new file mode 100644
index 00000000000..c550f120f12
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/catwalk.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/computer_frame.png b/Resources/Textures/Interface/Radial/RCD/computer_frame.png
new file mode 100644
index 00000000000..39661a40920
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/computer_frame.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/computers_and_frames.png b/Resources/Textures/Interface/Radial/RCD/computers_and_frames.png
new file mode 100644
index 00000000000..0f17ab5ef1d
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/computers_and_frames.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/deconstruct.png b/Resources/Textures/Interface/Radial/RCD/deconstruct.png
new file mode 100644
index 00000000000..ca9548e0cf9
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/deconstruct.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/directional.png b/Resources/Textures/Interface/Radial/RCD/directional.png
new file mode 100644
index 00000000000..473ad252aaf
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/directional.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/directional_reinforced.png b/Resources/Textures/Interface/Radial/RCD/directional_reinforced.png
new file mode 100644
index 00000000000..3cb416d2c33
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/directional_reinforced.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/firelock.png b/Resources/Textures/Interface/Radial/RCD/firelock.png
new file mode 100644
index 00000000000..5b581a2aa37
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/firelock.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/glass_airlock.png b/Resources/Textures/Interface/Radial/RCD/glass_airlock.png
new file mode 100644
index 00000000000..bc0dbb3591f
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/glass_airlock.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/grille.png b/Resources/Textures/Interface/Radial/RCD/grille.png
new file mode 100644
index 00000000000..5a5234687e7
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/grille.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/hv_coil.png b/Resources/Textures/Interface/Radial/RCD/hv_coil.png
new file mode 100644
index 00000000000..c2b5cab3692
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/hv_coil.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/lighting.png b/Resources/Textures/Interface/Radial/RCD/lighting.png
new file mode 100644
index 00000000000..df167f35a8d
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/lighting.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/lv_coil.png b/Resources/Textures/Interface/Radial/RCD/lv_coil.png
new file mode 100644
index 00000000000..f83ed75325b
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/lv_coil.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/machine_frame.png b/Resources/Textures/Interface/Radial/RCD/machine_frame.png
new file mode 100644
index 00000000000..5dd90251e74
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/machine_frame.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/metal_tile.png b/Resources/Textures/Interface/Radial/RCD/metal_tile.png
new file mode 100644
index 00000000000..14f1ce2bd9d
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/metal_tile.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/multicoil.png b/Resources/Textures/Interface/Radial/RCD/multicoil.png
new file mode 100644
index 00000000000..9e32919a7ba
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/multicoil.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/mv_coil.png b/Resources/Textures/Interface/Radial/RCD/mv_coil.png
new file mode 100644
index 00000000000..c58e9a28055
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/mv_coil.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/plating.png b/Resources/Textures/Interface/Radial/RCD/plating.png
new file mode 100644
index 00000000000..d3a63acc610
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/plating.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/reinforced_wall.png b/Resources/Textures/Interface/Radial/RCD/reinforced_wall.png
new file mode 100644
index 00000000000..07486830e25
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/reinforced_wall.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/solid_wall.png b/Resources/Textures/Interface/Radial/RCD/solid_wall.png
new file mode 100644
index 00000000000..b3efd02ac9a
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/solid_wall.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/tube_light.png b/Resources/Textures/Interface/Radial/RCD/tube_light.png
new file mode 100644
index 00000000000..9c94ccbd7b0
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/tube_light.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/walls_and_flooring.png b/Resources/Textures/Interface/Radial/RCD/walls_and_flooring.png
new file mode 100644
index 00000000000..88d3c36c7a5
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/walls_and_flooring.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/window.png b/Resources/Textures/Interface/Radial/RCD/window.png
new file mode 100644
index 00000000000..ed486c23b8e
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/window.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/window_reinforced.png b/Resources/Textures/Interface/Radial/RCD/window_reinforced.png
new file mode 100644
index 00000000000..80efff04ec8
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/window_reinforced.png differ
diff --git a/Resources/Textures/Interface/Radial/RCD/windows_and_grilles.png b/Resources/Textures/Interface/Radial/RCD/windows_and_grilles.png
new file mode 100644
index 00000000000..e51ab094233
Binary files /dev/null and b/Resources/Textures/Interface/Radial/RCD/windows_and_grilles.png differ
diff --git a/Resources/Textures/Interface/Radial/back_hover.png b/Resources/Textures/Interface/Radial/back_hover.png
new file mode 100644
index 00000000000..7378a60fef4
Binary files /dev/null and b/Resources/Textures/Interface/Radial/back_hover.png differ
diff --git a/Resources/Textures/Interface/Radial/back_normal.png b/Resources/Textures/Interface/Radial/back_normal.png
new file mode 100644
index 00000000000..2c4a20048c6
Binary files /dev/null and b/Resources/Textures/Interface/Radial/back_normal.png differ
diff --git a/Resources/Textures/Interface/Radial/button_hover.png b/Resources/Textures/Interface/Radial/button_hover.png
new file mode 100644
index 00000000000..49885a26c37
Binary files /dev/null and b/Resources/Textures/Interface/Radial/button_hover.png differ
diff --git a/Resources/Textures/Interface/Radial/button_normal.png b/Resources/Textures/Interface/Radial/button_normal.png
new file mode 100644
index 00000000000..66dc2777099
Binary files /dev/null and b/Resources/Textures/Interface/Radial/button_normal.png differ
diff --git a/Resources/Textures/Interface/Radial/close_hover.png b/Resources/Textures/Interface/Radial/close_hover.png
new file mode 100644
index 00000000000..873d20961d4
Binary files /dev/null and b/Resources/Textures/Interface/Radial/close_hover.png differ
diff --git a/Resources/Textures/Interface/Radial/close_normal.png b/Resources/Textures/Interface/Radial/close_normal.png
new file mode 100644
index 00000000000..99417f28295
Binary files /dev/null and b/Resources/Textures/Interface/Radial/close_normal.png differ
diff --git a/Resources/Textures/Interface/VerbIcons/paint.svg b/Resources/Textures/Interface/VerbIcons/paint.svg
deleted file mode 100644
index 78a56e3570a..00000000000
--- a/Resources/Textures/Interface/VerbIcons/paint.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg834"
-   sodipodi:docname="plus.svg"
-   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs838" />
-  <sodipodi:namedview
-     id="namedview836"
-     pagecolor="#505050"
-     bordercolor="#eeeeee"
-     borderopacity="1"
-     inkscape:pageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="33.666667"
-     inkscape:cx="11.985149"
-     inkscape:cy="7.2475248"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg834" />
-  <path
-     d="M 22.69307,10.252475 H 13.806931 V 1.3663366 H 10.252475 V 10.252475 H 1.3663366 v 3.554455 h 8.8861384 v 8.886139 h 3.554456 V 13.80693 h 8.886139 z"
-     id="path832"
-     inkscape:label="path832"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.888614" />
-</svg>
diff --git a/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png b/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png
deleted file mode 100644
index b7bd88245f2..00000000000
Binary files a/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml
index 0e890ec893c..afe4af7bf29 100644
--- a/Resources/Textures/LobbyScreens/attributions.yml
+++ b/Resources/Textures/LobbyScreens/attributions.yml
@@ -32,3 +32,8 @@
   license: "CC-BY-NC-SA-3.0"
   copyright: "data_redacted on discord"
   source: "https://github.com/space-wizards/space-station-14"
+
+- files: ["terminalstation.webp"]
+  license: "CC-BY-SA-3.0"
+  copyright: "aserovich on discord"
+  source: "https://github.com/space-wizards/space-station-14"
diff --git a/Resources/Textures/LobbyScreens/terminalstation.webp b/Resources/Textures/LobbyScreens/terminalstation.webp
new file mode 100644
index 00000000000..ae7cab269d1
Binary files /dev/null and b/Resources/Textures/LobbyScreens/terminalstation.webp differ
diff --git a/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png.yml b/Resources/Textures/LobbyScreens/terminalstation.webp.yml
similarity index 100%
rename from Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png.yml
rename to Resources/Textures/LobbyScreens/terminalstation.webp.yml
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_large.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_large.png
new file mode 100644
index 00000000000..5ace395ce7d
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_large.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
index 8b80a5a45f5..256abc36f49 100644
--- a/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "By @leonardo_dabepis",
+    "copyright": "By @leonardo_dabepis, large by VMSolidus",
     "size": {
         "x": 32,
         "y": 32
@@ -10,7 +10,10 @@
         {
             "name": "harpy_ears_default",
             "directions": 4
+        },
+        {
+            "name": "harpy_ears_large",
+            "directions": 4
         }
-
     ]
 }
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/huescale_forked_tailfin.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/huescale_forked_tailfin.png
new file mode 100644
index 00000000000..c6addb53ec1
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/huescale_forked_tailfin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
index bf58e418285..f33401617c0 100644
--- a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Phoenix and Rooster by @leonardo_dabepis, Finch by @stillxicarus",
+    "copyright": "Phoenix and Rooster by @leonardo_dabepis, Finch & Forked Tailfin by @stillxicarus",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,14 @@
         {
             "name": "rooster_tail",
             "directions": 4
+        },
+        {
+            "name": "huescale_forked_tailfin",
+            "directions": 4
+        },
+        {
+            "name": "whitescale_forked_tailfin",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/whitescale_forked_tailfin.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/whitescale_forked_tailfin.png
new file mode 100644
index 00000000000..b92610a9605
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/whitescale_forked_tailfin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_folded.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_folded.png
new file mode 100644
index 00000000000..838e05deb4d
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_folded.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_wing_owl.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_wing_owl.png
new file mode 100644
index 00000000000..c136dc27940
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_wing_owl.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy.png
new file mode 100644
index 00000000000..0c2f826ec57
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_folded.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_folded.png
new file mode 100644
index 00000000000..e6777aee73b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_folded.png differ
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_wing_owl.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_wing_owl.png
new file mode 100644
index 00000000000..bbf46cdb9c3
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_wing_owl.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardblindfold.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_blindfold.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardblindfold.png
rename to Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_blindfold.png
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_l.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_foot_l.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_l.png
rename to Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_foot_l.png
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_r.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_foot_r.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_r.png
rename to Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_foot_r.png
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardlefteye.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_lefteye.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardlefteye.png
rename to Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_lefteye.png
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardrighteye.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_righteye.png
similarity index 100%
rename from Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardrighteye.png
rename to Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizard_righteye.png
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_abdomen.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_abdomen.png
new file mode 100644
index 00000000000..e8b42aca5ca
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_abdomen.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_blindfold.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_blindfold.png
new file mode 100644
index 00000000000..499a3cb29d1
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_blindfold.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_1.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_1.png
new file mode 100644
index 00000000000..73ba4b1c50f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_2.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_2.png
new file mode 100644
index 00000000000..a1c9a8f0922
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lefteye_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_l.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_l.png
new file mode 100644
index 00000000000..df750d98199
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_l.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_r.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_r.png
new file mode 100644
index 00000000000..f6504f8ca78
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_lowerleg_r.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_1.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_1.png
new file mode 100644
index 00000000000..4c5ab639bb3
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_1.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_2.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_2.png
new file mode 100644
index 00000000000..563e692b8b2
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_righteye_2.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder.png
new file mode 100644
index 00000000000..ba2c0f6032e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_l.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_l.png
new file mode 100644
index 00000000000..1587a75b99b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_l.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_r.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_r.png
new file mode 100644
index 00000000000..19750a09d02
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperarm_r.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_l.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_l.png
new file mode 100644
index 00000000000..7252c235156
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_l.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_r.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_r.png
new file mode 100644
index 00000000000..2f09a4de3e6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_upperleg_r.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json b/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json
index 232e7b0b22d..8d82ccab517 100644
--- a/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json
@@ -72,23 +72,75 @@
       "directions": 4
     },
 	{
-      "name": "gauze_lizardblindfold",
+      "name": "gauze_lizard_blindfold",
       "directions": 4
     },
 	{
-      "name": "gauze_lizardrighteye",
+      "name": "gauze_lizard_righteye",
       "directions": 4
     },
     {
-      "name": "gauze_lizardlefteye",
+      "name": "gauze_lizard_lefteye",
       "directions": 4
     },
     {
-      "name": "gauze_lizardfoot_r",
+      "name": "gauze_lizard_foot_r",
       "directions": 4
     },
     {
-      "name": "gauze_lizardfoot_l",
+      "name": "gauze_lizard_foot_l",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_abdomen",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_shoulder",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_blindfold",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_righteye_1",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_righteye_2",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lefteye_1",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lefteye_2",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperarm_r",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperarm_l",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperleg_r",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_upperleg_l",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lowerleg_r",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_lowerleg_l",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Effects/onfire.rsi/Mouse_burning.png b/Resources/Textures/Mobs/Effects/onfire.rsi/Mouse_burning.png
new file mode 100644
index 00000000000..d5461a89c02
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/onfire.rsi/Mouse_burning.png differ
diff --git a/Resources/Textures/Mobs/Effects/onfire.rsi/meta.json b/Resources/Textures/Mobs/Effects/onfire.rsi/meta.json
index 5bd235bf909..005128d9be1 100644
--- a/Resources/Textures/Mobs/Effects/onfire.rsi/meta.json
+++ b/Resources/Textures/Mobs/Effects/onfire.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0", "states": [{"name": "Generic_mob_burning", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "Monkey_burning", "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": "Standing", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0",
+    "states": [
+        {
+            "name": "Generic_mob_burning",
+            "directions": 4,
+            "delays": [
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        },
+        {
+            "name": "Monkey_burning",
+            "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": "Standing",
+            "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": "Mouse_burning",
+            "directions": 4,
+            "delays": [
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ],
+                [ 0.1, 0.1, 0.1, 0.1, 0.1 ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-l.png b/Resources/Textures/Mobs/Species/Harpy/organs.rsi/lung-l.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-l.png
rename to Resources/Textures/Mobs/Species/Harpy/organs.rsi/lung-l.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-r.png b/Resources/Textures/Mobs/Species/Harpy/organs.rsi/lung-r.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/lung-r.png
rename to Resources/Textures/Mobs/Species/Harpy/organs.rsi/lung-r.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Harpy/organs.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/organs.rsi/meta.json
rename to Resources/Textures/Mobs/Species/Harpy/organs.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/full.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/full.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/full.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_f.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_f.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_m.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/head_m.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_m.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_arm.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_arm.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_arm.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_foot.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_foot.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_foot.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_hand.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_hand.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_hand.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_leg.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/l_leg.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_leg.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/meta.json
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_arm.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_arm.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_arm.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_foot.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_foot.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_foot.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_hand.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_hand.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_hand.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_leg.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/r_leg.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_leg.png
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_f.png
new file mode 100644
index 00000000000..8cd598f06e9
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_f.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_m.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Harpy/parts.rsi/torso_m.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_m.png
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png
new file mode 100644
index 00000000000..81261d0f54f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json
new file mode 100644
index 00000000000..f76e6118413
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png
new file mode 100644
index 00000000000..d192a884616
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json
new file mode 100644
index 00000000000..f76e6118413
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png
new file mode 100644
index 00000000000..4adab5cb6e6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json
new file mode 100644
index 00000000000..f76e6118413
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon.png
new file mode 100644
index 00000000000..a270180dcd4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon_open.png
new file mode 100644
index 00000000000..a81a7998559
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json
new file mode 100644
index 00000000000..d7f3d6da42b
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC0-1.0",
+    "copyright": "Original work by noctis on Discord",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_open"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png
new file mode 100644
index 00000000000..bd1eff6943e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json
new file mode 100644
index 00000000000..f76e6118413
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png
new file mode 100644
index 00000000000..caa81b36f0a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json
new file mode 100644
index 00000000000..f76e6118413
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png
new file mode 100644
index 00000000000..7a6b0624da0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json
new file mode 100644
index 00000000000..f76e6118413
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png
new file mode 100644
index 00000000000..9426978d721
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json
new file mode 100644
index 00000000000..d16d731d7f8
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon",
+        "delays": [
+        [
+            1,
+            1,
+            1,
+            1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png
new file mode 100644
index 00000000000..88fdd5e79b9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json
new file mode 100644
index 00000000000..f76e6118413
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon.png
new file mode 100644
index 00000000000..ace08a9ffb0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon_open.png
new file mode 100644
index 00000000000..39281831dc7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png
new file mode 100644
index 00000000000..3c03c07742b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png
new file mode 100644
index 00000000000..2f68635d908
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json
new file mode 100644
index 00000000000..8bc80009c58
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi, Sol Dry from /tg/.",
+  "states": [
+    {
+      "name": "icon"
+    },
+	{
+	  "name": "icon_open"
+	},
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png
new file mode 100644
index 00000000000..c4bf829e5d1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json
new file mode 100644
index 00000000000..f76e6118413
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/harpywings.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/harpywings.png
new file mode 100644
index 00000000000..e355802a95a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/harpywings.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json
index e3fa26223a2..320257ad198 100644
--- a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec, corn in butter from im_kreks",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec, corn in butter from im_kreks, harpywings from dootythefrooty",
   "size": {
     "x": 32,
     "y": 32
@@ -150,6 +150,9 @@
     },
     {
       "name": "corn-in-butter"
+    },
+    {
+      "name": "harpywings"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png
index 294f3267803..dd6bc0b0f2f 100644
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png
index 3a4e9e8f9d2..7f00423dc37 100644
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png
index e8bfce8645c..2cb9f2bbfc2 100644
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png
index 4635cb206cd..a0645041abf 100644
Binary files a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standart.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standard.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standart.rsi/icon.png
rename to Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standard.rsi/icon.png
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standart.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standard.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standart.rsi/meta.json
rename to Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standard.rsi/meta.json
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-left.png b/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-left.png
deleted file mode 100644
index d90d5b21b73..00000000000
Binary files a/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-right.png b/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-right.png
deleted file mode 100644
index 27b68e2cfe5..00000000000
Binary files a/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
index f34820cec45..0f883ee2801 100644
--- a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
@@ -58,6 +58,9 @@
     {
       "name": "spray"
     },
+    {
+      "name": "spray_cap"
+    },
     {
       "name": "spray_cap_colors"
     },
@@ -67,22 +70,6 @@
     {
       "name": "equipped-BELT",
       "directions": 4
-    },
-    {
-      "name": "clown-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "clown-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "spray-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "spray-inhand-left",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-left.png b/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-left.png
deleted file mode 100644
index ad3ad959de4..00000000000
Binary files a/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-right.png b/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-right.png
deleted file mode 100644
index 353e47c56fa..00000000000
Binary files a/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png
new file mode 100644
index 00000000000..01d2d49bc0f
Binary files /dev/null and b/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index fc92a479367..cae7880e414 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -104,6 +104,9 @@
     {
       "name": "plushie_diona"
     },
+    {
+      "name": "plushie_arachne"
+    },
     {
       "name": "plushie_human"
     },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/plushie_arachne.png b/Resources/Textures/Objects/Fun/toys.rsi/plushie_arachne.png
new file mode 100644
index 00000000000..4f72c31ddf6
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/plushie_arachne.png differ
diff --git a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png b/Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png
deleted file mode 100644
index ed18010a728..00000000000
Binary files a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png b/Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png
deleted file mode 100644
index 3f355989536..00000000000
Binary files a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png b/Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png
deleted file mode 100644
index 9f5d68af7d5..00000000000
Binary files a/Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json b/Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json
deleted file mode 100644
index f9f1703f24c..00000000000
--- a/Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/f3e328af032f0ba0234b866c24ccb0003e1a4993",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "bookfireball",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "bookforcewall",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "bookknock",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "spellbook"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png b/Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png
deleted file mode 100644
index d24f198f949..00000000000
Binary files a/Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_aurora.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_aurora.png
deleted file mode 100644
index 0e342581380..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_aurora.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_cafe.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_cafe.png
deleted file mode 100644
index 7a3b6667cf8..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_cafe.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_earth.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_earth.png
deleted file mode 100644
index 8e29c3880a4..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_earth.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_antarctica.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_antarctica.png
deleted file mode 100644
index 3843e200696..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_antarctica.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_arctic.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_arctic.png
deleted file mode 100644
index ace42ee7dcb..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_arctic.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_city.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_city.png
deleted file mode 100644
index abd76a54704..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_city.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_desert.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_desert.png
deleted file mode 100644
index 9a2d2ad6587..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_desert.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_mountain.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_mountain.png
deleted file mode 100644
index ee26df9e9ab..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_mountain.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ocean.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ocean.png
deleted file mode 100644
index d70795ebd40..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ocean.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ranch.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ranch.png
deleted file mode 100644
index 7f6b3e86ddc..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_ranch.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_wolfpup.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_wolfpup.png
deleted file mode 100644
index df0b2350ae7..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_ian_wolfpup.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_journ_mount.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_journ_mount.png
deleted file mode 100644
index f266a2f0d9a..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_journ_mount.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_map.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_map.png
deleted file mode 100644
index fb880d97038..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_map.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_medical.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_medical.png
deleted file mode 100644
index e94b6789fb5..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_medical.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_morgue.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_morgue.png
deleted file mode 100644
index 6b6c86cf086..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_morgue.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_names.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_names.png
deleted file mode 100644
index f2396ac5279..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_names.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_narsie_legend.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_narsie_legend.png
deleted file mode 100644
index fe7659f396f..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_narsie_legend.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_possum.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_possum.png
deleted file mode 100644
index b169c180be0..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_possum.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_rufus.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_rufus.png
deleted file mode 100644
index 22e936fb3f4..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_rufus.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scmmd.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scmmd.png
deleted file mode 100644
index 2430e142907..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scmmd.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scpz.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scpz.png
deleted file mode 100644
index 0e09bb8f09f..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scpz.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scsss.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scsss.png
deleted file mode 100644
index 1262f51118c..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_scsss.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_struck.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_struck.png
deleted file mode 100644
index 144bef30ee3..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_struck.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_sun.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_sun.png
deleted file mode 100644
index 5e7c0fa9bcf..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_sun.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_temple.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_temple.png
deleted file mode 100644
index 6f68c1c2e23..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_temple.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_truth.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_truth.png
deleted file mode 100644
index 6f076f2ef00..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_truth.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_watched.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_watched.png
deleted file mode 100644
index 693a4141aba..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_watched.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_world.png b/Resources/Textures/Objects/Misc/authorbooks.rsi/book_world.png
deleted file mode 100644
index 8793ef8dfa2..00000000000
Binary files a/Resources/Textures/Objects/Misc/authorbooks.rsi/book_world.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/authorbooks.rsi/meta.json b/Resources/Textures/Objects/Misc/authorbooks.rsi/meta.json
deleted file mode 100644
index 0d8639d44fa..00000000000
--- a/Resources/Textures/Objects/Misc/authorbooks.rsi/meta.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77 and modified by Kit0vras#5869 (Discord) / Kit0vras (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "book_aurora"
-    },
-    {
-      "name": "book_cafe"
-    },
-    {
-      "name": "book_earth"
-    },
-    {
-      "name": "book_temple"
-    },
-    {
-      "name": "book_ian_antarctica"
-    },
-    {
-      "name": "book_ian_arctic"
-    },
-    {
-      "name": "book_ian_city"
-    },
-    {
-      "name": "book_ian_desert"
-    },
-    {
-      "name": "book_ian_mountain"
-    },
-    {
-      "name": "book_ian_ocean"
-    },
-    {
-      "name": "book_ian_ranch"
-    },
-    {
-      "name": "book_ian_wolfpup"
-    },
-    {
-      "name": "book_journ_mount"
-    },
-    {
-      "name": "book_scmmd"
-    },
-    {
-      "name": "book_medical"
-    },
-    {
-      "name": "book_morgue"
-    },
-    {
-      "name": "book_names"
-    },
-    {
-      "name": "book_narsie_legend"
-    },
-    {
-      "name": "book_possum"
-    },
-    {
-      "name": "book_rufus"
-    },
-    {
-      "name": "book_scsss"
-    },
-    {
-      "name": "book_scpz"
-    },
-    {
-      "name": "book_struck"
-    },
-    {
-      "name": "book_sun"
-    },
-    {
-      "name": "book_map"
-    },
-    {
-      "name": "book_truth"
-    },
-    {
-      "name": "book_watched"
-    },
-    {
-      "name": "book_world"
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book0.png b/Resources/Textures/Objects/Misc/books.rsi/book0.png
deleted file mode 100644
index 0cc314ef9e0..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book1.png b/Resources/Textures/Objects/Misc/books.rsi/book1.png
deleted file mode 100644
index ee3d9f91f01..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book2.png b/Resources/Textures/Objects/Misc/books.rsi/book2.png
deleted file mode 100644
index 614791ac70e..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book3.png b/Resources/Textures/Objects/Misc/books.rsi/book3.png
deleted file mode 100644
index ce11a89b0e3..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book4.png b/Resources/Textures/Objects/Misc/books.rsi/book4.png
deleted file mode 100644
index c5f1aba4f88..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book5.png b/Resources/Textures/Objects/Misc/books.rsi/book5.png
deleted file mode 100644
index 18172241ccf..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book5.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book6.png b/Resources/Textures/Objects/Misc/books.rsi/book6.png
deleted file mode 100644
index 1c95940aee7..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book6.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book7.png b/Resources/Textures/Objects/Misc/books.rsi/book7.png
deleted file mode 100644
index eee791db78f..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book7.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book8.png b/Resources/Textures/Objects/Misc/books.rsi/book8.png
deleted file mode 100644
index 6ba69a8c482..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book8.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_bar.png b/Resources/Textures/Objects/Misc/books.rsi/book_bar.png
deleted file mode 100644
index f522b7fd9b9..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_bar.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png b/Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png
deleted file mode 100644
index 634a1c6f0af..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_borg.png b/Resources/Textures/Objects/Misc/books.rsi/book_borg.png
deleted file mode 100644
index 8ba4772575f..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_borg.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png b/Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png
deleted file mode 100644
index 8ba953d4ded..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_cloning.png b/Resources/Textures/Objects/Misc/books.rsi/book_cloning.png
deleted file mode 100644
index 52704aa2495..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_cloning.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_cooking.png b/Resources/Textures/Objects/Misc/books.rsi/book_cooking.png
deleted file mode 100644
index 07433741fe2..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_cooking.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png b/Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png
deleted file mode 100644
index 607b144e8eb..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_detective.png b/Resources/Textures/Objects/Misc/books.rsi/book_detective.png
deleted file mode 100644
index bc280e2d6a3..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_detective.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_engineering.png b/Resources/Textures/Objects/Misc/books.rsi/book_engineering.png
deleted file mode 100644
index 9808e2d97fe..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_engineering.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png b/Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png
deleted file mode 100644
index 853eb6cca42..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_fish.png b/Resources/Textures/Objects/Misc/books.rsi/book_fish.png
deleted file mode 100644
index ab1fc080bf7..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_fish.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_hacking.png b/Resources/Textures/Objects/Misc/books.rsi/book_hacking.png
deleted file mode 100644
index 1642063f7e4..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_hacking.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png b/Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png
deleted file mode 100644
index df41d962141..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_icon.png b/Resources/Textures/Objects/Misc/books.rsi/book_icon.png
new file mode 100644
index 00000000000..e3e77759dc9
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/book_icon.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_infections.png b/Resources/Textures/Objects/Misc/books.rsi/book_infections.png
deleted file mode 100644
index 3f79f462371..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_infections.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_medical.png b/Resources/Textures/Objects/Misc/books.rsi/book_medical.png
deleted file mode 100644
index 7152cfe51c6..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_medical.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png b/Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png
deleted file mode 100644
index dbf95833fdd..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_origami.png b/Resources/Textures/Objects/Misc/books.rsi/book_origami.png
deleted file mode 100644
index 63344d2bf41..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_origami.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png b/Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png
deleted file mode 100644
index a0fc564a688..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_science.png b/Resources/Textures/Objects/Misc/books.rsi/book_science.png
deleted file mode 100644
index 47047c958a0..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_science.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_security.png b/Resources/Textures/Objects/Misc/books.rsi/book_security.png
deleted file mode 100644
index fb1a4028e8f..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_security.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_space_law.png b/Resources/Textures/Objects/Misc/books.rsi/book_space_law.png
deleted file mode 100644
index 524f10b76c4..00000000000
Binary files a/Resources/Textures/Objects/Misc/books.rsi/book_space_law.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/cover_base.png b/Resources/Textures/Objects/Misc/books.rsi/cover_base.png
new file mode 100644
index 00000000000..4f6f819a3a1
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/cover_base.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/cover_old.png b/Resources/Textures/Objects/Misc/books.rsi/cover_old.png
new file mode 100644
index 00000000000..7ad4bdf685c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/cover_old.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/cover_strong.png b/Resources/Textures/Objects/Misc/books.rsi/cover_strong.png
new file mode 100644
index 00000000000..61baf7b5778
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/cover_strong.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_bottom.png b/Resources/Textures/Objects/Misc/books.rsi/decor_bottom.png
new file mode 100644
index 00000000000..65ce4aa6267
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_bottom.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_diagonal.png b/Resources/Textures/Objects/Misc/books.rsi/decor_diagonal.png
new file mode 100644
index 00000000000..50f6f591834
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_diagonal.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_middle.png b/Resources/Textures/Objects/Misc/books.rsi/decor_middle.png
new file mode 100644
index 00000000000..ca4ca82114c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_middle.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_spine.png b/Resources/Textures/Objects/Misc/books.rsi/decor_spine.png
new file mode 100644
index 00000000000..5ebd7c769dc
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_spine.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_vertical_middle.png b/Resources/Textures/Objects/Misc/books.rsi/decor_vertical_middle.png
new file mode 100644
index 00000000000..75f141ce40d
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_vertical_middle.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_wingette.png b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette.png
new file mode 100644
index 00000000000..048a29388c6
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_circle.png b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_circle.png
new file mode 100644
index 00000000000..a9d9afc1207
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_circle.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_flat.png b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_flat.png
new file mode 100644
index 00000000000..0ca0a4de6fd
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/decor_wingette_flat.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/detail_bookmark.png b/Resources/Textures/Objects/Misc/books.rsi/detail_bookmark.png
new file mode 100644
index 00000000000..4541f8bc1d3
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/detail_bookmark.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/detail_rivets.png b/Resources/Textures/Objects/Misc/books.rsi/detail_rivets.png
new file mode 100644
index 00000000000..53a4c8bef4c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/detail_rivets.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_apple.png b/Resources/Textures/Objects/Misc/books.rsi/icon_apple.png
new file mode 100644
index 00000000000..2316fb4e55c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_apple.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_atmos.png b/Resources/Textures/Objects/Misc/books.rsi/icon_atmos.png
new file mode 100644
index 00000000000..518623069e8
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_atmos.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_aurora.png b/Resources/Textures/Objects/Misc/books.rsi/icon_aurora.png
new file mode 100644
index 00000000000..a0179d31be9
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_aurora.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_banana.png b/Resources/Textures/Objects/Misc/books.rsi/icon_banana.png
new file mode 100644
index 00000000000..2c2a6574129
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_banana.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_bar.png b/Resources/Textures/Objects/Misc/books.rsi/icon_bar.png
new file mode 100644
index 00000000000..3bb7e7631f9
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_bar.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_biohazard.png b/Resources/Textures/Objects/Misc/books.rsi/icon_biohazard.png
new file mode 100644
index 00000000000..a3ad873f614
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_biohazard.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_borg.png b/Resources/Textures/Objects/Misc/books.rsi/icon_borg.png
new file mode 100644
index 00000000000..4781ff3fe80
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_borg.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_briefcase.png b/Resources/Textures/Objects/Misc/books.rsi/icon_briefcase.png
new file mode 100644
index 00000000000..cbbe1a74d91
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_briefcase.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_bucket.png b/Resources/Textures/Objects/Misc/books.rsi/icon_bucket.png
new file mode 100644
index 00000000000..df76b0550de
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_bucket.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_cabbage.png b/Resources/Textures/Objects/Misc/books.rsi/icon_cabbage.png
new file mode 100644
index 00000000000..e9c806f92e2
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_cabbage.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_chemical.png b/Resources/Textures/Objects/Misc/books.rsi/icon_chemical.png
new file mode 100644
index 00000000000..3714784dac7
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_chemical.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_corner.png b/Resources/Textures/Objects/Misc/books.rsi/icon_corner.png
new file mode 100644
index 00000000000..70b68d327cc
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_corner.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_diamond.png b/Resources/Textures/Objects/Misc/books.rsi/icon_diamond.png
new file mode 100644
index 00000000000..268a659194e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_diamond.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_dna.png b/Resources/Textures/Objects/Misc/books.rsi/icon_dna.png
new file mode 100644
index 00000000000..d8c1bb07b9b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_dna.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_eye.png b/Resources/Textures/Objects/Misc/books.rsi/icon_eye.png
new file mode 100644
index 00000000000..11e47cd11d3
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_eye.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_fish.png b/Resources/Textures/Objects/Misc/books.rsi/icon_fish.png
new file mode 100644
index 00000000000..7baaa131856
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_fish.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_glow.png b/Resources/Textures/Objects/Misc/books.rsi/icon_glow.png
new file mode 100644
index 00000000000..030f8188773
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_glow.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_hacking.png b/Resources/Textures/Objects/Misc/books.rsi/icon_hacking.png
new file mode 100644
index 00000000000..bd3602c4186
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_hacking.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_ian.png b/Resources/Textures/Objects/Misc/books.rsi/icon_ian.png
new file mode 100644
index 00000000000..04109c50364
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_ian.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_law.png b/Resources/Textures/Objects/Misc/books.rsi/icon_law.png
new file mode 100644
index 00000000000..3843f9c4ad0
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_law.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_letter_N.png b/Resources/Textures/Objects/Misc/books.rsi/icon_letter_N.png
new file mode 100644
index 00000000000..7b1888e8c6a
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_letter_N.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_letter_P.png b/Resources/Textures/Objects/Misc/books.rsi/icon_letter_P.png
new file mode 100644
index 00000000000..12da61a0701
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_letter_P.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_lightning.png b/Resources/Textures/Objects/Misc/books.rsi/icon_lightning.png
new file mode 100644
index 00000000000..92a115d2b6b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_lightning.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_magic.png b/Resources/Textures/Objects/Misc/books.rsi/icon_magic.png
new file mode 100644
index 00000000000..80e61b35ad3
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_magic.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_magic_fireball.png b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_fireball.png
new file mode 100644
index 00000000000..79a1370ddfa
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_fireball.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_magic_forcewall.png b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_forcewall.png
new file mode 100644
index 00000000000..45e1ceb3c5c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_forcewall.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_magic_knock.png b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_knock.png
new file mode 100644
index 00000000000..506dfdeaee7
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_magic_knock.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_magnifier.png b/Resources/Textures/Objects/Misc/books.rsi/icon_magnifier.png
new file mode 100644
index 00000000000..953d2f93efd
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_magnifier.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_medical.png b/Resources/Textures/Objects/Misc/books.rsi/icon_medical.png
new file mode 100644
index 00000000000..36799b2f95e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_medical.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_medical_cross.png b/Resources/Textures/Objects/Misc/books.rsi/icon_medical_cross.png
new file mode 100644
index 00000000000..970b6d3b4b6
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_medical_cross.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_mount.png b/Resources/Textures/Objects/Misc/books.rsi/icon_mount.png
new file mode 100644
index 00000000000..399560fdf65
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_mount.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_nuclear.png b/Resources/Textures/Objects/Misc/books.rsi/icon_nuclear.png
new file mode 100644
index 00000000000..883fe5411e1
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_nuclear.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_origami.png b/Resources/Textures/Objects/Misc/books.rsi/icon_origami.png
new file mode 100644
index 00000000000..9eb0e542e8b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_origami.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_pentagramm.png b/Resources/Textures/Objects/Misc/books.rsi/icon_pentagramm.png
new file mode 100644
index 00000000000..3804e3f4890
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_pentagramm.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_planet.png b/Resources/Textures/Objects/Misc/books.rsi/icon_planet.png
new file mode 100644
index 00000000000..784dcd08827
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_planet.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_possum.png b/Resources/Textures/Objects/Misc/books.rsi/icon_possum.png
new file mode 100644
index 00000000000..5d25c82a913
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_possum.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_question.png b/Resources/Textures/Objects/Misc/books.rsi/icon_question.png
new file mode 100644
index 00000000000..fda304af04a
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_question.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_scmmd.png b/Resources/Textures/Objects/Misc/books.rsi/icon_scmmd.png
new file mode 100644
index 00000000000..d64e9bdd85d
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_scmmd.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_skull.png b/Resources/Textures/Objects/Misc/books.rsi/icon_skull.png
new file mode 100644
index 00000000000..96793050fb9
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_skull.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_stars.png b/Resources/Textures/Objects/Misc/books.rsi/icon_stars.png
new file mode 100644
index 00000000000..0970ada3f31
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_stars.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_stars2.png b/Resources/Textures/Objects/Misc/books.rsi/icon_stars2.png
new file mode 100644
index 00000000000..a88d168a447
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_stars2.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_stunbaton.png b/Resources/Textures/Objects/Misc/books.rsi/icon_stunbaton.png
new file mode 100644
index 00000000000..d247b9163c5
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_stunbaton.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_temple.png b/Resources/Textures/Objects/Misc/books.rsi/icon_temple.png
new file mode 100644
index 00000000000..54bb81a404b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_temple.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_text.png b/Resources/Textures/Objects/Misc/books.rsi/icon_text.png
new file mode 100644
index 00000000000..8f7b3158d2b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_text.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_text2.png b/Resources/Textures/Objects/Misc/books.rsi/icon_text2.png
new file mode 100644
index 00000000000..c87370e75da
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_text2.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_text3.png b/Resources/Textures/Objects/Misc/books.rsi/icon_text3.png
new file mode 100644
index 00000000000..ef03b24174f
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_text3.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_time.png b/Resources/Textures/Objects/Misc/books.rsi/icon_time.png
new file mode 100644
index 00000000000..13f0267eb5e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_time.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_tree.png b/Resources/Textures/Objects/Misc/books.rsi/icon_tree.png
new file mode 100644
index 00000000000..cfbebb9795c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_tree.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/icon_wrench.png b/Resources/Textures/Objects/Misc/books.rsi/icon_wrench.png
new file mode 100644
index 00000000000..99bed38d3c6
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/icon_wrench.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/meta.json b/Resources/Textures/Objects/Misc/books.rsi/meta.json
index 514e4075822..96320ce6ac5 100644
--- a/Resources/Textures/Objects/Misc/books.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/books.rsi/meta.json
@@ -1,71 +1,74 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77",
+  "copyright": "Base sprite taken at: https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77 , splitted on layers by TheShuEd (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "book0"
+      "name": "book_icon"
     },
     {
-      "name": "book1"
+      "name": "cover_base"
     },
     {
-      "name": "book2"
+      "name": "cover_old"
     },
     {
-      "name": "book3"
+      "name": "cover_strong"
     },
     {
-      "name": "book4"
+      "name": "decor_wingette"
     },
     {
-      "name": "book5"
+      "name": "decor_wingette_flat"
     },
     {
-      "name": "book6"
+      "name": "decor_wingette_circle"
     },
     {
-      "name": "book7"
+      "name": "decor_bottom"
     },
     {
-      "name": "book8"
+      "name": "decor_diagonal"
     },
     {
-      "name": "book_infections"
+      "name": "decor_middle"
     },
     {
-      "name": "book_cooking"
+      "name": "decor_spine"
     },
     {
-      "name": "book_engineering"
+      "name": "decor_vertical_middle"
     },
     {
-      "name": "book_engineering2"
+      "name": "detail_bookmark"
     },
     {
-      "name": "book_hacking"
+      "name": "detail_rivets"
     },
     {
-      "name": "book_detective"
+      "name": "icon_apple"
     },
     {
-      "name": "book_nuclear"
+      "name": "icon_atmos"
     },
     {
-      "name": "book_particle_accelerator"
+      "name": "icon_aurora"
     },
     {
-      "name": "book_cloning"
+      "name": "icon_banana"
     },
     {
-      "name": "book_hydroponics_pod_people"
+      "name": "icon_bar"
     },
     {
-      "name": "book_borg",
+      "name": "icon_biohazard"
+    },
+    {
+      "name": "icon_borg",
       "delays": [
         [
           6,
@@ -74,19 +77,83 @@
       ]
     },
     {
-      "name": "book_chemistry"
+      "name": "icon_briefcase"
+    },
+    {
+      "name": "icon_bucket"
+    },
+    {
+      "name": "icon_cabbage"
+    },
+    {
+      "name": "icon_chemical"
+    },
+    {
+      "name": "icon_corner"
+    },
+    {
+      "name": "icon_diamond"
+    },
+    {
+      "name": "icon_dna"
+    },
+    {
+      "name": "icon_eye"
+    },
+    {
+      "name": "icon_fish"
+    },
+    {
+      "name": "icon_glow"
+    },
+    {
+      "name": "icon_hacking"
+    },
+    {
+      "name": "icon_ian"
+    },
+    {
+      "name": "icon_law"
+    },
+    {
+      "name": "icon_letter_N"
     },
     {
-      "name": "book_bar"
+      "name": "icon_letter_P"
     },
     {
-      "name": "book_space_law"
+      "name": "icon_lightning"
     },
     {
-      "name": "book_demonomicon",
+      "name": "icon_magic"
+    },
+    {
+      "name": "icon_magic_fireball",
       "delays": [
         [
-          0.5,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "icon_magic_forcewall",
+      "delays": [
+        [
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "icon_magic_knock",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
           0.1,
           0.1,
           0.1
@@ -94,22 +161,93 @@
       ]
     },
     {
-      "name": "book_origami"
+      "name": "icon_magnifier"
     },
     {
-      "name": "book_boneworking"
+      "name": "icon_medical"
     },
     {
-      "name": "book_fish"
+      "name": "icon_medical_cross"
     },
     {
-      "name": "book_science"
+      "name": "icon_mount"
     },
     {
-      "name": "book_medical"
+      "name": "icon_nuclear"
     },
     {
-      "name": "book_security"
+      "name": "icon_origami"
+    },
+    {
+      "name": "icon_pentagramm"
+    },
+    {
+      "name": "icon_planet"
+    },
+    {
+      "name": "icon_possum"
+    },
+    {
+      "name": "icon_question"
+    },
+    {
+      "name": "icon_scmmd"
+    },
+    {
+      "name": "icon_skull"
+    },
+    {
+      "name": "icon_stars"
+    },
+    {
+      "name": "icon_stars2"
+    },
+    {
+      "name": "icon_stunbaton"
+    },
+    {
+      "name": "icon_temple"
+    },
+    {
+      "name": "icon_text"
+    },
+    {
+      "name": "icon_text2"
+    },
+    {
+      "name": "icon_text3"
+    },
+    {
+      "name": "icon_time"
+    },
+    {
+      "name": "icon_tree"
+    },
+    {
+      "name": "icon_wrench"
+    },
+    {
+      "name": "overlay_blood"
+    },
+    {
+      "name": "overlay_dirt"
+    },
+    {
+      "name": "overlay_null"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "paper_blood",
+      "delays": [
+        [
+          5,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Misc/books.rsi/overlay_blood.png b/Resources/Textures/Objects/Misc/books.rsi/overlay_blood.png
new file mode 100644
index 00000000000..c497b9e8f30
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/overlay_blood.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/overlay_dirt.png b/Resources/Textures/Objects/Misc/books.rsi/overlay_dirt.png
new file mode 100644
index 00000000000..43d2d741d7b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/overlay_dirt.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/overlay_null.png b/Resources/Textures/Objects/Misc/books.rsi/overlay_null.png
new file mode 100644
index 00000000000..7244b37f5c7
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/overlay_null.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/paper.png b/Resources/Textures/Objects/Misc/books.rsi/paper.png
new file mode 100644
index 00000000000..8309d99db7d
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/paper.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/paper_blood.png b/Resources/Textures/Objects/Misc/books.rsi/paper_blood.png
new file mode 100644
index 00000000000..b0ed27ad528
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/paper_blood.png differ
diff --git a/Resources/Textures/Objects/Misc/cd.rsi/icon.png b/Resources/Textures/Objects/Misc/cd.rsi/icon.png
new file mode 100644
index 00000000000..346d8c162a9
Binary files /dev/null and b/Resources/Textures/Objects/Misc/cd.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Misc/cd.rsi/meta.json b/Resources/Textures/Objects/Misc/cd.rsi/meta.json
new file mode 100644
index 00000000000..7f5e1ec8644
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/cd.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by SlamBamActionman",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Misc/diskcases.rsi/icon_base.png b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_base.png
new file mode 100644
index 00000000000..11fb7140ff2
Binary files /dev/null and b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_base.png differ
diff --git a/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cargo.png b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cargo.png
new file mode 100644
index 00000000000..4bee922d754
Binary files /dev/null and b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cargo.png differ
diff --git a/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cc.png b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cc.png
new file mode 100644
index 00000000000..a0dd3a87938
Binary files /dev/null and b/Resources/Textures/Objects/Misc/diskcases.rsi/icon_cc.png differ
diff --git a/Resources/Textures/Objects/Misc/diskcases.rsi/meta.json b/Resources/Textures/Objects/Misc/diskcases.rsi/meta.json
new file mode 100644
index 00000000000..714b0b19a03
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/diskcases.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by SlamBamActionman",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon_base"
+    },
+    {
+      "name": "icon_cc"
+    },
+    {
+      "name": "icon_cargo"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/assistant.png b/Resources/Textures/Objects/Misc/id_cards.rsi/assistant.png
new file mode 100644
index 00000000000..a3e83280f72
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/assistant.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/atmospherictechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/atmospherictechnician.png
new file mode 100644
index 00000000000..99e10c276d7
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/atmospherictechnician.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/bartender.png b/Resources/Textures/Objects/Misc/id_cards.rsi/bartender.png
new file mode 100644
index 00000000000..24a1b62fe24
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/bartender.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/black.png b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png
new file mode 100644
index 00000000000..6958c6d4490
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/botanist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/botanist.png
new file mode 100644
index 00000000000..4d62c18a60a
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/botanist.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/boxer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/boxer.png
new file mode 100644
index 00000000000..90b9165c049
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/boxer.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/captain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/captain.png
new file mode 100644
index 00000000000..72ec0038427
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/captain.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/cargotechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/cargotechnician.png
new file mode 100644
index 00000000000..7f5fba10169
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/cargotechnician.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/carp.png b/Resources/Textures/Objects/Misc/id_cards.rsi/carp.png
new file mode 100644
index 00000000000..1ef99e1cef6
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/carp.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/cc.png b/Resources/Textures/Objects/Misc/id_cards.rsi/cc.png
new file mode 100644
index 00000000000..9a28b7780c6
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/cc.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png
index ff1e293183c..3ed8b4045a7 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/chaplain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/chaplain.png
new file mode 100644
index 00000000000..1e134c3911b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/chaplain.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/chemist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/chemist.png
new file mode 100644
index 00000000000..11a34b3f053
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/chemist.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/clown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/clown.png
new file mode 100644
index 00000000000..24dea8a6d00
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/clown.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/cook.png b/Resources/Textures/Objects/Misc/id_cards.rsi/cook.png
new file mode 100644
index 00000000000..8a4e8c15d1e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/cook.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/curator.png b/Resources/Textures/Objects/Misc/id_cards.rsi/curator.png
new file mode 100644
index 00000000000..534150e6de3
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/curator.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/death.png b/Resources/Textures/Objects/Misc/id_cards.rsi/death.png
new file mode 100644
index 00000000000..c2190596169
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/death.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png
index 95b3d54c270..a7142e353ea 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/default.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/department.png b/Resources/Textures/Objects/Misc/id_cards.rsi/department.png
new file mode 100644
index 00000000000..001c8d75f5e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/department.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/departmenthead.png b/Resources/Textures/Objects/Misc/id_cards.rsi/departmenthead.png
new file mode 100644
index 00000000000..09f48fbb838
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/departmenthead.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/detective.png b/Resources/Textures/Objects/Misc/id_cards.rsi/detective.png
new file mode 100644
index 00000000000..8e21d3539c4
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/detective.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png
deleted file mode 100644
index 624bb4864db..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png
deleted file mode 100644
index d9c8b6e261d..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png
deleted file mode 100644
index a7c8b683556..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png
deleted file mode 100644
index afbe56e5f0d..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png
deleted file mode 100644
index 6fe2ce6698f..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png
deleted file mode 100644
index 6bb3134b557..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/flame.png b/Resources/Textures/Objects/Misc/id_cards.rsi/flame.png
new file mode 100644
index 00000000000..014c98322aa
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/geneticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/geneticist.png
new file mode 100644
index 00000000000..0980bb306c3
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/geneticist.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/gladiator.png b/Resources/Textures/Objects/Misc/id_cards.rsi/gladiator.png
new file mode 100644
index 00000000000..407a927b6a4
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/gladiator.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png
index bb20387315c..859a9ec99cf 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/headofpersonnel.png b/Resources/Textures/Objects/Misc/id_cards.rsi/headofpersonnel.png
new file mode 100644
index 00000000000..d0b4235c816
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/headofpersonnel.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png
deleted file mode 100644
index 3bd5446a3bc..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png
deleted file mode 100644
index 435ea39ad6a..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png
deleted file mode 100644
index f5dfdb86629..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png
deleted file mode 100644
index 0c2b5298e5f..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png
deleted file mode 100644
index 1f64eb4845a..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png
deleted file mode 100644
index e59e7c3d042..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png
deleted file mode 100644
index cfa0a35dcc5..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png
deleted file mode 100644
index 25b7017a708..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png
deleted file mode 100644
index e10e3c82a6e..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png
deleted file mode 100644
index 2dba29c2060..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png
deleted file mode 100644
index f105b4f88ad..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png
deleted file mode 100644
index 82a608a9a1a..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png
deleted file mode 100644
index e0372020448..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png
deleted file mode 100644
index d57a7e3d416..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png
deleted file mode 100644
index 09527688a46..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png
deleted file mode 100644
index cd01dc77702..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png
deleted file mode 100644
index 3b749d582a5..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png
deleted file mode 100644
index 1303135aa5a..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png
deleted file mode 100644
index be72e37e574..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png
deleted file mode 100644
index bb03adc665c..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png
deleted file mode 100644
index cebf46fade2..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png
deleted file mode 100644
index 15c7cde5e86..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png
deleted file mode 100644
index de676944766..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png
deleted file mode 100644
index 5fc1f43c05b..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png
deleted file mode 100644
index f7ed302b23a..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png
deleted file mode 100644
index 320c3885e7e..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png
deleted file mode 100644
index b86f437aee1..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png
deleted file mode 100644
index 9e390bb606f..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png
deleted file mode 100644
index b917612dae2..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png
deleted file mode 100644
index b51dfaaab8e..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png
deleted file mode 100644
index 1881839e965..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png
deleted file mode 100644
index 88866eb1693..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png
deleted file mode 100644
index f9337a37c53..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png
deleted file mode 100644
index 038a5321d4b..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png
deleted file mode 100644
index bfdd0678724..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png
deleted file mode 100644
index e4ea4f95882..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png
deleted file mode 100644
index fdb1fd2648b..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png
deleted file mode 100644
index a9d6c5facd5..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png
deleted file mode 100644
index 893346a9c90..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png
deleted file mode 100644
index 6456d644396..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png
deleted file mode 100644
index 73c8b6d00fe..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png
deleted file mode 100644
index f3a87d6fa4b..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png
deleted file mode 100644
index 2d00cf7a164..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png
deleted file mode 100644
index 47a2ccb7485..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png
deleted file mode 100644
index c232dd439d4..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png
deleted file mode 100644
index 2e046fbacdd..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png
deleted file mode 100644
index bc792fe1a17..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png
deleted file mode 100644
index 1d4b2f2d474..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png
deleted file mode 100644
index 0b4086478ca..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png
deleted file mode 100644
index c24212aab8d..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/janitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/janitor.png
new file mode 100644
index 00000000000..19eb0d52482
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/janitor.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/lawyer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/lawyer.png
new file mode 100644
index 00000000000..973bbf66e1e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/lawyer.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/mailcarrier.png b/Resources/Textures/Objects/Misc/id_cards.rsi/mailcarrier.png
new file mode 100644
index 00000000000..db33a5ead4c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/mailcarrier.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/martialartist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/martialartist.png
new file mode 100644
index 00000000000..e49e4478429
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/martialartist.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/medicaldoctor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/medicaldoctor.png
new file mode 100644
index 00000000000..92832dcaad6
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/medicaldoctor.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
index a84c76a46c9..eeed695ca3c 100644
--- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
@@ -1,261 +1,204 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "default"
-    },
-    {
-      "name": "centcom"
-    },
-    {
-      "name": "ert_chaplain"
-    },
-    {
-      "name": "ert_commander"
-    },
-    {
-      "name": "ert_engineer"
-    },
-    {
-      "name": "ert_janitor"
-    },
-    {
-      "name": "ert_medic"
-    },
-    {
-      "name": "ert_security"
-    },
-    {
-      "name": "gold"
-    },
-    {
-      "name": "idpassenger"
-    },
-    {
-      "name": "idatmospherictechnician"
-    },
-    {
-      "name": "idbartender"
-    },
-    {
-      "name": "idbotanist"
-    },
-    {
-      "name": "idboxer"
-    },
-    {
-      "name": "idcaptain"
-    },
-    {
-      "name": "idcargotechnician"
-    },
-    {
-      "name": "idcentcom"
-    },
-    {
-      "name": "idchaplain"
-    },
-    {
-      "name": "idchemist"
-    },
-    {
-      "name": "idchiefengineer"
-    },
-    {
-      "name": "idchiefmedicalofficer"
-    },
-    {
-      "name": "idclown"
-    },
-    {
-      "name": "idcook"
-    },
-    {
-      "name": "idcurator"
-    },
-    {
-      "name": "iddetective"
-    },
-    {
-      "name": "idgeneticist"
-    },
-    {
-      "name": "idheadofpersonnel"
-    },
-    {
-      "name": "idheadofsecurity"
-    },
-    {
-      "name": "idbrigmedic"
-    },
-    {
-      "name": "idjanitor"
-    },
-    {
-      "name": "idlawyer"
-    },
-    {
-      "name": "idmedicaldoctor"
-    },
-    {
-      "name": "idmime"
-    },
-    {
-      "name": "idparamedic"
-    },
-    {
-      "name": "idpsychologist"
-    },
-    {
-      "name": "idreporter"
-    },
-    {
-      "name": "idprisoner"
-    },
-    {
-      "name": "idquartermaster"
-    },
-    {
-      "name": "idresearchdirector"
-    },
-    {
-      "name": "idroboticist"
-    },
-    {
-      "name": "idscientist"
-    },
-    {
-      "name": "idsecurityofficer"
-    },
-    {
-      "name": "idshaftminer"
-    },
-    {
-      "name": "idstationengineer"
-    },
-    {
-      "name": "idunknown"
-    },
-    {
-      "name": "idvirologist"
-    },
-    {
-      "name": "idwarden"
-    },
-    {
-      "name": "idmusician"
-    },
-    {
-      "name": "idzookeeper"
-    },
-    {
-      "name": "idintern-sci"
-    },
-    {
-      "name": "idintern-cadet"
-    },
-    {
-      "name": "idintern-med"
-    },
-    {
-      "name": "idintern-service"
-    },
-    {
-      "name": "idintern-tech"
-    },
-    {
-      "name": "orange"
-    },
-    {
-      "name": "pirate"
-    },
-    {
-      "name": "prisoner_001"
-    },
-    {
-      "name": "prisoner_002"
-    },
-    {
-      "name": "prisoner_003"
-    },
-    {
-      "name": "prisoner_004"
-    },
-    {
-      "name": "prisoner_005"
-    },
-    {
-      "name": "prisoner_006"
-    },
-    {
-      "name": "prisoner_007"
-    },
-    {
-      "name": "silver"
-    },
-    {
-      "name": "syndie"
-    },
-    {
-      "name": "idcluwne"
-    },
-    {
-      "name": "idseniorengineer"
-    },
-    {
-      "name": "idseniorresearcher"
-    },
-    {
-      "name": "idseniorphysician"
-    },
-    {
-      "name": "idseniorofficer"
-    },
-    {
-      "name": "gold-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "gold-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "default-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "default-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "silver-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "silver-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "orange-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "orange-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "blue-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "blue-inhand-right",
-      "directions": 4
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation // Icon Edit by FoxxoTrystan",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "default"
+        },
+        {
+            "name": "centcom"
+        },
+        {
+            "name": "gold"
+        },
+        {
+            "name": "silver"
+        },
+        {
+            "name": "rainbow"
+        },
+        {
+            "name": "prisoner"
+        },
+        {
+            "name": "flame"
+        },
+        {
+            "name": "rpg"
+        },
+        {
+            "name": "carp"
+        },
+        {
+            "name": "black"
+        },
+        {
+            "name": "department"
+        },
+        {
+            "name": "departmenthead"
+        },
+        {
+            "name": "subdepartment"
+        },
+        {
+            "name": "captain"
+        },
+        {
+            "name": "passenger"
+        },
+        {
+            "name": "assistant"
+        },
+        {
+            "name": "securityofficer"
+        },
+        {
+            "name": "warden"
+        },
+        {
+            "name": "stationengineer"
+        },
+        {
+            "name": "medicaldoctor"
+        },
+        {
+            "name": "paramedic"
+        },
+        {
+            "name": "chemist"
+        },
+        {
+            "name": "cargotechnician"
+        },
+        {
+            "name": "shaftminer"
+        },
+        {
+            "name": "scientist"
+        },
+        {
+            "name": "clown"
+        },
+        {
+            "name": "mime"
+        },
+        {
+            "name": "chaplain"
+        },
+        {
+            "name": "janitor"
+        },
+        {
+            "name": "bartender"
+        },
+        {
+            "name": "cook"
+        },
+        {
+            "name": "botanist"
+        },
+        {
+            "name": "curator"
+        },
+        {
+            "name": "lawyer"
+        },
+        {
+            "name": "headofpersonnel"
+        },
+        {
+            "name": "cc"
+        },
+        {
+            "name": "musician"
+        },
+        {
+            "name": "death"
+        },
+        {
+            "name": "roboticist"
+        },
+        {
+            "name": "atmospherictechnician"
+        },
+        {
+            "name": "syndicate"
+        },
+        {
+            "name": "geneticist"
+        },
+        {
+            "name": "zookeeper"
+        },
+        {
+            "name": "detective"
+        },
+        {
+            "name": "senior"
+        },
+        {
+            "name": "mailcarrier"
+        },
+        {
+            "name": "prisonguard"
+        },
+        {
+            "name": "psychologist"
+        },
+        {
+            "name": "boxer"
+        },
+        {
+            "name": "gladiator"
+        },
+        {
+            "name": "martialartist"
+        },
+        {
+            "name": "gold-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "gold-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "default-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "default-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "silver-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "silver-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "orange-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "orange-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "blue-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "blue-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/mime.png b/Resources/Textures/Objects/Misc/id_cards.rsi/mime.png
new file mode 100644
index 00000000000..8368027151f
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/mime.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/musician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/musician.png
new file mode 100644
index 00000000000..1f1df6370ce
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/musician.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png
deleted file mode 100644
index a44da608ec0..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/paramedic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/paramedic.png
new file mode 100644
index 00000000000..d1f48a111d3
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/paramedic.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/passenger.png b/Resources/Textures/Objects/Misc/id_cards.rsi/passenger.png
new file mode 100644
index 00000000000..9f04507a9c5
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/passenger.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png b/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png
deleted file mode 100644
index d5670a71aa1..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner.png
new file mode 100644
index 00000000000..ad8052cc01b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png
deleted file mode 100644
index 67dd3e88622..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png
deleted file mode 100644
index 004677ba4ab..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png
deleted file mode 100644
index 23c998f1507..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png
deleted file mode 100644
index c6e31412cc7..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png
deleted file mode 100644
index d1d29bb0558..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png
deleted file mode 100644
index 8b2305d7587..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png
deleted file mode 100644
index a5041faa88b..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisonguard.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisonguard.png
new file mode 100644
index 00000000000..f8570b2595c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisonguard.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/psychologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/psychologist.png
new file mode 100644
index 00000000000..d7d24d69470
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/psychologist.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/rainbow.png b/Resources/Textures/Objects/Misc/id_cards.rsi/rainbow.png
new file mode 100644
index 00000000000..a0ccc1758c8
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/rainbow.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/roboticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/roboticist.png
new file mode 100644
index 00000000000..ea7bda6c41e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/roboticist.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/rpg.png b/Resources/Textures/Objects/Misc/id_cards.rsi/rpg.png
new file mode 100644
index 00000000000..f6aa05e158b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/rpg.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/scientist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/scientist.png
new file mode 100644
index 00000000000..7942e128b03
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/scientist.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/securityofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/securityofficer.png
new file mode 100644
index 00000000000..fffc7d2a065
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/securityofficer.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/senior.png b/Resources/Textures/Objects/Misc/id_cards.rsi/senior.png
new file mode 100644
index 00000000000..28729bd5626
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/senior.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/shaftminer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/shaftminer.png
new file mode 100644
index 00000000000..4b42f5bbb67
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/shaftminer.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png
index b13153a246e..81d9626a727 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/stationengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/stationengineer.png
new file mode 100644
index 00000000000..c04b4761ea8
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/stationengineer.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/subdepartment.png b/Resources/Textures/Objects/Misc/id_cards.rsi/subdepartment.png
new file mode 100644
index 00000000000..cc1547cbf73
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/subdepartment.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndicate.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndicate.png
new file mode 100644
index 00000000000..5ed1c8ffe54
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/syndicate.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png
deleted file mode 100644
index 3d5cc6e384f..00000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/warden.png b/Resources/Textures/Objects/Misc/id_cards.rsi/warden.png
new file mode 100644
index 00000000000..754ac67a883
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/warden.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/zookeeper.png b/Resources/Textures/Objects/Misc/id_cards.rsi/zookeeper.png
new file mode 100644
index 00000000000..29b8dbca067
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/zookeeper.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..374a7981d04
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
index ddbda4f0afc..782dc2bfda0 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14, equipped-HELMET taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and changed hue",
   "size": {
     "x": 32,
     "y": 32
@@ -27,6 +27,10 @@
     },
     {
       "name": "stage-3"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png
rename to Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
index 8b6952d030b..b49b49cc850 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, equipped-HELMET taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
@@ -27,6 +27,10 @@
     },
     {
       "name": "stage-3"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bounty.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bounty.png
new file mode 100644
index 00000000000..5db87e61825
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bounty.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/captains_paper.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/captains_paper.png
new file mode 100644
index 00000000000..87ee739fa2f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/captains_paper.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/invoice.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/invoice.png
new file mode 100644
index 00000000000..508a6b12e6f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/invoice.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json
index b6feb49959f..e8727873146 100644
--- a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.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/39659000f380583c35fb814ee2fadab24c2f8076",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/39659000f380583c35fb814ee2fadab24c2f8076, additional label sprites by Vermidia",
   "size": {
     "x": 32,
     "y": 32
@@ -14,10 +14,19 @@
       "name": "bag_folded"
     },
     {
-      "name": "label_overlay"
+      "name": "paper"
     },
     {
       "name": "open_overlay"
+    },
+    {
+      "name": "bounty"
+    },
+    {
+      "name": "captains_paper"
+    },
+    {
+      "name": "invoice"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/paper.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png
rename to Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/paper.png
diff --git a/Resources/Textures/Objects/Tools/emag.rsi/icon.png b/Resources/Textures/Objects/Tools/emag.rsi/icon.png
index 61c283cfd01..912fd6be821 100644
Binary files a/Resources/Textures/Objects/Tools/emag.rsi/icon.png and b/Resources/Textures/Objects/Tools/emag.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/emag.rsi/meta.json b/Resources/Textures/Objects/Tools/emag.rsi/meta.json
index 66fc62d663d..d90e37eb584 100644
--- a/Resources/Textures/Objects/Tools/emag.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/emag.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation wiki at https://tgstation13.org/wiki/File:Emag.png, inhand sprites modified from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e",
+  "copyright": "Taken from https://github.com/tgstation/tgstation",
   "size": {
     "x": 32,
     "y": 32
@@ -16,7 +16,17 @@
       "directions": 4
     },
     {
-      "name": "icon"
+      "name": "icon",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..585f2279403
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-SUITSTORAGE.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 49209bf2dcd..421037eac37 100644
--- a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
@@ -32,6 +32,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png
new file mode 100644
index 00000000000..6955b10e5d0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
new file mode 100644
index 00000000000..c7c06adfc87
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, modified into incomplete version by Vermidia",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..648fff08e4c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-SUITSTORAGE.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 383ea777d27..5a18552d2e0 100644
--- a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
@@ -32,6 +32,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..e194aff0a62
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-SUITSTORAGE.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 383ea777d27..5a18552d2e0 100644
--- a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
@@ -32,6 +32,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..cb8ff3d7441
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-SUITSTORAGE.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 49209bf2dcd..421037eac37 100644
--- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
@@ -32,6 +32,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..fc03f154a4a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-SUITSTORAGE.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 383ea777d27..5a18552d2e0 100644
--- a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
@@ -32,6 +32,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png
deleted file mode 100644
index 738c92a6d36..00000000000
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png
deleted file mode 100644
index 204c5ff89df..00000000000
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/condisposal.png b/Resources/Textures/Structures/Furniture/toilet.rsi/condisposal.png
new file mode 100644
index 00000000000..c60cabe80b1
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/condisposal.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-charging.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-charging.png
new file mode 100644
index 00000000000..cb9ad3a9c75
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-charging.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-closed.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-closed.png
new file mode 100644
index 00000000000..98c4088abac
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-closed.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png
new file mode 100644
index 00000000000..97712ddc653
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-flush.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-flush.png
new file mode 100644
index 00000000000..811284448c8
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-flush.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-open.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-open.png
new file mode 100644
index 00000000000..f48f67bf9a6
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-open.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png
new file mode 100644
index 00000000000..3b37aba4729
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal.png
new file mode 100644
index 00000000000..cb2db2f9d8e
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-charge.png b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-charge.png
new file mode 100644
index 00000000000..23ecafa9d82
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-charge.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-full.png b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-full.png
new file mode 100644
index 00000000000..ceb04dfb268
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-full.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-handle.png b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-handle.png
new file mode 100644
index 00000000000..4f40192d5bc
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-handle.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-ready.png b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-ready.png
new file mode 100644
index 00000000000..bac1c76ec96
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/toilet.rsi/dispover-ready.png differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/meta.json b/Resources/Textures/Structures/Furniture/toilet.rsi/meta.json
index 07619942779..047ddbb24bf 100644
--- a/Resources/Textures/Structures/Furniture/toilet.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/toilet.rsi/meta.json
@@ -4,24 +4,240 @@
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Made by brainfood1183 (github) for ss14",
     "states": [
         {
-            "name": "closed_toilet_seat_down",
-            "directions": 4
+            "name": "condisposal",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
         },
         {
-            "name": "closed_toilet_seat_up",
-            "directions": 4
+            "name": "disposal-open",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
         },
         {
-            "name": "open_toilet_seat_down",
-            "directions": 4
+            "name": "disposal-closed",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
         },
         {
-            "name": "open_toilet_seat_up",
-            "directions": 4
+            "name": "disposal",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "disposal-up",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "disposal-down",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "disposal-charging",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "disposal-flush",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ],
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ],
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ],
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "dispover-charge",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "dispover-full",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "dispover-handle",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "dispover-ready",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png
deleted file mode 100644
index a487afc0b8a..00000000000
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png
deleted file mode 100644
index 77995657cf6..00000000000
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Machines/arcade.rsi/meta.json b/Resources/Textures/Structures/Machines/arcade.rsi/meta.json
index 63820ec06a8..38289e4b07c 100644
--- a/Resources/Textures/Structures/Machines/arcade.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/arcade.rsi/meta.json
@@ -19,7 +19,11 @@
       "directions": 4
     },
     {
-      "name": "invaders",
+        "name": "panel",
+        "directions": 4
+    },
+    {
+      "name": "screen_invaders",
       "directions": 4,
       "delays": [
         [
@@ -42,7 +46,7 @@
       ]
     },
     {
-      "name": "blockgame",
+      "name": "screen_blockgame",
       "directions": 4,
       "delays": [
         [
@@ -82,6 +86,48 @@
           4.8
         ]
       ]
+    },
+    {
+        "name": "screen_spacevillain",
+        "directions": 4,
+        "delays": [
+          [
+            1.0,
+            0.8,
+            0.2,
+            0.8,
+            0.5,
+            1.0,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.5,
+            1.0,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.2,
+            0.5,
+            0.1,
+            0.8,
+            1.0
+          ],
+          [
+            9.6
+          ],
+          [
+            9.6
+          ],
+          [
+            9.6
+          ]
+        ]
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Machines/arcade.rsi/panel.png b/Resources/Textures/Structures/Machines/arcade.rsi/panel.png
new file mode 100644
index 00000000000..fa651565796
Binary files /dev/null and b/Resources/Textures/Structures/Machines/arcade.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/arcade.rsi/blockgame.png b/Resources/Textures/Structures/Machines/arcade.rsi/screen_blockgame.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/arcade.rsi/blockgame.png
rename to Resources/Textures/Structures/Machines/arcade.rsi/screen_blockgame.png
diff --git a/Resources/Textures/Structures/Machines/arcade.rsi/invaders.png b/Resources/Textures/Structures/Machines/arcade.rsi/screen_invaders.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/arcade.rsi/invaders.png
rename to Resources/Textures/Structures/Machines/arcade.rsi/screen_invaders.png
diff --git a/Resources/Textures/Structures/Machines/arcade.rsi/screen_spacevillain.png b/Resources/Textures/Structures/Machines/arcade.rsi/screen_spacevillain.png
new file mode 100644
index 00000000000..4935ac81b53
Binary files /dev/null and b/Resources/Textures/Structures/Machines/arcade.rsi/screen_spacevillain.png differ
diff --git a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/display.png b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/display.png
index e86c4579629..d9edabb6a0d 100644
Binary files a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/display.png and b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/display.png differ
diff --git a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/icon.png b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/icon.png
index d21713efdd0..a60dc10b12d 100644
Binary files a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/icon.png and b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/meta.json b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/meta.json
index c3bd5aeaa46..d7f967e7390 100644
--- a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage",
+  "copyright": "Created by EmoGarbage, icon & unshaded changed by lzk228",
   "size": {
     "x": 32,
     "y": 32
@@ -14,11 +14,12 @@
       "name": "icon"
     },
     {
-      "name": "printing", 
+      "name": "printing",
       "delays": [[0.25, 0.25, 0.25, 0.25]]
     },
     {
-      "name": "unshaded"
+      "name": "unshaded",
+      "delays": [[2, 1, 1, 1]]
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/unshaded.png b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/unshaded.png
index bfb67b28f3f..4788c7df1b8 100644
Binary files a/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/unshaded.png and b/Resources/Textures/Structures/Machines/tech_disk_printer.rsi/unshaded.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/base.png b/Resources/Textures/Structures/Power/apc.rsi/base.png
index 2b42c54935a..ea2f17c062f 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 092694c371f..4bcd2475cdf 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/channel0-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png
index ba84b7d6db5..0d181878fcf 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png and b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png
index 6cce72f795f..c7a0d87ccc3 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png
index 61ae057d508..4be0bbfb0bc 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png and b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png
index 6cc48bd1a55..720dc4976ab 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png
index b31bed6c6ba..7f0a13a7a4c 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png and b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png
index 959a05cde08..87191be5207 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png
index 3bb505ecb86..031213f74ad 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png and b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png
index bd8b013310c..ac5f1c1befe 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png
index 0cca8602208..ff8522d2c5a 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png and b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png
index 56802dc0437..4e04387ed3d 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png
index 5ac134cb54b..2f9802281e0 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png and b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png
index 5ebec4feeeb..fb9e2180bb6 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png and b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.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 67e3b3df19b..d5e356d943e 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 1739853e2b7..4a9bd7ed643 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 c4c103eeb96..d1d2df4858d 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 be343a987b0..07265ab67de 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 2713c5506a2..77c2518e63d 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 7d3529f63f5..e4c9c1b31cf 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/meta.json b/Resources/Textures/Structures/Power/apc.rsi/meta.json
index 82f78ccb875..867e5ce0ffd 100644
--- a/Resources/Textures/Structures/Power/apc.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/apc.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
+  "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fca7f2a0f9154c0c6c4efc2f8f58441fb9b34759",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Power/apc.rsi/sparks-unlit.png b/Resources/Textures/Structures/Power/apc.rsi/sparks-unlit.png
index 212fcb78bf8..f442757bea6 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/sparks-unlit.png and b/Resources/Textures/Structures/Power/apc.rsi/sparks-unlit.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/static.png b/Resources/Textures/Structures/Power/apc.rsi/static.png
index 43089d0d811..a7137ec2f3a 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/Power/power.rsi/meta.json b/Resources/Textures/Structures/Power/power.rsi/meta.json
index 773a2b5a3e7..027655dd356 100644
--- a/Resources/Textures/Structures/Power/power.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/power.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation",
+  "copyright": "Taken from tgstation/paradise",
   "states": [
     {
       "name": "eightdirwire"
diff --git a/Resources/Textures/Structures/Power/power.rsi/storage.png b/Resources/Textures/Structures/Power/power.rsi/storage.png
index 5f42ce89bc2..71e7cf91956 100644
Binary files a/Resources/Textures/Structures/Power/power.rsi/storage.png and b/Resources/Textures/Structures/Power/power.rsi/storage.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/meta.json b/Resources/Textures/Structures/Power/smes.rsi/meta.json
index 2ca8d1fb226..4b4193ec726 100644
--- a/Resources/Textures/Structures/Power/smes.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/smes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
+  "copyright": "Taken from Paradise at https://github.com/McRamon/Paradise/blob/b727162ed9dead12de42be5c5b04872934a474e1/icons/obj/power.dmi",
   "size": {
     "x": 32,
     "y": 32
@@ -9,33 +9,9 @@
   "states": [
     {
       "name": "smes"
-    },
-		{
-      "name": "static"
-    },
-    {
-      "name": "smes-open"
-    },
-    {
-      "name": "smes-oc0"
     },
     {
-      "name": "smes-oc1",
-      "delays": [
-        [
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "smes-oc2",
-      "delays": [
-        [
-          0.5,
-          0.5
-        ]
-      ]
+      "name": "static"
     },
     {
       "name": "smes-og1",
@@ -62,16 +38,50 @@
       "name": "smes-op0"
     },
     {
-      "name": "smes-op1",
+      "name": "smes-op1"
+    },
+    {
+      "name": "smes-op2"
+    },
+    {
+      "name": "smes-oc1",
       "delays": [
         [
-          1,
-          1
+          0.3,
+          0.3
         ]
       ]
     },
     {
-      "name": "smes-op2"
+       "name": "smes-oc2",
+        "delays": [
+        [
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "smes-oc0",
+      "delays": [
+        [
+          0.5,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "smes-open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png
index 5579432d3fe..9d62074f1d8 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png
index d624672613b..10f4c4678ed 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png
index d624672613b..10f4c4678ed 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og1.png
index c65f011a070..472b013ce71 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-og1.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-og1.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png
index 00237504051..c2d3dbbc46e 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og3.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og3.png
index 51df688e4a8..263d8e98f78 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-og3.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-og3.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png
index ceb3db1bc31..e31794f5c70 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png
index e6c0c8a2eac..26955f70a16 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png
index 573b5c404ff..ab0ae9e1145 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png
index f5c8e104894..58d8dbf1f5c 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png
index af560237f17..58d8dbf1f5c 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-open.png b/Resources/Textures/Structures/Power/smes.rsi/smes-open.png
index 472e3fd7201..03868889f61 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-open.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-open.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes.png b/Resources/Textures/Structures/Power/smes.rsi/smes.png
index ecfbc4cd58f..71e7cf91956 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes.png and b/Resources/Textures/Structures/Power/smes.rsi/smes.png differ
diff --git a/Resources/Textures/Structures/Power/smes.rsi/static.png b/Resources/Textures/Structures/Power/smes.rsi/static.png
index 3e52b6c43e4..0fcc42db544 100644
Binary files a/Resources/Textures/Structures/Power/smes.rsi/static.png and b/Resources/Textures/Structures/Power/smes.rsi/static.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/charging.png b/Resources/Textures/Structures/Power/substation.rsi/charging.png
index 538dc2b7a84..fdf01dbe8de 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/charging.png and b/Resources/Textures/Structures/Power/substation.rsi/charging.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/dead.png b/Resources/Textures/Structures/Power/substation.rsi/dead.png
index 9fbff744ca7..ba6f81f1a1a 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/dead.png and b/Resources/Textures/Structures/Power/substation.rsi/dead.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/full.png b/Resources/Textures/Structures/Power/substation.rsi/full.png
index d1797426699..42a670ff234 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/full.png and b/Resources/Textures/Structures/Power/substation.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/meta.json b/Resources/Textures/Structures/Power/substation.rsi/meta.json
index 0125458641c..a2ade57116e 100644
--- a/Resources/Textures/Structures/Power/substation.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/substation.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser.",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/b63634bc17efe2f09cf06ef0e9a90d24d37f6203, wall modified by Peptide90",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen.png b/Resources/Textures/Structures/Power/substation.rsi/screen.png
index 60c922c53f6..c28bcbcedae 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/screen.png and b/Resources/Textures/Structures/Power/substation.rsi/screen.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation.png b/Resources/Textures/Structures/Power/substation.rsi/substation.png
index b9d1eb18d8f..45524ad8b11 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation.png and b/Resources/Textures/Structures/Power/substation.rsi/substation.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png
index 9d5b8598f4b..2a1de1a0661 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png
index 155ced7128a..8e8ae3fe3c2 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png differ
diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png
index e810e6a5a4a..ee24ff45e68 100644
Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/artifact.rsi/bounty.png b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/bounty.png
new file mode 100644
index 00000000000..ee32a8211ea
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/bounty.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/artifact.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/captains_paper.png
new file mode 100644
index 00000000000..57f9a909507
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/captains_paper.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/artifact.rsi/invoice.png b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/invoice.png
new file mode 100644
index 00000000000..ed4951d12a8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/invoice.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/artifact.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/meta.json
index 7a17f38fa5c..1a535ab97c4 100644
--- a/Resources/Textures/Structures/Storage/Crates/artifact.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/meta.json
@@ -1,32 +1,44 @@
 {
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09",
-    "states": [
-        {
-            "name": "artifact_container"
-        },
-        {
-            "name": "artifact_container_door"
-        },
-        {
-            "name": "artifact_container_open"
-        },
-        {
-            "name": "artifact_container_icon"
-        },
-        {
-            "name": "locked"
-        },
-        {
-            "name": "unlocked"
-        },
-        {
-            "name": "welded"
-        }
-    ]
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09. Label sprites by Vermidia.",
+  "states": [
+    {
+      "name": "artifact_container"
+    },
+    {
+      "name": "artifact_container_door"
+    },
+    {
+      "name": "artifact_container_open"
+    },
+    {
+      "name": "artifact_container_icon"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "bounty"
+    },
+    {
+      "name": "captains_paper"
+    },
+    {
+      "name": "invoice"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/artifact.rsi/paper.png b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/paper.png
new file mode 100644
index 00000000000..6cf41f02c8b
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/paper.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/coffin.rsi/bounty.png b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/bounty.png
new file mode 100644
index 00000000000..54a2f0fbd03
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/bounty.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/coffin.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/captains_paper.png
new file mode 100644
index 00000000000..7265057446c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/captains_paper.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/coffin.rsi/invoice.png b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/invoice.png
new file mode 100644
index 00000000000..e0efa6e950d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/invoice.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/coffin.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/meta.json
index 610ea0183c0..7908408cd3f 100644
--- a/Resources/Textures/Structures/Storage/Crates/coffin.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/coffin.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/32c8d0abc573d7370eb145d8ce74176d59b7eea3",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/32c8d0abc573d7370eb145d8ce74176d59b7eea3. Label sprites by Vermidia.",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,18 @@
     },
     {
       "name": "closed"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "bounty"
+    },
+    {
+      "name": "captains_paper"
+    },
+    {
+      "name": "invoice"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Storage/Crates/coffin.rsi/paper.png b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/paper.png
new file mode 100644
index 00000000000..630ffe8e10c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/paper.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png
new file mode 100644
index 00000000000..52e515e39b8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png
new file mode 100644
index 00000000000..961991bf349
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png
new file mode 100644
index 00000000000..3e00e7d8068
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
new file mode 100644
index 00000000000..c180604984c
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Vermidia.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "paper"
+    },
+    {
+      "name": "bounty"
+    },
+    {
+      "name": "captains_paper"
+    },
+    {
+      "name": "invoice"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png
new file mode 100644
index 00000000000..8daf7770832
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/bounty.png b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/bounty.png
new file mode 100644
index 00000000000..d7bd7f29eef
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/bounty.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/captains_paper.png
new file mode 100644
index 00000000000..4fd4bf0503f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/captains_paper.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/invoice.png b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/invoice.png
new file mode 100644
index 00000000000..aacd2ca7681
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/invoice.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json
index 082564ccfb0..9c0d876c501 100644
--- a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood118 (github) for ss14",
+  "copyright": "Made by brainfood118 (github) for ss14. Label Sprites by Vermidia.",
   "size": {
     "x": 32,
     "y": 32
@@ -20,21 +20,33 @@
       "name": "crate_icon"
     },
     {
-        "name": "sparking",
-        "directions": 1,
-        "delays": [
-            [
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1
-            ]
+      "name": "sparking",
+      "directions": 1,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
         ]
+      ]
     },
     {
       "name": "crate_open"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "bounty"
+    },
+    {
+      "name": "captains_paper"
+    },
+    {
+      "name": "invoice"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/paper.png b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/paper.png
new file mode 100644
index 00000000000..f0c91659d3e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/paper.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
index cf0c204447b..c52bc13540e 100644
--- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
@@ -4,7 +4,7 @@
     "x": 32,
     "y": 32
   },
-  "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github)",
+  "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2_door state modified by Flareguy from fire_door, using sprites from /vg/station at https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e",
   "license": "CC-BY-SA-3.0",
   "states": [
     {
@@ -398,6 +398,9 @@
     {
       "name": "mixed_door"
     },
+    {
+      "name": "n2_door"
+    },
     {
       "name": "oldcloset"
     },
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png b/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png
new file mode 100644
index 00000000000..f6d9499f10a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
index 02e8764173f..0a2e1ae76b9 100644
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
index 9d10428af8d..1565cdc86d7 100644
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
index 160db7c5cbb..7e14e2c2b39 100644
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
index 0f8f9478bd8..5ead53beb0e 100644
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
index e1258d83dc3..50cc6725c71 100644
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
index 4b8aa5fa2f0..be5f4a804b1 100644
--- a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
@@ -1,11 +1,11 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
   "size": {
     "x": 32,
     "y": 32
   },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi",
   "states": [
     {
       "name": "broken",
@@ -16,14 +16,14 @@
       "directions": 4
     },
     {
-      "name": "base",
+      "name": "empty",
       "directions": 4
     },
     {
-      "name": "empty",
+      "name": "base",
       "directions": 4
     },
-	{
+    {
       "name": "glow",
       "directions": 4
     }
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/base.png b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/base.png
new file mode 100644
index 00000000000..a68dfc9d877
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/broken.png
new file mode 100644
index 00000000000..e2a4ab462c2
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/empty.png
new file mode 100644
index 00000000000..b48cc5ab9e0
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/empty.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/glow.png
new file mode 100644
index 00000000000..0e8645bd9aa
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/glow.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/meta.json
new file mode 100644
index 00000000000..865473f5450
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by Ko4erga (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "empty",
+      "directions": 4
+    },
+	  {
+      "name": "glow",
+      "directions": 4
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
index 3b714153de9..fdc9376d67f 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
index e7a23014888..d371695e129 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
index 716536cfcb2..9d8640f85b0 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
index fc185734afd..5fbc157750b 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
index 0cdb0466062..38b22ccd815 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
index 192c589f26c..6f1292bb058 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
index 793babbbe6a..0b3192122be 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
index 0f3e60bc0e8..61ecb87ff48 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire0.png
index aa9559b7dce..278e5cf03b2 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire0.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire0.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_0.png
index 39d4e989710..621410d043e 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_0.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_0.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_1.png
index 765fdc6e594..fb775d3098b 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_1.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_3.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_3.png
index ad74165ec40..71b96f2130d 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_3.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_3.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b0.png
index cc554c73944..cfe596102d2 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b0.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b0.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b1.png
index f732817d47e..1a620adc144 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b1.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b2.png
index d862c40a4bc..c199a7ff31e 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_b2.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_bitem.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_bitem.png
index cc2a57c4956..5be7e11fc85 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_bitem.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_bitem.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_emagged.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_emagged.png
index 310bb89d41b..bafb4249565 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_emagged.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_emagged.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_off.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_off.png
index 8695c8a35dc..3eb61db8b6c 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_off.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_off.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_on.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_on.png
index a98566070e5..ce3697456ff 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_on.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire_on.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/firex.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/firex.png
index 5ac3fad6af8..dd31be02f80 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/firex.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/firex.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
index 62e0a281bf0..7484be2ffed 100644
--- a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
@@ -1,48 +1,20 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/b7ac5798ae0d411b0cdeaf7efbc4ac86d24b4634, fire_emagged.png edited by github:Morb0",
     "size": {
         "x": 32,
         "y": 32
     },
-    "copyright": "Taken from tgstation",
-    "license": "CC-BY-SA-3.0",
     "states": [
         {
             "name": "alarm0",
             "directions": 4,
             "delays": [
-                [
-                    0.5,
-                    0.1,
-                    0.1,
-                    1.0,
-                    0.2,
-                    0.1
-                ],
-                [
-                    0.5,
-                    0.1,
-                    0.1,
-                    1.0,
-                    0.2,
-                    0.1
-                ],
-                [
-                    0.5,
-                    0.1,
-                    0.1,
-                    1.0,
-                    0.2,
-                    0.1
-                ],
-                [
-                    0.5,
-                    0.1,
-                    0.1,
-                    1.0,
-                    0.2,
-                    0.1
-                ]
+                [2.8, 2.8],
+                [2.8, 2.8],
+                [2.8, 2.8],
+                [2.8, 2.8]
             ]
         },
         {
@@ -50,20 +22,20 @@
             "directions": 4,
             "delays": [
                 [
-                    0.5,
-                    0.5
+                    0.6, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                    0.2, 0.2, 0.2, 0.2, 0.2, 0.6, 0.6, 0.6
                 ],
                 [
-                    0.5,
-                    0.5
+                    0.6, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                    0.2, 0.2, 0.2, 0.2, 0.2, 0.6, 0.6, 0.6
                 ],
                 [
-                    0.5,
-                    0.5
+                    0.6, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                    0.2, 0.2, 0.2, 0.2, 0.2, 0.6, 0.6, 0.6
                 ],
                 [
-                    0.5,
-                    0.5
+                    0.6, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
+                    0.2, 0.2, 0.2, 0.2, 0.2, 0.6, 0.6, 0.6
                 ]
             ]
         },
@@ -72,20 +44,20 @@
             "directions": 4,
             "delays": [
                 [
-                    0.5,
-                    0.5
+                    0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4,
+                    0.4, 0.4
                 ],
                 [
-                    0.5,
-                    0.5
+                    0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4,
+                    0.4, 0.4
                 ],
                 [
-                    0.5,
-                    0.5
+                    0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4,
+                    0.4, 0.4
                 ],
                 [
-                    0.5,
-                    0.5
+                    0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4,
+                    0.4, 0.4
                 ]
             ]
         },
@@ -98,7 +70,8 @@
             "directions": 4
         },
         {
-            "name": "alarm_bitem"
+            "name": "alarm_bitem",
+            "directions": 1
         },
         {
             "name": "alarmp",
@@ -109,17 +82,14 @@
             "directions": 4
         },
         {
-            "name": "auth_off"
+            "name": "auth_off",
+            "directions": 1,
+            "delays": [[1]]
         },
         {
             "name": "auth_on",
             "directions": 1,
-            "delays": [
-                [
-                    0.1,
-                    0.1
-                ]
-            ]
+            "delays": [[0.1, 0.1]]
         },
         {
             "name": "fire0",
@@ -137,44 +107,20 @@
             "name": "fire_2",
             "directions": 4,
             "delays": [
-                [
-                    0.5,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5
-                ]
+                [0.5, 0.5],
+                [0.5, 0.5],
+                [0.5, 0.5],
+                [0.5, 0.5]
             ]
         },
         {
             "name": "fire_3",
             "directions": 4,
             "delays": [
-                [
-                    0.5,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5
-                ]
+                [0.3, 0.3],
+                [0.3, 0.3],
+                [0.3, 0.3],
+                [0.3, 0.3]
             ]
         },
         {
@@ -190,67 +136,21 @@
             "directions": 4
         },
         {
-            "name": "fire_bitem"
+            "name": "fire_bitem",
+            "directions": 1
         },
         {
-            "name": "fire_detected",
+            "name": "fire_emagged",
             "directions": 4,
             "delays": [
-                [
-                    0.4,
-                    0.4
-                ],
-                [
-                    0.4,
-                    0.4
-                ],
-                [
-                    0.4,
-                    0.4
-                ],
-                [
-                    0.4,
-                    0.4
-                ]
+                [0.3, 0.3],
+                [0.3, 0.3],
+                [0.3, 0.3],
+                [0.3, 0.3]
             ]
         },
         {
-            "name": "fire_emagged",
-            "directions": 4,
-            "delays": [
-                [
-                    0.5,
-                    0.5,
-                    0.3,
-                    0.5,
-                    0.2,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5,
-                    0.3,
-                    0.5,
-                    0.2,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5,
-                    0.3,
-                    0.5,
-                    0.2,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5,
-                    0.3,
-                    0.5,
-                    0.2,
-                    0.5
-                ]
-            ]
+            "name": "fire_detected"
         },
         {
             "name": "fire_off",
@@ -260,27 +160,14 @@
             "name": "fire_on",
             "directions": 4,
             "delays": [
-                [
-                    0.5,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5
-                ],
-                [
-                    0.5,
-                    0.5
-                ]
+                [0.2, 0.2, 0.2, 0.2, 0.2, 0.2],
+                [0.2, 0.2, 0.2, 0.2, 0.2, 0.2],
+                [0.2, 0.2, 0.2, 0.2, 0.2, 0.2],
+                [0.2, 0.2, 0.2, 0.2, 0.2, 0.2]
             ]
         },
         {
-            "name": "fire_overlay",
-            "directions": 4
+            "name": "fire_overlay"
         },
         {
             "name": "firex",
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera.png
index 19481d55a0d..f3054b57ed3 100644
Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_assembly.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_assembly.png
index 44d8460f5fc..404e4dad197 100644
Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_assembly.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_assembly.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_emp.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_emp.png
index 6a7c1a24c51..59c7f453ebc 100644
Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_emp.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_emp.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_in_use.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_in_use.png
index 42a6a6e098e..3ed85a4a6b2 100644
Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_in_use.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_in_use.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_off.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_off.png
index 7fa16ed3fdd..487a2602aa5 100644
Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_off.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/camera_off.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/cameracase.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/cameracase.png
index ac3f200d1fe..f93042f15f2 100644
Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/cameracase.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/cameracase.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/camera.rsi/meta.json
index b8cedc6db63..95d2b24378e 100644
--- a/Resources/Textures/Structures/Wallmounts/camera.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/camera.rsi/meta.json
@@ -1,73 +1,490 @@
 {
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/f878e95210d81e1328b023feb96ec0d0b6113d8c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "camera",
+      "directions": 8,
+      "delays": [
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25
+        ]
+      ]
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/6bfe3b2e4fcbcdac9159dc4f0327a82ddf05ba7bi",
-    "states": [
-        {
-            "name": "camera",
-            "directions": 1,
-            "delays": [
-                [ 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3 ]
-            ]
-        },
-        {
-            "name": "camera_assembly",
-            "directions": 1
-        },
-        {
-            "name": "camera_emp",
-            "directions": 1,
-            "delays": [
-                [ 0.2, 0.2, 0.1, 0.1 ]
-            ]
-        },
-        {
-            "name": "camera_in_use",
-            "directions": 1,
-            "delays": [
-                [ 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3 ]
-            ]
-        },
-        {
-            "name": "camera_off",
-            "directions": 1
-        },
-        {
-            "name": "cameracase",
-            "directions": 1
-        },
-        {
-            "name": "xraycamera",
-            "directions": 1,
-            "delays": [
-                [ 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3 ]
-            ]
-        },
-        {
-            "name": "xraycamera_assembly",
-            "directions": 1
-        },
-        {
-            "name": "xraycamera_emp",
-            "directions": 1,
-            "delays": [
-                [ 0.2, 0.2, 0.1, 0.1 ]
-            ]
-        },
-        {
-            "name": "xraycamera_in_use",
-            "directions": 1,
-            "delays": [
-                [ 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3 ]
-            ]
-        },
-        {
-            "name": "xraycamera_off",
-            "directions": 1
-        }
-    ]
-}
\ No newline at end of file
+    {
+      "name": "camera_in_use",
+      "directions": 8,
+      "delays": [
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ]
+      ]
+    },
+    {
+      "name": "camera_off",
+      "directions": 8
+    },
+    {
+      "name": "camera_emp",
+      "directions": 8,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "camera_assembly",
+      "directions": 8
+    },
+    {
+      "name": "xraycamera",
+      "directions": 8,
+      "delays": [
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ]
+      ]
+    },
+    {
+      "name": "xraycamera_emp",
+      "directions": 8,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "xraycamera_off",
+      "directions": 8
+    },
+    {
+      "name": "xraycamera_assembly",
+      "directions": 8
+    },
+    {
+      "name": "cameracase"
+    },
+    {
+      "name": "xraycamera_in_use",
+      "directions": 8,
+      "delays": [
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ],
+        [
+          0.25,
+          0.25,
+          0.6,
+          0.25,
+          0.25,
+          0.25,
+          0.6,
+          0.25
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera.png
index 31d9892d9f6..b543be5d7b3 100644
Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_assembly.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_assembly.png
index d2f690d3c11..5dfddb08f7d 100644
Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_assembly.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_assembly.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_emp.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_emp.png
index af6f3e2ceca..434dbd575b6 100644
Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_emp.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_emp.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_in_use.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_in_use.png
index 96dc134c7f2..dadc30eba7c 100644
Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_in_use.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_in_use.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_off.png b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_off.png
index 9b8a1aed798..487a2602aa5 100644
Binary files a/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_off.png and b/Resources/Textures/Structures/Wallmounts/camera.rsi/xraycamera_off.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png
index 787af3f5387..7ddea57eded 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..fb01e708619 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..21fc9a1bad5 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/meta.json b/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json
index f5a9d7b89c2..d4440c99a04 100644
--- a/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/6bfe3b2e4fcbcdac9159dc4f0327a82ddf05ba7bi",
+    "copyright": "Taken from https://github.com/Skyrat-SS13/Skyrat-tg/blob/6e7197f550aac62a165c0a8c6b0835de19342623/modular_skyrat/modules/aesthetics/intercom/icons/intercom.dmi & build state from DenLemp#2965",
     "states": [
         {
             "name": "base",
diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
index 7b0bb630722..9c4c3f199e6 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/keybinds.yml b/Resources/keybinds.yml
index 24da641a078..2cca749317a 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -171,6 +171,9 @@ binds:
 - function: RotateStoredItem
   type: State
   key: MouseRight
+- function: SaveItemLocation
+  type: State
+  key: MouseMiddle
 - function: Drop
   type: State
   key: Q
@@ -255,6 +258,12 @@ binds:
   type: State
   key: V
   mod1: Shift
+- function: OfferItem
+  type: State
+  key: F
+- function: ToggleStanding
+  type: State
+  key: R
 - function: ShowDebugConsole
   type: State
   key: Tilde
diff --git a/RobustToolbox b/RobustToolbox
index 25bbb21dc86..eb638099999 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 25bbb21dc868b4e0b43b6d28e899710891b35868
+Subproject commit eb638099999dce3a43d90772ca976ae010d649c0