diff --git a/Content.Benchmarks/ColorInterpolateBenchmark.cs b/Content.Benchmarks/ColorInterpolateBenchmark.cs
index 2243bb4819e..eb182328d46 100644
--- a/Content.Benchmarks/ColorInterpolateBenchmark.cs
+++ b/Content.Benchmarks/ColorInterpolateBenchmark.cs
@@ -131,8 +131,8 @@ public static Color InterpolateSysVector4(Color a, Color b,
         public static Color InterpolateSysVector4In(in Color endPoint1, in Color endPoint2,
             float lambda)
         {
-            ref var sva = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(endPoint1));
-            ref var svb = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(endPoint2));
+            ref var sva = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(in endPoint1));
+            ref var svb = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(in endPoint2));
 
             var res = SysVector4.Lerp(svb, sva, lambda);
 
@@ -156,8 +156,8 @@ public static Color InterpolateSimd(Color a, Color b,
         public static Color InterpolateSimdIn(in Color a, in Color b,
             float lambda)
         {
-            var vecA = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(a));
-            var vecB = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(b));
+            var vecA = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(in a));
+            var vecB = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(in b));
 
             vecB = Fma.MultiplyAdd(Sse.Subtract(vecB, vecA), Vector128.Create(lambda), vecA);
 
diff --git a/Content.Benchmarks/DeviceNetworkingBenchmark.cs b/Content.Benchmarks/DeviceNetworkingBenchmark.cs
index 16805c2684f..bb2a22312ea 100644
--- a/Content.Benchmarks/DeviceNetworkingBenchmark.cs
+++ b/Content.Benchmarks/DeviceNetworkingBenchmark.cs
@@ -4,8 +4,8 @@
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
 using Content.IntegrationTests.Tests.DeviceNetwork;
-using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Systems;
+using Content.Shared.DeviceNetwork;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
diff --git a/Content.Benchmarks/Program.cs b/Content.Benchmarks/Program.cs
index 0beb0a613d5..42a436597d5 100644
--- a/Content.Benchmarks/Program.cs
+++ b/Content.Benchmarks/Program.cs
@@ -18,11 +18,6 @@ internal static class Program
 
         public static void Main(string[] args)
         {
-            MainAsync(args).GetAwaiter().GetResult();
-        }
-
-        public static async Task MainAsync(string[] args)
-        {
 #if DEBUG
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine("\nWARNING: YOU ARE RUNNING A DEBUG BUILD, USE A RELEASE BUILD FOR AN ACCURATE BENCHMARK");
diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index 508f3404bac..2343b9eac15 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -101,7 +101,7 @@ private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, Ba
             component.ItemIconStyle = state.ItemIconStyle;
             component.Sound = state.Sound;
 
-            if (_playerManager.LocalPlayer?.ControlledEntity == component.AttachedEntity)
+            if (_playerManager.LocalEntity == component.AttachedEntity)
                 ActionsUpdated?.Invoke();
         }
 
@@ -111,7 +111,7 @@ protected override void UpdateAction(EntityUid? actionId, BaseActionComponent? a
                 return;
 
             base.UpdateAction(actionId, action);
-            if (_playerManager.LocalPlayer?.ControlledEntity != action.AttachedEntity)
+            if (_playerManager.LocalEntity != action.AttachedEntity)
                 return;
 
             ActionsUpdated?.Invoke();
@@ -144,7 +144,7 @@ private void HandleComponentState(EntityUid uid, ActionsComponent component, ref
                 _added.Add((actionId, action));
             }
 
-            if (_playerManager.LocalPlayer?.ControlledEntity != uid)
+            if (_playerManager.LocalEntity != uid)
                 return;
 
             foreach (var action in _removed)
@@ -177,7 +177,7 @@ public static int ActionComparer((EntityUid, BaseActionComponent?) a, (EntityUid
         protected override void ActionAdded(EntityUid performer, EntityUid actionId, ActionsComponent comp,
             BaseActionComponent action)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity != performer)
+            if (_playerManager.LocalEntity != performer)
                 return;
 
             OnActionAdded?.Invoke(actionId);
@@ -185,7 +185,7 @@ protected override void ActionAdded(EntityUid performer, EntityUid actionId, Act
 
         protected override void ActionRemoved(EntityUid performer, EntityUid actionId, ActionsComponent comp, BaseActionComponent action)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity != performer)
+            if (_playerManager.LocalEntity != performer)
                 return;
 
             OnActionRemoved?.Invoke(actionId);
@@ -193,7 +193,7 @@ protected override void ActionRemoved(EntityUid performer, EntityUid actionId, A
 
         public IEnumerable<(EntityUid Id, BaseActionComponent Comp)> GetClientActions()
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user)
+            if (_playerManager.LocalEntity is not { } user)
                 return Enumerable.Empty<(EntityUid, BaseActionComponent)>();
 
             return GetActions(user);
@@ -216,7 +216,7 @@ public void UnlinkAllActions()
 
         public void LinkAllActions(ActionsComponent? actions = null)
         {
-             if (_playerManager.LocalPlayer?.ControlledEntity is not { } user ||
+             if (_playerManager.LocalEntity is not { } user ||
                  !Resolve(user, ref actions, false))
              {
                  return;
@@ -233,7 +233,7 @@ public override void Shutdown()
 
         public void TriggerAction(EntityUid actionId, BaseActionComponent action)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user ||
+            if (_playerManager.LocalEntity is not { } user ||
                 !TryComp(user, out ActionsComponent? actions))
             {
                 return;
@@ -261,7 +261,7 @@ public void TriggerAction(EntityUid actionId, BaseActionComponent action)
         /// </summary>
         public void LoadActionAssignments(string path, bool userData)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user)
+            if (_playerManager.LocalEntity is not { } user)
                 return;
 
             var file = new ResPath(path).ToRootedPath();
diff --git a/Content.Client/Administration/Managers/ClientAdminManager.cs b/Content.Client/Administration/Managers/ClientAdminManager.cs
index 1a1366c6f2e..d33761be8f2 100644
--- a/Content.Client/Administration/Managers/ClientAdminManager.cs
+++ b/Content.Client/Administration/Managers/ClientAdminManager.cs
@@ -15,11 +15,13 @@ public sealed class ClientAdminManager : IClientAdminManager, IClientConGroupImp
         [Dependency] private readonly IClientNetManager _netMgr = default!;
         [Dependency] private readonly IClientConGroupController _conGroup = default!;
         [Dependency] private readonly IResourceManager _res = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
         private AdminData? _adminData;
         private readonly HashSet<string> _availableCommands = new();
 
         private readonly AdminCommandPermissions _localCommandPermissions = new();
+        private ISawmill _sawmill = default!;
 
         public event Action? AdminStatusUpdated;
 
@@ -92,17 +94,17 @@ private void UpdateMessageRx(MsgUpdateAdminStatus message)
             }
 
             _availableCommands.UnionWith(message.AvailableCommands);
-            Logger.DebugS("admin", $"Have {message.AvailableCommands.Length} commands available");
+            _sawmill.Debug($"Have {message.AvailableCommands.Length} commands available");
 
             _adminData = message.Admin;
             if (_adminData != null)
             {
                 var flagsText = string.Join("|", AdminFlagsHelper.FlagsToNames(_adminData.Flags));
-                Logger.InfoS("admin", $"Updated admin status: {_adminData.Active}/{_adminData.Title}/{flagsText}");
+                _sawmill.Info($"Updated admin status: {_adminData.Active}/{_adminData.Title}/{flagsText}");
             }
             else
             {
-                Logger.InfoS("admin", "Updated admin status: Not admin");
+                _sawmill.Info("Updated admin status: Not admin");
             }
 
             AdminStatusUpdated?.Invoke();
@@ -114,18 +116,17 @@ private void UpdateMessageRx(MsgUpdateAdminStatus message)
         void IPostInjectInit.PostInject()
         {
             _conGroup.Implementation = this;
+            _sawmill = _logManager.GetSawmill("admin");
         }
 
         public AdminData? GetAdminData(EntityUid uid, bool includeDeAdmin = false)
         {
-            return uid == _player.LocalPlayer?.ControlledEntity
-                ? _adminData
-                : null;
+            return uid == _player.LocalEntity ? _adminData : null;
         }
 
         public AdminData? GetAdminData(ICommonSession session, bool includeDeAdmin = false)
         {
-            if (_player.LocalPlayer?.UserId == session.UserId)
+            if (_player.LocalUser == session.UserId)
                 return _adminData;
 
             return null;
@@ -133,7 +134,7 @@ void IPostInjectInit.PostInject()
 
         public AdminData? GetAdminData(bool includeDeAdmin = false)
         {
-            if (_player.LocalPlayer is { Session: { } session })
+            if (_player.LocalSession is { } session)
                 return GetAdminData(session, includeDeAdmin);
 
             return null;
diff --git a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs
index 04219fe39b0..5f187cad794 100644
--- a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs
+++ b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs
@@ -99,7 +99,7 @@ private void SetLocation()
     {
         UpdateMapOptions();
 
-        if (!_entMan.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out TransformComponent? transform))
+        if (!_entMan.TryGetComponent(_playerManager.LocalEntity, out TransformComponent? transform))
             return;
 
         _pausePreview = true;
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
index 34611f51aff..97c84e5d2fc 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
@@ -42,7 +42,7 @@ private void Reset()
             var entManager = IoCManager.Resolve<IEntityManager>();
             var xformSystem = entManager.System<SharedTransformSystem>();
             var playerManager = IoCManager.Resolve<IPlayerManager>();
-            var player = playerManager.LocalPlayer?.ControlledEntity;
+            var player = playerManager.LocalEntity;
 
             var currentMap = MapId.Nullspace;
             var position = Vector2.Zero;
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
index 7e2fdda3e25..03fd52f446a 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
@@ -28,7 +28,7 @@ protected override void EnteredTree()
         {
             _data.Clear();
 
-            var player = _players.LocalPlayer?.ControlledEntity;
+            var player = _players.LocalEntity;
             var playerGrid = _entities.GetComponentOrNull<TransformComponent>(player)?.GridUid;
             var query = IoCManager.Resolve<IEntityManager>().AllEntityQueryEnumerator<MapGridComponent>();
 
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
index d273ea3e55a..c06d9161334 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
@@ -31,7 +31,7 @@ protected override void EnteredTree()
             while (gridQuery.MoveNext(out var uid, out _))
             {
                 _gridData.Add(entManager.GetNetEntity(uid));
-                var player = playerManager.LocalPlayer?.ControlledEntity;
+                var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
             }
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
index 276ec3d67df..3353d0873ef 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
@@ -34,7 +34,7 @@ protected override void EnteredTree()
 
             while (gridQuery.MoveNext(out var uid, out _))
             {
-                var player = playerManager.LocalPlayer?.ControlledEntity;
+                var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
                 _gridData.Add(entManager.GetNetEntity(uid));
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
index 850e43e4188..1183efb9b5b 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
@@ -30,7 +30,7 @@ protected override void EnteredTree()
 
             while (gridQuery.MoveNext(out var uid, out _))
             {
-                var player = playerManager.LocalPlayer?.ControlledEntity;
+                var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
                 _data.Add(entManager.GetNetEntity(uid));
diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs
index 83327ad77b5..ab296a96195 100644
--- a/Content.Client/Alerts/ClientAlertsSystem.cs
+++ b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -40,7 +40,7 @@ public IReadOnlyDictionary<AlertKey, AlertState>? ActiveAlerts
     {
         get
         {
-            var ent = _playerManager.LocalPlayer?.ControlledEntity;
+            var ent = _playerManager.LocalEntity;
             return ent is not null
                 ? GetActiveAlerts(ent.Value)
                 : null;
@@ -49,7 +49,7 @@ public IReadOnlyDictionary<AlertKey, AlertState>? ActiveAlerts
 
     protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity != alerts.Owner)
+        if (_playerManager.LocalEntity != alerts.Owner)
             return;
 
         SyncAlerts?.Invoke(this, alerts.Comp.Alerts);
@@ -57,7 +57,7 @@ protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
 
     protected override void AfterClearAlert(Entity<AlertsComponent> alertsComponent)
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity != alertsComponent.Owner)
+        if (_playerManager.LocalEntity != alertsComponent.Owner)
             return;
 
         SyncAlerts?.Invoke(this, alertsComponent.Comp.Alerts);
@@ -65,13 +65,13 @@ protected override void AfterClearAlert(Entity<AlertsComponent> alertsComponent)
 
     private void ClientAlertsHandleState(EntityUid uid, AlertsComponent component, ref AfterAutoHandleStateEvent args)
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity == uid)
+        if (_playerManager.LocalEntity == uid)
             SyncAlerts?.Invoke(this, component.Alerts);
     }
 
     private void OnPlayerAttached(EntityUid uid, AlertsComponent component, LocalPlayerAttachedEvent args)
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity != uid)
+        if (_playerManager.LocalEntity != uid)
             return;
 
         SyncAlerts?.Invoke(this, component.Alerts);
@@ -81,7 +81,7 @@ protected override void HandleComponentShutdown(EntityUid uid, AlertsComponent c
     {
         base.HandleComponentShutdown(uid, component, args);
 
-        if (_playerManager.LocalPlayer?.ControlledEntity != uid)
+        if (_playerManager.LocalEntity != uid)
             return;
 
         ClearAlerts?.Invoke(this, EventArgs.Empty);
diff --git a/Content.Client/Animations/EntityPickupAnimationSystem.cs b/Content.Client/Animations/EntityPickupAnimationSystem.cs
index 2ac51e6eba0..abeac664c75 100644
--- a/Content.Client/Animations/EntityPickupAnimationSystem.cs
+++ b/Content.Client/Animations/EntityPickupAnimationSystem.cs
@@ -65,7 +65,7 @@ public void AnimateEntityPickup(EntityUid uid, EntityCoordinates initial, Vector
         despawn.Lifetime = 0.25f;
         _transform.SetLocalRotationNoLerp(animatableClone, initialAngle);
 
-        _animations.Play(animatableClone, animations, new Animation
+        _animations.Play(new Entity<AnimationPlayerComponent>(animatableClone, animations), new Animation
         {
             Length = TimeSpan.FromMilliseconds(125),
             AnimationTracks =
diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
index ca8682e72d6..08438e2a1b2 100644
--- a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
+++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
@@ -11,7 +11,6 @@ namespace Content.Client.Anomaly.Ui;
 [GenerateTypedNameReferences]
 public sealed partial class AnomalyGeneratorWindow : FancyWindow
 {
-    [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
     private TimeSpan _cooldownEnd = TimeSpan.Zero;
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
index de26eb5f195..43be67c9d6b 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
@@ -22,7 +22,6 @@ public sealed partial class AirAlarmWindow : FancyWindow
     public event Action<string, AtmosMonitorThresholdType, AtmosAlarmThreshold, Gas?>? AtmosAlarmThresholdChanged;
     public event Action<AirAlarmMode>? AirAlarmModeChanged;
     public event Action<bool>? AutoModeChanged;
-    public event Action<string>? ResyncDeviceRequested;
     public event Action? ResyncAllRequested;
     public event Action<AirAlarmTab>? AirAlarmTabChange;
 
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml
index 38851273846..0d5e741d0f6 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml
@@ -2,6 +2,6 @@
     HorizontalExpand="True" Orientation="Vertical"
             Margin = "20 0 0 0" MinSize="160 0" >
     <Label Name="CBoundLabel" HorizontalAlignment="Center" />
-    <CheckBox Name="CBoundEnabled" HorizontalAlignment="Center" Text="{Loc 'Enable'}"/>
+    <CheckBox Name="CBoundEnabled" HorizontalAlignment="Center" Text="{Loc 'Enable'}" Pressed="True" />
     <FloatSpinBox Name="CSpinner" />
 </BoxContainer>
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
index da63db77d34..3612d84de4c 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
@@ -72,7 +72,6 @@ public ThresholdBoundControl(string controlLabel, float value, float uiValueScal
         CBoundLabel.Text = controlLabel;
 
         CSpinner.Value = ScaledValue;
-        CBoundEnabled.Pressed = _value != null;
 
         CSpinner.OnValueChanged += SpinnerValueChanged;
         CBoundEnabled.OnToggled += CheckboxToggled;
diff --git a/Content.Client/Audio/AmbientSoundSystem.cs b/Content.Client/Audio/AmbientSoundSystem.cs
index d39073fa330..9d30cabb1ec 100644
--- a/Content.Client/Audio/AmbientSoundSystem.cs
+++ b/Content.Client/Audio/AmbientSoundSystem.cs
@@ -99,10 +99,10 @@ public override void Initialize()
         UpdatesOutsidePrediction = true;
         UpdatesAfter.Add(typeof(AmbientSoundTreeSystem));
 
-        _cfg.OnValueChanged(CCVars.AmbientCooldown, SetCooldown, true);
-        _cfg.OnValueChanged(CCVars.MaxAmbientSources, SetAmbientCount, true);
-        _cfg.OnValueChanged(CCVars.AmbientRange, SetAmbientRange, true);
-        _cfg.OnValueChanged(CCVars.AmbienceVolume, SetAmbienceGain, true);
+        Subs.CVar(_cfg, CCVars.AmbientCooldown, SetCooldown, true);
+        Subs.CVar(_cfg, CCVars.MaxAmbientSources, SetAmbientCount, true);
+        Subs.CVar(_cfg, CCVars.AmbientRange, SetAmbientRange, true);
+        Subs.CVar(_cfg, CCVars.AmbienceVolume, SetAmbienceGain, true);
         SubscribeLocalEvent<AmbientSoundComponent, ComponentShutdown>(OnShutdown);
     }
 
@@ -138,11 +138,6 @@ public override void Shutdown()
     {
         base.Shutdown();
         ClearSounds();
-
-        _cfg.UnsubValueChanged(CCVars.AmbientCooldown, SetCooldown);
-        _cfg.UnsubValueChanged(CCVars.MaxAmbientSources, SetAmbientCount);
-        _cfg.UnsubValueChanged(CCVars.AmbientRange, SetAmbientRange);
-        _cfg.UnsubValueChanged(CCVars.AmbienceVolume, SetAmbienceGain);
     }
 
     private int PlayingCount(string countSound)
diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs
index 29279830627..702f810e27c 100644
--- a/Content.Client/Audio/BackgroundAudioSystem.cs
+++ b/Content.Client/Audio/BackgroundAudioSystem.cs
@@ -34,8 +34,8 @@ public override void Initialize()
     {
         base.Initialize();
 
-        _configManager.OnValueChanged(CCVars.LobbyMusicEnabled, LobbyMusicCVarChanged);
-        _configManager.OnValueChanged(CCVars.LobbyMusicVolume, LobbyMusicVolumeCVarChanged);
+        Subs.CVar(_configManager, CCVars.LobbyMusicEnabled, LobbyMusicCVarChanged);
+        Subs.CVar(_configManager, CCVars.LobbyMusicVolume, LobbyMusicVolumeCVarChanged);
 
         _stateManager.OnStateChanged += StateManagerOnStateChanged;
 
@@ -50,9 +50,6 @@ public override void Shutdown()
     {
         base.Shutdown();
 
-        _configManager.UnsubValueChanged(CCVars.LobbyMusicEnabled, LobbyMusicCVarChanged);
-        _configManager.UnsubValueChanged(CCVars.LobbyMusicVolume, LobbyMusicVolumeCVarChanged);
-
         _stateManager.OnStateChanged -= StateManagerOnStateChanged;
 
         _client.PlayerLeaveServer -= OnLeave;
diff --git a/Content.Client/Audio/ClientGlobalSoundSystem.cs b/Content.Client/Audio/ClientGlobalSoundSystem.cs
index 1d98564090a..7c77865f741 100644
--- a/Content.Client/Audio/ClientGlobalSoundSystem.cs
+++ b/Content.Client/Audio/ClientGlobalSoundSystem.cs
@@ -26,11 +26,11 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
         SubscribeNetworkEvent<AdminSoundEvent>(PlayAdminSound);
-        _cfg.OnValueChanged(CCVars.AdminSoundsEnabled, ToggleAdminSound, true);
+        Subs.CVar(_cfg, CCVars.AdminSoundsEnabled, ToggleAdminSound, true);
 
         SubscribeNetworkEvent<StationEventMusicEvent>(PlayStationEventMusic);
         SubscribeNetworkEvent<StopStationEventMusic>(StopStationEventMusic);
-        _cfg.OnValueChanged(CCVars.EventMusicEnabled, ToggleStationEventMusic, true);
+        Subs.CVar(_cfg, CCVars.EventMusicEnabled, ToggleStationEventMusic, true);
 
         SubscribeNetworkEvent<GameGlobalSoundEvent>(PlayGameSound);
     }
diff --git a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs
index 89324f22252..84b787a4ec9 100644
--- a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs
+++ b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs
@@ -59,7 +59,7 @@ public sealed partial class ContentAudioSystem
 
     private void InitializeAmbientMusic()
     {
-        _configManager.OnValueChanged(CCVars.AmbientMusicVolume, AmbienceCVarChanged, true);
+        Subs.CVar(_configManager, CCVars.AmbientMusicVolume, AmbienceCVarChanged, true);
         _sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("audio.ambience");
 
         // Reset audio
@@ -84,7 +84,6 @@ private void AmbienceCVarChanged(float obj)
 
     private void ShutdownAmbientMusic()
     {
-        _configManager.UnsubValueChanged(CCVars.AmbientMusicVolume, AmbienceCVarChanged);
         _state.OnStateChanged -= OnStateChange;
         _ambientMusicStream = _audio.Stop(_ambientMusicStream);
     }
@@ -229,7 +228,7 @@ private void UpdateAmbientMusic()
 
     private AmbientMusicPrototype? GetAmbience()
     {
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
 
         if (player == null)
             return null;
diff --git a/Content.Client/Audio/ContentAudioSystem.cs b/Content.Client/Audio/ContentAudioSystem.cs
index c81e0a44f10..56921ee4301 100644
--- a/Content.Client/Audio/ContentAudioSystem.cs
+++ b/Content.Client/Audio/ContentAudioSystem.cs
@@ -1,18 +1,11 @@
 using Content.Shared.Audio;
 using Content.Shared.GameTicking;
-using Robust.Client.Audio;
-using Robust.Client.ResourceManagement;
-using Robust.Client.UserInterface;
 using AudioComponent = Robust.Shared.Audio.Components.AudioComponent;
 
 namespace Content.Client.Audio;
 
 public sealed partial class ContentAudioSystem : SharedContentAudioSystem
 {
-    [Dependency] private readonly IAudioManager _audioManager = default!;
-    [Dependency] private readonly IResourceCache _cache = default!;
-    [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
-
     // Need how much volume to change per tick and just remove it when it drops below "0"
     private readonly Dictionary<EntityUid, float> _fadingOut = new();
 
diff --git a/Content.Client/Camera/CameraRecoilSystem.cs b/Content.Client/Camera/CameraRecoilSystem.cs
index bb419b465d3..3e04cd5bf19 100644
--- a/Content.Client/Camera/CameraRecoilSystem.cs
+++ b/Content.Client/Camera/CameraRecoilSystem.cs
@@ -9,26 +9,19 @@ public sealed class CameraRecoilSystem : SharedCameraRecoilSystem
 {
     [Dependency] private readonly IConfigurationManager _configManager = default!;
 
-    protected float Intensity;
+    private float _intensity;
 
     public override void Initialize()
     {
         base.Initialize();
         SubscribeNetworkEvent<CameraKickEvent>(OnCameraKick);
 
-        _configManager.OnValueChanged(CCVars.ScreenShakeIntensity, OnCvarChanged, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _configManager.UnsubValueChanged(CCVars.ScreenShakeIntensity, OnCvarChanged);
+        Subs.CVar(_configManager, CCVars.ScreenShakeIntensity, OnCvarChanged, true);
     }
 
     private void OnCvarChanged(float value)
     {
-        Intensity = value;
+        _intensity = value;
     }
 
     private void OnCameraKick(CameraKickEvent ev)
@@ -38,13 +31,13 @@ private void OnCameraKick(CameraKickEvent ev)
 
     public override void KickCamera(EntityUid uid, Vector2 recoil, CameraRecoilComponent? component = null)
     {
-        if (Intensity == 0)
+        if (_intensity == 0)
             return;
 
         if (!Resolve(uid, ref component, false))
             return;
 
-        recoil *= Intensity;
+        recoil *= _intensity;
 
         // Use really bad math to "dampen" kicks when we're already kicked.
         var existing = component.CurrentKick.Length();
diff --git a/Content.Client/CardboardBox/CardboardBoxSystem.cs b/Content.Client/CardboardBox/CardboardBoxSystem.cs
index 5e479409cf9..50f9de239d5 100644
--- a/Content.Client/CardboardBox/CardboardBoxSystem.cs
+++ b/Content.Client/CardboardBox/CardboardBoxSystem.cs
@@ -10,6 +10,7 @@ namespace Content.Client.CardboardBox;
 public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     public override void Initialize()
     {
@@ -29,7 +30,7 @@ private void OnBoxEffect(PlayBoxEffectMessage msg)
         if (!xformQuery.TryGetComponent(source, out var xform))
             return;
 
-        var sourcePos = xform.MapPosition;
+        var sourcePos = _transform.GetMapCoordinates(source, xform);
 
         //Any mob that can move should be surprised?
         //God mind rework needs to come faster so it can just check for mind
@@ -53,16 +54,17 @@ private void OnBoxEffect(PlayBoxEffectMessage msg)
         //Play the effect for the mobs as long as they can see the box and are in range.
         foreach (var mob in mobMoverEntities)
         {
-            if (!xformQuery.TryGetComponent(mob, out var moverTransform) || !ExamineSystemShared.InRangeUnOccluded(sourcePos, moverTransform.MapPosition, box.Distance, null))
+            var mapPos = _transform.GetMapCoordinates(mob);
+            if (!ExamineSystemShared.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null))
                 continue;
 
-            var ent = Spawn(box.Effect, moverTransform.MapPosition);
+            var ent = Spawn(box.Effect, mapPos);
 
             if (!xformQuery.TryGetComponent(ent, out var entTransform) || !TryComp<SpriteComponent>(ent, out var sprite))
                 continue;
 
             sprite.Offset = new Vector2(0, 1);
-            entTransform.AttachParent(mob);
+            _transform.SetParent(ent, entTransform, mob);
         }
 
     }
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml.cs b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
index 05c5673dddf..1fc8a4986a2 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml.cs
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
@@ -12,7 +12,6 @@ namespace Content.Client.Cargo.UI;
 [GenerateTypedNameReferences]
 public sealed partial class BountyEntry : BoxContainer
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     public Action? OnButtonPressed;
diff --git a/Content.Client/Changelog/ChangelogManager.cs b/Content.Client/Changelog/ChangelogManager.cs
index d62ce17f0e9..2b056e885b0 100644
--- a/Content.Client/Changelog/ChangelogManager.cs
+++ b/Content.Client/Changelog/ChangelogManager.cs
@@ -5,7 +5,6 @@
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
@@ -169,7 +168,7 @@ public sealed partial class Changelog
         }
 
         [DataDefinition]
-        public sealed partial class ChangelogEntry : ISerializationHooks
+        public sealed partial class ChangelogEntry
         {
             [DataField("id")]
             public int Id { get; private set; }
@@ -177,17 +176,11 @@ public sealed partial class ChangelogEntry : ISerializationHooks
             [DataField("author")]
             public string Author { get; private set; } = "";
 
-            [DataField("time")] private string _time = default!;
-
+            [DataField]
             public DateTime Time { get; private set; }
 
             [DataField("changes")]
             public List<ChangelogChange> Changes { get; private set; } = default!;
-
-            void ISerializationHooks.AfterDeserialization()
-            {
-                Time = DateTime.Parse(_time, null, DateTimeStyles.RoundtripKind);
-            }
         }
 
         [DataDefinition]
diff --git a/Content.Client/CharacterInfo/CharacterInfoSystem.cs b/Content.Client/CharacterInfo/CharacterInfoSystem.cs
index 844a352a184..aeaa48c6f2d 100644
--- a/Content.Client/CharacterInfo/CharacterInfoSystem.cs
+++ b/Content.Client/CharacterInfo/CharacterInfoSystem.cs
@@ -20,7 +20,7 @@ public override void Initialize()
 
     public void RequestCharacterInfo()
     {
-        var entity = _players.LocalPlayer?.ControlledEntity;
+        var entity = _players.LocalEntity;
         if (entity == null)
         {
             return;
diff --git a/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs b/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
index 0eea36aa573..844f793fc49 100644
--- a/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
+++ b/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
@@ -20,7 +20,8 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
     public override void Initialize()
     {
         base.Initialize();
-        _cfg.OnValueChanged(CCVars.ChatShowTypingIndicator, OnShowTypingChanged);
+
+        Subs.CVar(_cfg, CCVars.ChatShowTypingIndicator, OnShowTypingChanged);
     }
 
     public void ClientChangedChatText()
@@ -67,7 +68,7 @@ private void ClientUpdateTyping(bool isClientTyping)
         _isClientTyping = isClientTyping;
 
         // check if player controls any pawn
-        if (_playerManager.LocalPlayer?.ControlledEntity == null)
+        if (_playerManager.LocalEntity == null)
             return;
 
         // send a networked event to server
diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs
index 91e8e5a90f0..82eccbcec84 100644
--- a/Content.Client/Chat/UI/SpeechBubble.cs
+++ b/Content.Client/Chat/UI/SpeechBubble.cs
@@ -182,20 +182,9 @@ protected FormattedMessage FormatSpeech(string message, Color? fontColor = null)
             return msg;
         }
 
-        protected string ExtractSpeechSubstring(ChatMessage message, string tag)
-        {
-            var rawmsg = message.WrappedMessage;
-            var tagStart = rawmsg.IndexOf($"[{tag}]");
-            var tagEnd = rawmsg.IndexOf($"[/{tag}]");
-            if (tagStart < 0 || tagEnd < 0) //the above return -1 if the tag's not found, which in turn will cause the below to throw an exception. a blank speech bubble is far more noticeably broken than the bubble not appearing at all -bhijn
-                return "";
-            tagStart += tag.Length + 2;
-            return rawmsg.Substring(tagStart, tagEnd - tagStart);
-        }
-
         protected FormattedMessage ExtractAndFormatSpeechSubstring(ChatMessage message, string tag, Color? fontColor = null)
         {
-            return FormatSpeech(ExtractSpeechSubstring(message, tag), fontColor);
+            return FormatSpeech(SharedChatSystem.GetStringInsideTag(message, tag), fontColor);
         }
 
     }
diff --git a/Content.Client/Chemistry/Components/InjectorComponent.cs b/Content.Client/Chemistry/Components/InjectorComponent.cs
deleted file mode 100644
index 4d10517a11e..00000000000
--- a/Content.Client/Chemistry/Components/InjectorComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.FixedPoint;
-
-namespace Content.Client.Chemistry.Components
-{
-    /// <summary>
-    /// Client behavior for injectors & syringes. Used for item status on injectors
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class InjectorComponent : SharedInjectorComponent
-    {
-        [ViewVariables]
-        public FixedPoint2 CurrentVolume;
-        [ViewVariables]
-        public FixedPoint2 TotalVolume;
-        [ViewVariables]
-        public InjectorToggleMode CurrentMode;
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool UiUpdateNeeded;
-    }
-}
diff --git a/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
index 896349a1614..12eb7f3d14d 100644
--- a/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
@@ -2,34 +2,21 @@
 using Content.Client.Chemistry.UI;
 using Content.Client.Items;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.GameStates;
 
 namespace Content.Client.Chemistry.EntitySystems;
 
-public sealed class InjectorSystem : EntitySystem
+public sealed class InjectorSystem : SharedInjectorSystem
 {
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<InjectorComponent, ComponentHandleState>(OnHandleInjectorState);
-        Subs.ItemStatus<InjectorComponent>(ent => new InjectorStatusControl(ent));
+        Subs.ItemStatus<InjectorComponent>(ent => new InjectorStatusControl(ent, SolutionContainers));
         SubscribeLocalEvent<HyposprayComponent, ComponentHandleState>(OnHandleHyposprayState);
         Subs.ItemStatus<HyposprayComponent>(ent => new HyposprayStatusControl(ent));
     }
 
-    private void OnHandleInjectorState(EntityUid uid, InjectorComponent component, ref ComponentHandleState args)
-    {
-        if (args.Current is not SharedInjectorComponent.InjectorComponentState state)
-        {
-            return;
-        }
-
-        component.CurrentVolume = state.CurrentVolume;
-        component.TotalVolume = state.TotalVolume;
-        component.CurrentMode = state.CurrentMode;
-        component.UiUpdateNeeded = true;
-    }
-
     private void OnHandleHyposprayState(EntityUid uid, HyposprayComponent component, ref ComponentHandleState args)
     {
         if (args.Current is not HyposprayComponentState cState)
diff --git a/Content.Client/Chemistry/UI/InjectorStatusControl.cs b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
index f7723201686..979e9ea6455 100644
--- a/Content.Client/Chemistry/UI/InjectorStatusControl.cs
+++ b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
@@ -1,7 +1,7 @@
-using Content.Client.Chemistry.Components;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
@@ -10,40 +10,37 @@ namespace Content.Client.Chemistry.UI;
 
 public sealed class InjectorStatusControl : Control
 {
-    private readonly InjectorComponent _parent;
+    private readonly Entity<InjectorComponent> _parent;
+    private readonly SharedSolutionContainerSystem _solutionContainers;
     private readonly RichTextLabel _label;
 
-    public InjectorStatusControl(InjectorComponent parent)
+    public InjectorStatusControl(Entity<InjectorComponent> parent, SharedSolutionContainerSystem solutionContainers)
     {
         _parent = parent;
+        _solutionContainers = solutionContainers;
         _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
         AddChild(_label);
-
-        Update();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
-        if (!_parent.UiUpdateNeeded)
-            return;
-        Update();
-    }
 
-    public void Update()
-    {
-        _parent.UiUpdateNeeded = false;
+        if (!_solutionContainers.TryGetSolution(_parent.Owner, InjectorComponent.SolutionName, out _, out var solution))
+            return;
 
-        //Update current volume and injector state
-        var modeStringLocalized = _parent.CurrentMode switch
+        // Update current volume and injector state
+        var modeStringLocalized = Loc.GetString(_parent.Comp.ToggleState switch
         {
-            SharedInjectorComponent.InjectorToggleMode.Draw => Loc.GetString("injector-draw-text"),
-            SharedInjectorComponent.InjectorToggleMode.Inject => Loc.GetString("injector-inject-text"),
-            _ => Loc.GetString("injector-invalid-injector-toggle-mode")
-        };
+            InjectorToggleMode.Draw => "injector-draw-text",
+            InjectorToggleMode.Inject => "injector-inject-text",
+            _ => "injector-invalid-injector-toggle-mode"
+        });
+
         _label.SetMarkup(Loc.GetString("injector-volume-label",
-            ("currentVolume", _parent.CurrentVolume),
-            ("totalVolume", _parent.TotalVolume),
-            ("modeString", modeStringLocalized)));
+            ("currentVolume", solution.Volume),
+            ("totalVolume", solution.MaxVolume),
+            ("modeString", modeStringLocalized),
+            ("transferVolume", _parent.Comp.TransferAmount)));
     }
 }
diff --git a/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs b/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs
index b71f1a282f2..a14ce138743 100644
--- a/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs
+++ b/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs
@@ -7,7 +7,7 @@
 namespace Content.Client.CloningConsole.UI
 {
     [GenerateTypedNameReferences]
-    public partial class CloningConsoleWindow : DefaultWindow
+    public sealed partial class CloningConsoleWindow : DefaultWindow
     {
         public CloningConsoleWindow()
         {
diff --git a/Content.Client/CombatMode/CombatModeSystem.cs b/Content.Client/CombatMode/CombatModeSystem.cs
index 34ae0b1338b..2c938b1b937 100644
--- a/Content.Client/CombatMode/CombatModeSystem.cs
+++ b/Content.Client/CombatMode/CombatModeSystem.cs
@@ -28,7 +28,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<CombatModeComponent, AfterAutoHandleStateEvent>(OnHandleState);
 
-        _cfg.OnValueChanged(CCVars.CombatModeIndicatorsPointShow, OnShowCombatIndicatorsChanged, true);
+        Subs.CVar(_cfg, CCVars.CombatModeIndicatorsPointShow, OnShowCombatIndicatorsChanged, true);
     }
 
     private void OnHandleState(EntityUid uid, CombatModeComponent component, ref AfterAutoHandleStateEvent args)
@@ -38,7 +38,6 @@ private void OnHandleState(EntityUid uid, CombatModeComponent component, ref Aft
 
     public override void Shutdown()
     {
-        _cfg.UnsubValueChanged(CCVars.CombatModeIndicatorsPointShow, OnShowCombatIndicatorsChanged);
         _overlayManager.RemoveOverlay<CombatModeIndicatorsOverlay>();
 
         base.Shutdown();
@@ -46,7 +45,7 @@ public override void Shutdown()
 
     public bool IsInCombatMode()
     {
-        var entity = _playerManager.LocalPlayer?.ControlledEntity;
+        var entity = _playerManager.LocalEntity;
 
         if (entity == null)
             return false;
@@ -67,7 +66,7 @@ protected override bool IsNpc(EntityUid uid)
 
     private void UpdateHud(EntityUid entity)
     {
-        if (entity != _playerManager.LocalPlayer?.ControlledEntity || !Timing.IsFirstTimePredicted)
+        if (entity != _playerManager.LocalEntity || !Timing.IsFirstTimePredicted)
         {
             return;
         }
diff --git a/Content.Client/Commands/DebugPathfindingCommand.cs b/Content.Client/Commands/DebugPathfindingCommand.cs
index e02b6dcbbda..b920ccc5edf 100644
--- a/Content.Client/Commands/DebugPathfindingCommand.cs
+++ b/Content.Client/Commands/DebugPathfindingCommand.cs
@@ -38,7 +38,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
         }
     }
 
-    public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     {
         if (args.Length > 1)
         {
diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs
index 940538670c0..ae1724c3bf6 100644
--- a/Content.Client/Construction/ConstructionSystem.cs
+++ b/Content.Client/Construction/ConstructionSystem.cs
@@ -185,7 +185,7 @@ public bool TrySpawnGhost(
             [NotNullWhen(true)] out EntityUid? ghost)
         {
             ghost = null;
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user ||
+            if (_playerManager.LocalEntity is not { } user ||
                 !user.IsValid())
             {
                 return false;
diff --git a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
index 039c03601ad..ae1b3ec3bf0 100644
--- a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
@@ -148,7 +148,7 @@ public void OnKeyBindDown(ContextMenuElement element, GUIBoundKeyEventArgs args)
                     Uid = entity.Value,
                 };
 
-                var session = _playerManager.LocalPlayer?.Session;
+                var session = _playerManager.LocalSession;
                 if (session != null)
                 {
                     inputSys.HandleInputCommand(session, func, message);
@@ -189,7 +189,7 @@ public override void FrameUpdate(FrameEventArgs args)
             if (!_context.RootMenu.Visible)
                 return;
 
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } player ||
+            if (_playerManager.LocalEntity is not { } player ||
                 !player.IsValid())
                 return;
 
diff --git a/Content.Client/Damage/DamageVisualsSystem.cs b/Content.Client/Damage/DamageVisualsSystem.cs
index 718d4731823..e275f13f935 100644
--- a/Content.Client/Damage/DamageVisualsSystem.cs
+++ b/Content.Client/Damage/DamageVisualsSystem.cs
@@ -28,8 +28,6 @@ public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponen
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-    private const string SawmillName = "DamageVisuals";
-
     public override void Initialize()
     {
         base.Initialize();
@@ -54,14 +52,14 @@ private void VerifyVisualizerSetup(EntityUid entity, DamageVisualsComponent dama
     {
         if (damageVisComp.Thresholds.Count < 1)
         {
-            Logger.ErrorS(SawmillName, $"ThresholdsLookup were invalid for entity {entity}. ThresholdsLookup: {damageVisComp.Thresholds}");
+            Log.Error($"ThresholdsLookup were invalid for entity {entity}. ThresholdsLookup: {damageVisComp.Thresholds}");
             damageVisComp.Valid = false;
             return;
         }
 
         if (damageVisComp.Divisor == 0)
         {
-            Logger.ErrorS(SawmillName, $"Divisor for {entity} is set to zero.");
+            Log.Error($"Divisor for {entity} is set to zero.");
             damageVisComp.Valid = false;
             return;
         }
@@ -70,21 +68,21 @@ private void VerifyVisualizerSetup(EntityUid entity, DamageVisualsComponent dama
         {
             if (damageVisComp.DamageOverlayGroups == null && damageVisComp.DamageOverlay == null)
             {
-                Logger.ErrorS(SawmillName, $"Enabled overlay without defined damage overlay sprites on {entity}.");
+                Log.Error($"Enabled overlay without defined damage overlay sprites on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
 
             if (damageVisComp.TrackAllDamage && damageVisComp.DamageOverlay == null)
             {
-                Logger.ErrorS(SawmillName, $"Enabled all damage tracking without a damage overlay sprite on {entity}.");
+                Log.Error($"Enabled all damage tracking without a damage overlay sprite on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
 
             if (!damageVisComp.TrackAllDamage && damageVisComp.DamageOverlay != null)
             {
-                Logger.WarningS(SawmillName, $"Disabled all damage tracking with a damage overlay sprite on {entity}.");
+                Log.Warning($"Disabled all damage tracking with a damage overlay sprite on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
@@ -92,7 +90,7 @@ private void VerifyVisualizerSetup(EntityUid entity, DamageVisualsComponent dama
 
             if (damageVisComp.TrackAllDamage && damageVisComp.DamageOverlayGroups != null)
             {
-                Logger.WarningS(SawmillName, $"Enabled all damage tracking with damage overlay groups on {entity}.");
+                Log.Warning($"Enabled all damage tracking with damage overlay groups on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
@@ -101,21 +99,21 @@ private void VerifyVisualizerSetup(EntityUid entity, DamageVisualsComponent dama
         {
             if (damageVisComp.TargetLayers == null)
             {
-                Logger.ErrorS(SawmillName, $"Disabled overlay without target layers on {entity}.");
+                Log.Error($"Disabled overlay without target layers on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
 
             if (damageVisComp.DamageOverlayGroups != null || damageVisComp.DamageOverlay != null)
             {
-                Logger.ErrorS(SawmillName, $"Disabled overlay with defined damage overlay sprites on {entity}.");
+                Log.Error($"Disabled overlay with defined damage overlay sprites on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
 
             if (damageVisComp.DamageGroup == null)
             {
-                Logger.ErrorS(SawmillName, $"Disabled overlay without defined damage group on {entity}.");
+                Log.Error($"Disabled overlay without defined damage group on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
@@ -123,12 +121,12 @@ private void VerifyVisualizerSetup(EntityUid entity, DamageVisualsComponent dama
 
         if (damageVisComp.DamageOverlayGroups != null && damageVisComp.DamageGroup != null)
         {
-            Logger.WarningS(SawmillName, $"Damage overlay sprites and damage group are both defined on {entity}.");
+            Log.Warning($"Damage overlay sprites and damage group are both defined on {entity}.");
         }
 
         if (damageVisComp.DamageOverlay != null && damageVisComp.DamageGroup != null)
         {
-            Logger.WarningS(SawmillName, $"Damage overlay sprites and damage group are both defined on {entity}.");
+            Log.Warning($"Damage overlay sprites and damage group are both defined on {entity}.");
         }
     }
 
@@ -144,7 +142,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
 
         if (damageVisComp.Thresholds[0] != 0)
         {
-            Logger.ErrorS(SawmillName, $"ThresholdsLookup were invalid for entity {entity}. ThresholdsLookup: {damageVisComp.Thresholds}");
+            Log.Error($"ThresholdsLookup were invalid for entity {entity}. ThresholdsLookup: {damageVisComp.Thresholds}");
             damageVisComp.Valid = false;
             return;
         }
@@ -163,7 +161,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
                 {
                     if (!damageContainer.SupportedGroups.Contains(damageType))
                     {
-                        Logger.ErrorS(SawmillName, $"Damage key {damageType} was invalid for entity {entity}.");
+                        Log.Error($"Damage key {damageType} was invalid for entity {entity}.");
                         damageVisComp.Valid = false;
                         return;
                     }
@@ -177,7 +175,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
             {
                 if (!damageContainer.SupportedGroups.Contains(damageVisComp.DamageGroup))
                 {
-                    Logger.ErrorS(SawmillName, $"Damage keys were invalid for entity {entity}.");
+                    Log.Error($"Damage keys were invalid for entity {entity}.");
                     damageVisComp.Valid = false;
                     return;
                 }
@@ -197,7 +195,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
                 {
                     if (!damagePrototypeIdList.Contains(damageType))
                     {
-                        Logger.ErrorS(SawmillName, $"Damage keys were invalid for entity {entity}.");
+                        Log.Error($"Damage keys were invalid for entity {entity}.");
                         damageVisComp.Valid = false;
                         return;
                     }
@@ -208,7 +206,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
             {
                 if (!damagePrototypeIdList.Contains(damageVisComp.DamageGroup))
                 {
-                    Logger.ErrorS(SawmillName, $"Damage keys were invalid for entity {entity}.");
+                    Log.Error($"Damage keys were invalid for entity {entity}.");
                     damageVisComp.Valid = false;
                     return;
                 }
@@ -232,7 +230,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
             {
                 if (!spriteComponent.LayerMapTryGet(key, out var index))
                 {
-                    Logger.WarningS(SawmillName, $"Layer at key {key} was invalid for entity {entity}.");
+                    Log.Warning($"Layer at key {key} was invalid for entity {entity}.");
                     continue;
                 }
 
@@ -244,7 +242,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
             // invalidate the visualizer without crashing.
             if (damageVisComp.TargetLayerMapKeys.Count == 0)
             {
-                Logger.ErrorS(SawmillName, $"Target layers were invalid for entity {entity}.");
+                Log.Error($"Target layers were invalid for entity {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
diff --git a/Content.Client/Decals/Overlays/DecalOverlay.cs b/Content.Client/Decals/Overlays/DecalOverlay.cs
index 60b24c154b5..8eb1a256645 100644
--- a/Content.Client/Decals/Overlays/DecalOverlay.cs
+++ b/Content.Client/Decals/Overlays/DecalOverlay.cs
@@ -59,8 +59,14 @@ protected override void Draw(in OverlayDrawArgs args)
             {
                 foreach (var decal in decals.Values)
                 {
-                    if (!_cachedTextures.TryGetValue(decal.Id, out var cache) && _prototypeManager.TryIndex<DecalPrototype>(decal.Id, out var decalProto))
+                    if (!_cachedTextures.TryGetValue(decal.Id, out var cache))
                     {
+                        // Nothing to cache someone messed up
+                        if (!_prototypeManager.TryIndex<DecalPrototype>(decal.Id, out var decalProto))
+                        {
+                            continue;
+                        }
+
                         cache = (_sprites.Frame0(decalProto.Sprite), decalProto.SnapCardinals);
                         _cachedTextures[decal.Id] = cache;
                     }
diff --git a/Content.Client/DeviceLinking/DeviceLinkSystem.cs b/Content.Client/DeviceLinking/DeviceLinkSystem.cs
new file mode 100644
index 00000000000..3356e346f6a
--- /dev/null
+++ b/Content.Client/DeviceLinking/DeviceLinkSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.DeviceLinking;
+
+namespace Content.Client.DeviceLinking;
+
+public sealed class DeviceLinkSystem : SharedDeviceLinkSystem
+{
+
+}
diff --git a/Content.Client/DoAfter/DoAfterSystem.cs b/Content.Client/DoAfter/DoAfterSystem.cs
index 38e1a714aca..b00904a1fef 100644
--- a/Content.Client/DoAfter/DoAfterSystem.cs
+++ b/Content.Client/DoAfter/DoAfterSystem.cs
@@ -38,7 +38,7 @@ public override void Update(float frameTime)
         // ones that depend on the target not moving, because the cancellation of those do afters should be readily
         // predictable by clients.
 
-        var playerEntity = _player.LocalPlayer?.ControlledEntity;
+        var playerEntity = _player.LocalEntity;
 
         if (!TryComp(playerEntity, out ActiveDoAfterComponent? active))
             return;
@@ -69,7 +69,7 @@ public bool TryFindActiveDoAfter<T>(
         out float progress)
         where T : DoAfterEvent
     {
-        var playerEntity = _player.LocalPlayer?.ControlledEntity;
+        var playerEntity = _player.LocalEntity;
 
         doAfter = null;
         @event = null;
diff --git a/Content.Client/Doors/FirelockSystem.cs b/Content.Client/Doors/FirelockSystem.cs
index d4331fd15dc..cfd84a47133 100644
--- a/Content.Client/Doors/FirelockSystem.cs
+++ b/Content.Client/Doors/FirelockSystem.cs
@@ -5,7 +5,7 @@ namespace Content.Client.Doors;
 
 public sealed class FirelockSystem : EntitySystem
 {
-    [Dependency] protected readonly SharedAppearanceSystem _appearanceSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Client/Drugs/DrugOverlaySystem.cs b/Content.Client/Drugs/DrugOverlaySystem.cs
index 3c42033be6c..9bfa4fdf827 100644
--- a/Content.Client/Drugs/DrugOverlaySystem.cs
+++ b/Content.Client/Drugs/DrugOverlaySystem.cs
@@ -43,13 +43,13 @@ private void OnPlayerDetached(EntityUid uid, SeeingRainbowsComponent component,
 
     private void OnInit(EntityUid uid, SeeingRainbowsComponent component, ComponentInit args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
             _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnShutdown(EntityUid uid, SeeingRainbowsComponent component, ComponentShutdown args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
         {
             _overlay.Intoxication = 0;
             _overlayMan.RemoveOverlay(_overlay);
diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs
index 8372f7ea600..6ef5d0f65ce 100644
--- a/Content.Client/Drugs/RainbowOverlay.cs
+++ b/Content.Client/Drugs/RainbowOverlay.cs
@@ -34,7 +34,7 @@ public RainbowOverlay()
 
     protected override void FrameUpdate(FrameEventArgs args)
     {
-        var playerEntity = _playerManager.LocalPlayer?.ControlledEntity;
+        var playerEntity = _playerManager.LocalEntity;
 
         if (playerEntity == null)
             return;
@@ -53,7 +53,7 @@ protected override void FrameUpdate(FrameEventArgs args)
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
     {
-        if (!_entityManager.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out EyeComponent? eyeComp))
+        if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
             return false;
 
         if (args.Viewport.Eye != eyeComp.Eye)
diff --git a/Content.Client/Drunk/DrunkOverlay.cs b/Content.Client/Drunk/DrunkOverlay.cs
index 96a3beb7022..e01719e62cb 100644
--- a/Content.Client/Drunk/DrunkOverlay.cs
+++ b/Content.Client/Drunk/DrunkOverlay.cs
@@ -36,7 +36,7 @@ public DrunkOverlay()
     protected override void FrameUpdate(FrameEventArgs args)
     {
 
-        var playerEntity = _playerManager.LocalPlayer?.ControlledEntity;
+        var playerEntity = _playerManager.LocalEntity;
 
         if (playerEntity == null)
             return;
@@ -58,7 +58,7 @@ protected override void FrameUpdate(FrameEventArgs args)
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
     {
-        if (!_entityManager.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out EyeComponent? eyeComp))
+        if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
             return false;
 
         if (args.Viewport.Eye != eyeComp.Eye)
diff --git a/Content.Client/Drunk/DrunkSystem.cs b/Content.Client/Drunk/DrunkSystem.cs
index dcd2758623e..d9c6bb192fd 100644
--- a/Content.Client/Drunk/DrunkSystem.cs
+++ b/Content.Client/Drunk/DrunkSystem.cs
@@ -38,13 +38,13 @@ private void OnPlayerDetached(EntityUid uid, DrunkComponent component, LocalPlay
 
     private void OnDrunkInit(EntityUid uid, DrunkComponent component, ComponentInit args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
             _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnDrunkShutdown(EntityUid uid, DrunkComponent component, ComponentShutdown args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
         {
             _overlay.CurrentBoozePower = 0;
             _overlayMan.RemoveOverlay(_overlay);
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 32ba78085ae..1be472b06d6 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -33,7 +33,6 @@ public sealed class ExamineSystem : ExamineSystemShared
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly VerbSystem _verbSystem = default!;
-        [Dependency] private readonly IBaseClient _client = default!;
 
         public const string StyleClassEntityTooltip = "entity-tooltip";
 
@@ -66,12 +65,10 @@ private void OnExaminedItemDropped(EntityUid item, ItemComponent comp, DroppedEv
         {
             if (!args.User.Valid)
                 return;
-            if (_playerManager.LocalPlayer == null)
-                return;
             if (_examineTooltipOpen == null)
                 return;
 
-            if (item == _examinedEntity && args.User == _playerManager.LocalPlayer.ControlledEntity)
+            if (item == _examinedEntity && args.User == _playerManager.LocalEntity)
                 CloseTooltip();
         }
 
@@ -118,7 +115,7 @@ private bool HandleExamine(in PointerInputCmdHandler.PointerInputCmdArgs args)
                 return false;
             }
 
-            _playerEntity = _playerManager.LocalPlayer?.ControlledEntity ?? default;
+            _playerEntity = _playerManager.LocalEntity ?? default;
 
             if (_playerEntity == default || !CanExamine(_playerEntity, entity))
             {
@@ -149,7 +146,7 @@ private void AddExamineVerb(GetVerbsEvent<ExamineVerb> args)
 
         private void OnExamineInfoResponse(ExamineSystemMessages.ExamineInfoResponseMessage ev)
         {
-            var player = _playerManager.LocalPlayer?.ControlledEntity;
+            var player = _playerManager.LocalEntity;
             if (player == null)
                 return;
 
@@ -356,7 +353,7 @@ public void VerbButtonPressed(BaseButton.ButtonEventArgs obj)
 
         public void DoExamine(EntityUid entity, bool centeredOnCursor = true, EntityUid? userOverride = null)
         {
-            var playerEnt = userOverride ?? _playerManager.LocalPlayer?.ControlledEntity;
+            var playerEnt = userOverride ?? _playerManager.LocalEntity;
             if (playerEnt == null)
                 return;
 
diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index 94e8ca59823..2d8c15f1b9f 100644
--- a/Content.Client/Explosion/ExplosionOverlay.cs
+++ b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -14,7 +14,6 @@ namespace Content.Client.Explosion;
 public sealed class ExplosionOverlay : Overlay
 {
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
 
diff --git a/Content.Client/Eye/Blinding/BlindingSystem.cs b/Content.Client/Eye/Blinding/BlindingSystem.cs
index 2bff5db4d61..99d215b7587 100644
--- a/Content.Client/Eye/Blinding/BlindingSystem.cs
+++ b/Content.Client/Eye/Blinding/BlindingSystem.cs
@@ -43,13 +43,13 @@ private void OnPlayerDetached(EntityUid uid, BlindableComponent component, Local
 
     private void OnBlindInit(EntityUid uid, BlindableComponent component, ComponentInit args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
             _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnBlindShutdown(EntityUid uid, BlindableComponent component, ComponentShutdown args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
         {
             _overlayMan.RemoveOverlay(_overlay);
         }
diff --git a/Content.Client/Eye/Blinding/BlurryVisionSystem.cs b/Content.Client/Eye/Blinding/BlurryVisionSystem.cs
index 91090fc4607..ba687ead4eb 100644
--- a/Content.Client/Eye/Blinding/BlurryVisionSystem.cs
+++ b/Content.Client/Eye/Blinding/BlurryVisionSystem.cs
@@ -36,13 +36,13 @@ private void OnPlayerDetached(EntityUid uid, BlurryVisionComponent component, Lo
 
     private void OnBlurryInit(EntityUid uid, BlurryVisionComponent component, ComponentInit args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
             _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnBlurryShutdown(EntityUid uid, BlurryVisionComponent component, ComponentShutdown args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
         {
             _overlayMan.RemoveOverlay(_overlay);
         }
diff --git a/Content.Client/Eye/EyeLerpingSystem.cs b/Content.Client/Eye/EyeLerpingSystem.cs
index 8889b971002..78e1b851fcb 100644
--- a/Content.Client/Eye/EyeLerpingSystem.cs
+++ b/Content.Client/Eye/EyeLerpingSystem.cs
@@ -41,7 +41,7 @@ public override void Initialize()
 
     private void OnEyeStartup(EntityUid uid, EyeComponent component, ComponentStartup args)
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity == uid)
+        if (_playerManager.LocalEntity == uid)
             AddEye(uid, component, true);
     }
 
@@ -77,7 +77,7 @@ public void RemoveEye(EntityUid uid)
             return;
 
         // If this is the currently controlled entity, we keep the component.
-        if (_playerManager.LocalPlayer?.ControlledEntity == uid)
+        if (_playerManager.LocalEntity == uid)
             lerp.ManuallyAdded = false;
         else
             RemComp(uid, lerp);
diff --git a/Content.Client/Fax/UI/FaxBoundUi.cs b/Content.Client/Fax/UI/FaxBoundUi.cs
index ef6661b3ef6..9b57595d7b4 100644
--- a/Content.Client/Fax/UI/FaxBoundUi.cs
+++ b/Content.Client/Fax/UI/FaxBoundUi.cs
@@ -1,15 +1,22 @@
+using System.IO;
+using System.Threading.Tasks;
 using Content.Shared.Fax;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Fax.UI;
 
 [UsedImplicitly]
 public sealed class FaxBoundUi : BoundUserInterface
 {
+    [Dependency] private readonly IFileDialogManager _fileDialogManager = default!;
+
     [ViewVariables]
     private FaxWindow? _window;
 
+    private bool _dialogIsOpen = false;
+
     public FaxBoundUi(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
     }
@@ -22,12 +29,33 @@ protected override void Open()
         _window.OpenCentered();
 
         _window.OnClose += Close;
+        _window.FileButtonPressed += OnFileButtonPressed;
         _window.CopyButtonPressed += OnCopyButtonPressed;
         _window.SendButtonPressed += OnSendButtonPressed;
         _window.RefreshButtonPressed += OnRefreshButtonPressed;
         _window.PeerSelected += OnPeerSelected;
     }
 
+    private async void OnFileButtonPressed()
+    {
+        if (_dialogIsOpen)
+            return;
+            
+        _dialogIsOpen = true;
+        var filters = new FileDialogFilters(new FileDialogFilters.Group("txt"));
+        await using var file = await _fileDialogManager.OpenFile(filters);
+        _dialogIsOpen = false;
+
+        if (_window == null || _window.Disposed || file == null)
+        {
+            return;
+        }
+
+        using var reader = new StreamReader(file);
+        var content = await reader.ReadToEndAsync();
+        SendMessage(new FaxFileMessage(content[..Math.Min(content.Length, FaxFileMessageValidation.MaxContentSize)], _window.OfficePaper));
+    }
+
     private void OnSendButtonPressed()
     {
         SendMessage(new FaxSendMessage());
diff --git a/Content.Client/Fax/UI/FaxWindow.xaml b/Content.Client/Fax/UI/FaxWindow.xaml
index 1e6ef233765..ce22b0e412c 100644
--- a/Content.Client/Fax/UI/FaxWindow.xaml
+++ b/Content.Client/Fax/UI/FaxWindow.xaml
@@ -19,6 +19,14 @@
             <OptionButton Name="PeerSelector" HorizontalExpand="True" />
         </BoxContainer>
         <Control HorizontalExpand="True" MinHeight="20" />
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+            <Button Name="FileButton"
+                    Text="{Loc 'fax-machine-ui-file-button'}"
+                    HorizontalExpand="False"/>
+            <Button Name="PaperButton"
+                    Text="{Loc 'fax-machine-ui-paper-button-normal'}"
+                    HorizontalExpand="False"/>
+        </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Button Name="CopyButton"
                     Text="{Loc 'fax-machine-ui-copy-button'}"
diff --git a/Content.Client/Fax/UI/FaxWindow.xaml.cs b/Content.Client/Fax/UI/FaxWindow.xaml.cs
index ecc3f4778fb..b809af7f4ae 100644
--- a/Content.Client/Fax/UI/FaxWindow.xaml.cs
+++ b/Content.Client/Fax/UI/FaxWindow.xaml.cs
@@ -3,21 +3,30 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Fax.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class FaxWindow : DefaultWindow
 {
+    public event Action? FileButtonPressed;
+    public event Action? PaperButtonPressed;
     public event Action? CopyButtonPressed;
     public event Action? SendButtonPressed;
     public event Action? RefreshButtonPressed;
     public event Action<string>? PeerSelected;
 
+    public bool OfficePaper = false;
+
     public FaxWindow()
     {
         RobustXamlLoader.Load(this);
 
+        PaperButtonPressed += OnPaperButtonPressed;
+
+        FileButton.OnPressed += _ => FileButtonPressed?.Invoke(); 
+        PaperButton.OnPressed += _ => PaperButtonPressed?.Invoke(); 
         CopyButton.OnPressed += _ => CopyButtonPressed?.Invoke();
         SendButton.OnPressed += _ => SendButtonPressed?.Invoke();
         RefreshButton.OnPressed += _ => RefreshButtonPressed?.Invoke();
@@ -80,4 +89,14 @@ private int AddPeerSelect(string name, string address)
         PeerSelector.SetItemMetadata(PeerSelector.ItemCount - 1, address);
         return PeerSelector.ItemCount - 1;
     }
+
+    private void OnPaperButtonPressed()
+    {
+        OfficePaper = !OfficePaper;
+
+        if(OfficePaper)
+            PaperButton.Text = Loc.GetString("fax-machine-ui-paper-button-office");
+        else
+            PaperButton.Text = Loc.GetString("fax-machine-ui-paper-button-normal");
+    }
 }
diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs
index 433ee95e1cb..fe9c888227e 100644
--- a/Content.Client/Flash/FlashOverlay.cs
+++ b/Content.Client/Flash/FlashOverlay.cs
@@ -51,7 +51,7 @@ public void ReceiveFlash(double duration)
 
         protected override void Draw(in OverlayDrawArgs args)
         {
-            if (!_entityManager.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out EyeComponent? eyeComp))
+            if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
                 return;
 
             if (args.Viewport.Eye != eyeComp.Eye)
diff --git a/Content.Client/Flash/FlashSystem.cs b/Content.Client/Flash/FlashSystem.cs
index 3393662fa40..ad8f8b0b82b 100644
--- a/Content.Client/Flash/FlashSystem.cs
+++ b/Content.Client/Flash/FlashSystem.cs
@@ -25,7 +25,7 @@ private void OnFlashableHandleState(EntityUid uid, FlashableComponent component,
                 return;
 
             // Yes, this code is awful. I'm just porting it to an entity system so don't blame me.
-            if (_playerManager.LocalPlayer != null && _playerManager.LocalPlayer.Session.AttachedEntity != uid)
+            if (_playerManager.LocalEntity != uid)
             {
                 return;
             }
diff --git a/Content.Client/Fluids/PuddleOverlay.cs b/Content.Client/Fluids/PuddleOverlay.cs
index 8c8b13a1efe..ac6661cfdd8 100644
--- a/Content.Client/Fluids/PuddleOverlay.cs
+++ b/Content.Client/Fluids/PuddleOverlay.cs
@@ -9,7 +9,6 @@ namespace Content.Client.Fluids;
 
 public sealed class PuddleOverlay : Overlay
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
diff --git a/Content.Client/Forensics/ForensicScannerMenu.xaml b/Content.Client/Forensics/ForensicScannerMenu.xaml
index fbfcb06f158..b508fa74338 100644
--- a/Content.Client/Forensics/ForensicScannerMenu.xaml
+++ b/Content.Client/Forensics/ForensicScannerMenu.xaml
@@ -18,7 +18,7 @@
                 Text="{Loc 'forensic-scanner-interface-clear'}" />
         </BoxContainer>
         <Label
-            Name="Name"
+            Name="NameLabel"
             Align="Center" />
         <Label
             Name="Diagnostics"
diff --git a/Content.Client/Forensics/ForensicScannerMenu.xaml.cs b/Content.Client/Forensics/ForensicScannerMenu.xaml.cs
index 8b6152c8612..5f7f8e0056c 100644
--- a/Content.Client/Forensics/ForensicScannerMenu.xaml.cs
+++ b/Content.Client/Forensics/ForensicScannerMenu.xaml.cs
@@ -29,7 +29,7 @@ public void UpdateState(ForensicScannerBoundUserInterfaceState msg)
             {
                 Print.Disabled = true;
                 Clear.Disabled = true;
-                Name.Text = string.Empty;
+                NameLabel.Text = string.Empty;
                 Diagnostics.Text = string.Empty;
                 return;
             }
@@ -37,7 +37,7 @@ public void UpdateState(ForensicScannerBoundUserInterfaceState msg)
             Print.Disabled = (msg.PrintReadyAt > _gameTiming.CurTime);
             Clear.Disabled = false;
 
-            Name.Text = msg.LastScannedName;
+            NameLabel.Text = msg.LastScannedName;
 
             var text = new StringBuilder();
 
diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
index 1154dca350c..25b6802bd73 100644
--- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
@@ -38,7 +38,6 @@ public sealed class ClientGameTicker : SharedGameTicker
         [ViewVariables] public bool DisallowedLateJoin { get; private set; }
         [ViewVariables] public string? ServerInfoBlob { get; private set; }
         [ViewVariables] public TimeSpan StartTime { get; private set; }
-        [ViewVariables] public TimeSpan RoundStartTimeSpan { get; private set; }
         [ViewVariables] public new bool Paused { get; private set; }
 
         [ViewVariables] public IReadOnlyDictionary<NetEntity, Dictionary<string, uint?>> JobsAvailable => _jobsAvailable;
diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs
index 454c0632605..bdbd69d1086 100644
--- a/Content.Client/Gameplay/GameplayStateBase.cs
+++ b/Content.Client/Gameplay/GameplayStateBase.cs
@@ -203,7 +203,7 @@ protected virtual void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args)
             }; // TODO make entityUid nullable
 
             // client side command handlers will always be sent the local player session.
-            var session = _playerManager.LocalPlayer?.Session;
+            var session = _playerManager.LocalSession;
             if (inputSys.HandleInputCommand(session, func, message))
             {
                 kArgs.Handle();
diff --git a/Content.Client/Ghost/GhostSystem.cs b/Content.Client/Ghost/GhostSystem.cs
index f6913d25786..c42e7cd0e0c 100644
--- a/Content.Client/Ghost/GhostSystem.cs
+++ b/Content.Client/Ghost/GhostSystem.cs
@@ -15,7 +15,6 @@ public sealed class GhostSystem : SharedGhostSystem
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly ContentEyeSystem _contentEye = default!;
-        [Dependency] private readonly EyeSystem _eye = default!;
 
         public int AvailableGhostRoleCount { get; private set; }
 
@@ -41,7 +40,7 @@ private bool GhostVisibility
             }
         }
 
-        public GhostComponent? Player => CompOrNull<GhostComponent>(_playerManager.LocalPlayer?.ControlledEntity);
+        public GhostComponent? Player => CompOrNull<GhostComponent>(_playerManager.LocalEntity);
         public bool IsGhost => Player != null;
 
         public event Action<GhostComponent>? PlayerRemoved;
diff --git a/Content.Client/Gravity/GravitySystem.Shake.cs b/Content.Client/Gravity/GravitySystem.Shake.cs
index 55becdd3950..c4356588d35 100644
--- a/Content.Client/Gravity/GravitySystem.Shake.cs
+++ b/Content.Client/Gravity/GravitySystem.Shake.cs
@@ -23,7 +23,7 @@ private void InitializeShake()
 
     private void OnShakeInit(EntityUid uid, GravityShakeComponent component, ComponentInit args)
     {
-        var localPlayer = _playerManager.LocalPlayer?.ControlledEntity;
+        var localPlayer = _playerManager.LocalEntity;
 
         if (!TryComp<TransformComponent>(localPlayer, out var xform) ||
             xform.GridUid != uid && xform.MapUid != uid)
@@ -44,7 +44,7 @@ protected override void ShakeGrid(EntityUid uid, GravityComponent? gravity = nul
         if (!Resolve(uid, ref gravity) || !Timing.IsFirstTimePredicted)
             return;
 
-        var localPlayer = _playerManager.LocalPlayer?.ControlledEntity;
+        var localPlayer = _playerManager.LocalEntity;
 
         if (!TryComp<TransformComponent>(localPlayer, out var xform))
             return;
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
index 113c192beb9..4776386c1dd 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
@@ -98,22 +98,33 @@ public void UpdateGuides(
         }
     }
 
-    private IEnumerable<GuideEntry> GetSortedRootEntries(List<string>? rootEntries)
+    private IEnumerable<GuideEntry> GetSortedEntries(List<string>? rootEntries)
     {
         if (rootEntries == null)
         {
             HashSet<string> entries = new(_entries.Keys);
             foreach (var entry in _entries.Values)
             {
+                if (entry.Children.Count > 0)
+                {
+                    var sortedChildren = entry.Children
+                        .Select(childId => _entries[childId])
+                        .OrderBy(childEntry => childEntry.Priority)
+                        .ThenBy(childEntry => Loc.GetString(childEntry.Name))
+                        .Select(childEntry => childEntry.Id)
+                        .ToList();
+
+                    entry.Children = sortedChildren;
+                }
                 entries.ExceptWith(entry.Children);
             }
             rootEntries = entries.ToList();
         }
 
         return rootEntries
-            .Select(x => _entries[x])
-            .OrderBy(x => x.Priority)
-            .ThenBy(x => Loc.GetString(x.Name));
+            .Select(rootEntryId => _entries[rootEntryId])
+            .OrderBy(rootEntry => rootEntry.Priority)
+            .ThenBy(rootEntry => Loc.GetString(rootEntry.Name));
     }
 
     private void RepopulateTree(List<string>? roots = null, string? forcedRoot = null)
@@ -123,7 +134,7 @@ private void RepopulateTree(List<string>? roots = null, string? forcedRoot = nul
         HashSet<string> addedEntries = new();
 
         TreeItem? parent = forcedRoot == null ? null : AddEntry(forcedRoot, null, addedEntries);
-        foreach (var entry in GetSortedRootEntries(roots))
+        foreach (var entry in GetSortedEntries(roots))
         {
             AddEntry(entry.Id, parent, addedEntries);
         }
diff --git a/Content.Client/Guidebook/GuidebookSystem.cs b/Content.Client/Guidebook/GuidebookSystem.cs
index dffc625cb86..cb13d4ca6e5 100644
--- a/Content.Client/Guidebook/GuidebookSystem.cs
+++ b/Content.Client/Guidebook/GuidebookSystem.cs
@@ -55,7 +55,7 @@ public override void Initialize()
     /// </summary>
     public EntityUid GetGuidebookUser()
     {
-        var user = _playerManager.LocalPlayer!.ControlledEntity;
+        var user = _playerManager.LocalEntity;
         if (user != null)
             return user.Value;
 
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
index 9ea094a73ab..7319b97b42b 100644
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -22,7 +22,6 @@ namespace Content.Client.Hands.Systems
     [UsedImplicitly]
     public sealed class HandsSystem : SharedHandsSystem
     {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
 
@@ -147,7 +146,7 @@ public override void DoDrop(EntityUid uid, Hand hand, bool doDropInteraction = t
         /// </summary>
         public bool TryGetPlayerHands([NotNullWhen(true)] out HandsComponent? hands)
         {
-            var player = _playerManager.LocalPlayer?.ControlledEntity;
+            var player = _playerManager.LocalEntity;
             hands = null;
             return player != null && TryComp(player.Value, out hands);
         }
@@ -248,7 +247,7 @@ protected override void HandleEntityInserted(EntityUid uid, HandsComponent hands
             UpdateHandVisuals(uid, args.Entity, hand);
             _stripSys.UpdateUi(uid);
 
-            if (uid != _playerManager.LocalPlayer?.ControlledEntity)
+            if (uid != _playerManager.LocalEntity)
                 return;
 
             OnPlayerItemAdded?.Invoke(hand.Name, args.Entity);
@@ -266,7 +265,7 @@ protected override void HandleEntityRemoved(EntityUid uid, HandsComponent hands,
             UpdateHandVisuals(uid, args.Entity, hand);
             _stripSys.UpdateUi(uid);
 
-            if (uid != _playerManager.LocalPlayer?.ControlledEntity)
+            if (uid != _playerManager.LocalEntity)
                 return;
 
             OnPlayerItemRemoved?.Invoke(hand.Name, args.Entity);
@@ -284,7 +283,7 @@ private void UpdateHandVisuals(EntityUid uid, EntityUid held, Hand hand, HandsCo
                 return;
 
             // visual update might involve changes to the entity's effective sprite -> need to update hands GUI.
-            if (uid == _playerManager.LocalPlayer?.ControlledEntity)
+            if (uid == _playerManager.LocalEntity)
                 OnPlayerItemAdded?.Invoke(hand.Name, held);
 
             if (!handComp.ShowInHands)
@@ -375,13 +374,13 @@ private void HandlePlayerDetached(EntityUid uid, HandsComponent component, Local
 
         private void OnHandsStartup(EntityUid uid, HandsComponent component, ComponentStartup args)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity == uid)
+            if (_playerManager.LocalEntity == uid)
                 OnPlayerHandsAdded?.Invoke(component);
         }
 
         private void OnHandsShutdown(EntityUid uid, HandsComponent component, ComponentShutdown args)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity == uid)
+            if (_playerManager.LocalEntity == uid)
                 OnPlayerHandsRemoved?.Invoke();
         }
         #endregion
@@ -395,7 +394,7 @@ public override void AddHand(EntityUid uid, string handName, HandLocation handLo
         {
             base.AddHand(uid, handName, handLocation, handsComp);
 
-            if (uid == _playerManager.LocalPlayer?.ControlledEntity)
+            if (uid == _playerManager.LocalEntity)
                 OnPlayerAddHand?.Invoke(handName, handLocation);
 
             if (handsComp == null)
@@ -406,9 +405,9 @@ public override void AddHand(EntityUid uid, string handName, HandLocation handLo
         }
         public override void RemoveHand(EntityUid uid, string handName, HandsComponent? handsComp = null)
         {
-            if (uid == _playerManager.LocalPlayer?.ControlledEntity && handsComp != null &&
+            if (uid == _playerManager.LocalEntity && handsComp != null &&
                 handsComp.Hands.ContainsKey(handName) && uid ==
-                _playerManager.LocalPlayer?.ControlledEntity)
+                _playerManager.LocalEntity)
             {
                 OnPlayerRemoveHand?.Invoke(handName);
             }
@@ -421,7 +420,7 @@ private void OnHandActivated(Entity<HandsComponent>? ent)
             if (ent is not { } hand)
                 return;
 
-            if (_playerManager.LocalPlayer?.ControlledEntity != hand.Owner)
+            if (_playerManager.LocalEntity != hand.Owner)
                 return;
 
             if (hand.Comp.ActiveHand == null)
diff --git a/Content.Client/HotPotato/HotPotatoSystem.cs b/Content.Client/HotPotato/HotPotatoSystem.cs
index 8e9c0f9e199..028a3b70d9f 100644
--- a/Content.Client/HotPotato/HotPotatoSystem.cs
+++ b/Content.Client/HotPotato/HotPotatoSystem.cs
@@ -2,10 +2,13 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
+namespace Content.Client.HotPotato;
+
 public sealed class HotPotatoSystem : SharedHotPotatoSystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public override void Update(float frameTime)
     {
@@ -20,7 +23,7 @@ public override void Update(float frameTime)
             if (_timing.CurTime < comp.TargetTime)
                 continue;
             comp.TargetTime = _timing.CurTime + TimeSpan.FromSeconds(comp.EffectCooldown);
-            Spawn("HotPotatoEffect", Transform(uid).MapPosition.Offset(_random.NextVector2(0.25f)));
+            Spawn("HotPotatoEffect", _transform.GetMapCoordinates(uid).Offset(_random.NextVector2(0.25f)));
         }
     }
 }
diff --git a/Content.Client/Instruments/InstrumentSystem.cs b/Content.Client/Instruments/InstrumentSystem.cs
index d9c9b66dcb6..5bdaa52359d 100644
--- a/Content.Client/Instruments/InstrumentSystem.cs
+++ b/Content.Client/Instruments/InstrumentSystem.cs
@@ -29,8 +29,8 @@ public override void Initialize()
 
         UpdatesOutsidePrediction = true;
 
-        _cfg.OnValueChanged(CCVars.MaxMidiEventsPerBatch, OnMaxMidiEventsPerBatchChanged, true);
-        _cfg.OnValueChanged(CCVars.MaxMidiEventsPerSecond, OnMaxMidiEventsPerSecondChanged, true);
+        Subs.CVar(_cfg, CCVars.MaxMidiEventsPerBatch, OnMaxMidiEventsPerBatchChanged, true);
+        Subs.CVar(_cfg, CCVars.MaxMidiEventsPerSecond, OnMaxMidiEventsPerSecondChanged, true);
 
         SubscribeNetworkEvent<InstrumentMidiEventEvent>(OnMidiEventRx);
         SubscribeNetworkEvent<InstrumentStartMidiEvent>(OnMidiStart);
@@ -60,14 +60,6 @@ private void OnHandleState(EntityUid uid, SharedInstrumentComponent component, r
             EndRenderer(uid, true, component);
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _cfg.UnsubValueChanged(CCVars.MaxMidiEventsPerBatch, OnMaxMidiEventsPerBatchChanged);
-        _cfg.UnsubValueChanged(CCVars.MaxMidiEventsPerSecond, OnMaxMidiEventsPerSecondChanged);
-    }
-
     private void OnShutdown(EntityUid uid, InstrumentComponent component, ComponentShutdown args)
     {
         EndRenderer(uid, false, component);
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
index 85c9cc1447e..da443e3fb5b 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
@@ -168,14 +168,14 @@ private bool PlayCheck()
             if (instrument == null)
                 return false;
 
-            var localPlayer = _owner.PlayerManager.LocalPlayer;
+            var localEntity = _owner.PlayerManager.LocalEntity;
 
             // If we don't have a player or controlled entity, we return.
-            if (localPlayer?.ControlledEntity == null)
+            if (localEntity == null)
                 return false;
 
             // By default, allow an instrument to play itself and skip all other checks
-            if (localPlayer.ControlledEntity == instrumentEnt)
+            if (localEntity == instrumentEnt)
                 return true;
 
             var container = _owner.Entities.System<SharedContainerSystem>();
@@ -183,14 +183,14 @@ private bool PlayCheck()
             container.TryGetContainingContainer(instrumentEnt, out var conMan);
 
             // If the instrument is handheld and we're not holding it, we return.
-            if ((instrument.Handheld && (conMan == null || conMan.Owner != localPlayer.ControlledEntity)))
+            if ((instrument.Handheld && (conMan == null || conMan.Owner != localEntity)))
                 return false;
 
-            if (!_owner.ActionBlocker.CanInteract(localPlayer.ControlledEntity.Value, instrumentEnt))
+            if (!_owner.ActionBlocker.CanInteract(localEntity.Value, instrumentEnt))
                 return false;
 
             // We check that we're in range unobstructed just in case.
-            return _owner.Interactions.InRangeUnobstructed(localPlayer.ControlledEntity.Value, instrumentEnt);
+            return _owner.Interactions.InRangeUnobstructed(localEntity.Value, instrumentEnt);
         }
 
         private void MidiStopButtonOnPressed(ButtonEventArgs? obj)
diff --git a/Content.Client/Interaction/DragDropSystem.cs b/Content.Client/Interaction/DragDropSystem.cs
index 66571a9d27f..8baa4d15fe4 100644
--- a/Content.Client/Interaction/DragDropSystem.cs
+++ b/Content.Client/Interaction/DragDropSystem.cs
@@ -109,7 +109,7 @@ public override void Initialize()
         UpdatesOutsidePrediction = true;
         UpdatesAfter.Add(typeof(SharedEyeSystem));
 
-        _cfgMan.OnValueChanged(CCVars.DragDropDeadZone, SetDeadZone, true);
+        Subs.CVar(_cfgMan, CCVars.DragDropDeadZone, SetDeadZone, true);
 
         _dropTargetInRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetInRange).Instance();
         _dropTargetOutOfRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetOutOfRange).Instance();
@@ -126,7 +126,6 @@ private void SetDeadZone(float deadZone)
 
     public override void Shutdown()
     {
-        _cfgMan.UnsubValueChanged(CCVars.DragDropDeadZone, SetDeadZone);
         CommandBinds.Unregister<DragDropSystem>();
         base.Shutdown();
     }
@@ -269,7 +268,7 @@ private bool UpdateDrag(float frameTime)
             return false;
         }
 
-        var player = _playerManager.LocalPlayer?.ControlledEntity;
+        var player = _playerManager.LocalEntity;
 
         // still in range of the thing we are dragging?
         if (player == null || !_interactionSystem.InRangeUnobstructed(player.Value, _draggedEntity.Value))
@@ -346,7 +345,7 @@ private bool OnUseMouseUp(in PointerInputCmdHandler.PointerInputCmdArgs args)
             return false;
         }
 
-        var localPlayer = _playerManager.LocalPlayer?.ControlledEntity;
+        var localPlayer = _playerManager.LocalEntity;
 
         if (localPlayer == null || !Exists(_draggedEntity))
         {
@@ -410,7 +409,7 @@ private void HighlightTargets()
             return;
         }
 
-        var user = _playerManager.LocalPlayer?.ControlledEntity;
+        var user = _playerManager.LocalEntity;
 
         if (user == null)
             return;
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 028c035e8a7..f8eb12df914 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -30,10 +30,9 @@ namespace Content.Client.Inventory
     [UsedImplicitly]
     public sealed class StrippableBoundUserInterface : BoundUserInterface
     {
-        [Dependency] private readonly IPrototypeManager _protoMan = default!;
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
-        private readonly ExamineSystem _examine = default!;
-        private readonly InventorySystem _inv = default!;
+        private readonly ExamineSystem _examine;
+        private readonly InventorySystem _inv;
         private readonly SharedCuffableSystem _cuffable;
 
         [ViewVariables]
diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
index 74579b26994..7e7dd2d6935 100644
--- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
@@ -4,6 +4,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Kitchen.UI
 {
@@ -18,6 +19,9 @@ public sealed class MicrowaveBoundUserInterface : BoundUserInterface
 
         [ViewVariables]
         private readonly Dictionary<int, ReagentQuantity> _reagents = new();
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+        public MicrowaveUpdateUserInterfaceState currentState = default!;
 
         private IEntityManager _entManager;
 
@@ -26,23 +30,47 @@ public MicrowaveBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, ui
             _entManager = IoCManager.Resolve<IEntityManager>();
         }
 
+        public TimeSpan GetCurrentTime()
+        {
+            return _gameTiming.CurTime;
+        }
+
         protected override void Open()
         {
             base.Open();
             _menu = new MicrowaveMenu(this);
             _menu.OpenCentered();
             _menu.OnClose += Close;
-            _menu.StartButton.OnPressed += _ => SendMessage(new MicrowaveStartCookMessage());
-            _menu.EjectButton.OnPressed += _ => SendMessage(new MicrowaveEjectMessage());
+            _menu.StartButton.OnPressed += _ => SendPredictedMessage(new MicrowaveStartCookMessage());
+            _menu.EjectButton.OnPressed += _ => SendPredictedMessage(new MicrowaveEjectMessage());
             _menu.IngredientsList.OnItemSelected += args =>
             {
-                SendMessage(new MicrowaveEjectSolidIndexedMessage(EntMan.GetNetEntity(_solids[args.ItemIndex])));
+                SendPredictedMessage(new MicrowaveEjectSolidIndexedMessage(EntMan.GetNetEntity(_solids[args.ItemIndex])));
             };
 
             _menu.OnCookTimeSelected += (args, buttonIndex) =>
             {
-                var actualButton = (MicrowaveMenu.MicrowaveCookTimeButton) args.Button;
-                SendMessage(new MicrowaveSelectCookTimeMessage(buttonIndex, actualButton.CookTime));
+                var selectedCookTime = (uint) 0;
+
+                if (args.Button is MicrowaveMenu.MicrowaveCookTimeButton microwaveCookTimeButton)
+                {
+                    // args.Button is a MicrowaveCookTimeButton
+                    var actualButton = (MicrowaveMenu.MicrowaveCookTimeButton) args.Button;
+                    selectedCookTime = actualButton.CookTime == 0 ? 0 : actualButton.CookTime;
+                    // SendMessage(new MicrowaveSelectCookTimeMessage((int) selectedCookTime / 5, actualButton.CookTime));
+                    SendPredictedMessage(new MicrowaveSelectCookTimeMessage((int) selectedCookTime / 5, actualButton.CookTime));
+
+                    _menu.CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
+                                                                    ("time", selectedCookTime));
+                }
+                else
+                {
+                    // args.Button is a normal button aka instant cook button
+                    SendPredictedMessage(new MicrowaveSelectCookTimeMessage((int) selectedCookTime, 0));
+
+                    _menu.CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
+                                                         ("time", Loc.GetString("microwave-menu-instant-button")));
+                }
             };
         }
 
@@ -67,20 +95,47 @@ protected override void UpdateState(BoundUserInterfaceState state)
                 return;
             }
 
-            _menu?.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy);
+
+            _menu?.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0);
+            currentState = cState;
 
             // TODO move this to a component state and ensure the net ids.
             RefreshContentsDisplay(_entManager.GetEntityArray(cState.ContainedSolids));
 
             if (_menu == null) return;
 
-            var currentlySelectedTimeButton = (Button) _menu.CookTimeButtonVbox.GetChild(cState.ActiveButtonIndex);
-            currentlySelectedTimeButton.Pressed = true;
-            var cookTime = cState.ActiveButtonIndex == 0
+            //Set the cook time info label
+            var cookTime = cState.ActiveButtonIndex == 0 
                 ? Loc.GetString("microwave-menu-instant-button")
                 : cState.CurrentCookTime.ToString();
+
+
             _menu.CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
                                                          ("time", cookTime));
+            _menu.StartButton.Disabled = cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0;
+            _menu.EjectButton.Disabled = cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0;
+
+
+            //Set the correct button active button
+            if (cState.ActiveButtonIndex == 0)
+            {
+                _menu.InstantCookButton.Pressed = true;
+            }
+            else
+            {
+                var currentlySelectedTimeButton = (Button) _menu.CookTimeButtonVbox.GetChild(cState.ActiveButtonIndex - 1);
+                currentlySelectedTimeButton.Pressed = true;
+            }
+
+            //Set the "micowave light" ui color to indicate if the microwave is busy or not
+            if (cState.IsMicrowaveBusy && cState.ContainedSolids.Length > 0)
+            {
+                _menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#947300") };
+            }
+            else
+            {
+                _menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#1B1B1E") };
+            }
         }
 
         private void RefreshContentsDisplay(EntityUid[] containedSolids)
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
index c0418088da2..cd81ea0a9bf 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
@@ -1,73 +1,113 @@
-<DefaultWindow xmlns="https://spacestation14.io"
-            xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-            Title="{Loc 'microwave-menu-title'}"
-            SetSize="512 256"
-            MinSize="512 256">
-    <BoxContainer Orientation="Horizontal">
-        <ItemList Name="IngredientsList"
-                  Access="Public"
-                  VerticalExpand="True"
-                  HorizontalExpand="True"
-                  SelectMode="Button"
-                  SizeFlagsStretchRatio="2"
-                  MinSize="100 128">
-            <!-- Ingredients are added here by code -->
-        </ItemList>
-        <BoxContainer Orientation="Vertical"
-                      MinWidth="176"
-                      VerticalExpand="True"
-                      HorizontalExpand="True">
-            <BoxContainer Orientation="Vertical"
-                          Align="Center"
-                          SizeFlagsStretchRatio="3">
-                <Button Name="StartButton"
-                        Access="Public"
-                        Text="{Loc 'microwave-menu-start-button'}"
-                        TextAlign="Center" />
-                <Button Name="EjectButton"
-                        Access="Public"
-                        Text="{Loc 'microwave-menu-eject-all-text'}"
-                        ToolTip="{Loc 'microwave-menu-eject-all-tooltip'}"
-                        TextAlign="Center" />
-            </BoxContainer>
-            <Control MinSize="0 15" />
-            <PanelContainer VerticalExpand="True"
-                            HorizontalExpand="True">
-                <PanelContainer VerticalExpand="True"
-                                ModulateSelfOverride="#FF0000"
-                                MinSize="100 128">
-                    <PanelContainer.PanelOverride>
-                        <gfx:StyleBoxFlat BackgroundColor="#00000080" />
-                    </PanelContainer.PanelOverride>
-                    <BoxContainer Orientation="Vertical">
-                        <PanelContainer>
-                            <PanelContainer.PanelOverride>
-                                <gfx:StyleBoxFlat BackgroundColor="#80808032" />
-                            </PanelContainer.PanelOverride>
-                            <Label Name="CookTimeInfoLabel"
-                                   Access="Public"
-                                   Align="Center"
-                                   Modulate="#FFFFFF"
-                                   VAlign="Center" />
-                        </PanelContainer>
-                        <ScrollContainer VerticalExpand="True">
-                            <BoxContainer Name="CookTimeButtonVbox"
-                                          Access="Public"
-                                          Orientation="Vertical"
-                                          VerticalExpand="True"
-                                          Align="Center">
-                                <!-- Cook time buttons are added here by code -->
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:style="clr-namespace:Content.Client.Stylesheets"
+    Title="{Loc 'microwave-menu-title'}"
+    MinWidth="512"
+    MinSize="512 256">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal"  >
+            <PanelContainer
+                Name="IngredientsPanel"
+                Access="Public"
+                MinSize="300 128"
+                Margin="5 5">
+                <PanelContainer.PanelOverride>
+                    <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
+                </PanelContainer.PanelOverride>
+                <ItemList
+                    Name="IngredientsList"
+                    Access="Public"
+                    Margin="5 5"
+                    VerticalExpand="True"
+                    HorizontalExpand="True"
+                    StyleClasses="transparentBackgroundItemList"
+                    SelectMode="Button"
+                    SizeFlagsStretchRatio="3"
+                    ItemSeparation="5"
+                    MinSize="100 128">
+                    <!-- Ingredients are added here by code -->
+                </ItemList>
+            </PanelContainer>
+            <BoxContainer
+                Orientation="Vertical"
+                MinWidth="170"
+                Margin="10 10"
+                VerticalExpand="True"
+                HorizontalExpand="True">
+                <PanelContainer
+                    VerticalExpand="True"
+                    HorizontalExpand="True">
+                    <PanelContainer
+                        VerticalExpand="True"
+                        ModulateSelfOverride="#FF0000"
+                        MinSize="100 128">
+                        <BoxContainer Orientation="Vertical">
+                            <Label
+                                Name="CookTimeInfoLabel"
+                                Access="Public"
+                                Align="Center"
+                                Modulate="#FFFFFF"
+                                VAlign="Center" />
+                            <BoxContainer  Orientation="Vertical">
+                                <Button
+                                    Name="InstantCookButton"
+                                    Access="Public"
+                                    Text="{Loc 'microwave-menu-instant-button'}"
+                                    StyleClasses="OpenLeft"
+                                    ToggleMode="True"
+                                    Margin="0 0 2 0"
+                                    TextAlign="Center" />
+                                <GridContainer
+                                    Name="CookTimeButtonVbox"
+                                    HSeparationOverride="1"
+                                    VSeparationOverride="1"
+                                    HorizontalExpand="True"
+                                    Columns="3"
+                                    Margin="0"
+                                    Access="Public">
+                                    <!-- Cook time buttons are added here by code -->
+                                </GridContainer>
+                                <BoxContainer
+                                    Orientation="Vertical"
+                                    Align="Center"
+                                    SizeFlagsStretchRatio="3">
+                                    <Control MinSize="0 15" />
+                                    <Button
+                                        Name="StartButton"
+                                        Access="Public"
+                                        Text="{Loc 'microwave-menu-start-button'}"
+                                        StyleClasses="ButtonColorGreen"
+                                        TextAlign="Center" />
+                                    <Button
+                                        Name="EjectButton"
+                                        Access="Public"
+                                        Text="{Loc 'microwave-menu-eject-all-text'}"
+                                        ToolTip="{Loc 'microwave-menu-eject-all-tooltip'}"
+                                        StyleClasses="ButtonColorRed"
+                                        TextAlign="Center" />
+                                </BoxContainer>
                             </BoxContainer>
-                        </ScrollContainer>
-                    </BoxContainer>
+                        </BoxContainer>
+                    </PanelContainer>
                 </PanelContainer>
-            </PanelContainer>
+            </BoxContainer>
+        </BoxContainer>
+         <!-- Footer -->
+        <BoxContainer Orientation="Vertical">
+            <PanelContainer StyleClasses="LowDivider" />
+            <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
+                <Label Text="{Loc 'microwave-menu-footer-flavor-left'}" StyleClasses="WindowFooterText" />
+                <Label Text="{Loc 'microwave-menu-footer-flavor-right'}" StyleClasses="WindowFooterText"
+                       HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
+                <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered" VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
+            </BoxContainer>
         </BoxContainer>
     </BoxContainer>
-    <PanelContainer Name="DisableCookingPanelOverlay"
-                    MouseFilter="Stop">
+    <PanelContainer Name="DisableCookingPanelOverlay" MouseFilter="Stop">
         <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#00000099" />
+            <gfx:StyleBoxFlat BackgroundColor="#1B1B1E66" />
         </PanelContainer.PanelOverride>
     </PanelContainer>
-</DefaultWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
index 61c6af629d7..b292e9f1465 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
@@ -1,14 +1,13 @@
-using System;
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Localization;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Kitchen.UI
 {
     [GenerateTypedNameReferences]
-    public sealed partial class MicrowaveMenu : DefaultWindow
+    public sealed partial class MicrowaveMenu : FancyWindow
     {
         public sealed class MicrowaveCookTimeButton : Button
         {
@@ -17,28 +16,43 @@ public sealed class MicrowaveCookTimeButton : Button
 
         public event Action<BaseButton.ButtonEventArgs, int>? OnCookTimeSelected;
 
-        private ButtonGroup CookTimeButtonGroup { get; }
+        public ButtonGroup CookTimeButtonGroup { get; }
+        private readonly MicrowaveBoundUserInterface _owner;
 
         public MicrowaveMenu(MicrowaveBoundUserInterface owner)
         {
             RobustXamlLoader.Load(this);
-
             CookTimeButtonGroup = new ButtonGroup();
+            InstantCookButton.Group = CookTimeButtonGroup;
+            _owner = owner;
+            InstantCookButton.OnPressed += args =>
+            {
+                OnCookTimeSelected?.Invoke(args, 0);
+            };
 
-            for (var i = 0; i <= 30; i += 5)
+            for (var i = 1; i <= 6; i++)
             {
                 var newButton = new MicrowaveCookTimeButton
                 {
-                    Text = i == 0 ? Loc.GetString("microwave-menu-instant-button") : i.ToString(),
-                    CookTime = (uint) i,
+                    Text = (i * 5).ToString(),
                     TextAlign = Label.AlignMode.Center,
                     ToggleMode = true,
+                    CookTime = (uint) (i * 5),
                     Group = CookTimeButtonGroup,
+                    HorizontalExpand = true,
                 };
+                if (i == 4)
+                {
+                    newButton.StyleClasses.Add("OpenRight");
+                }
+                else
+                {
+                    newButton.StyleClasses.Add("OpenBoth");
+                }
                 CookTimeButtonVbox.AddChild(newButton);
-                newButton.OnToggled += args =>
+                newButton.OnPressed += args =>
                 {
-                    OnCookTimeSelected?.Invoke(args, newButton.GetPositionInParent());
+                    OnCookTimeSelected?.Invoke(args, i);
                 };
             }
         }
@@ -47,5 +61,18 @@ public void ToggleBusyDisableOverlayPanel(bool shouldDisable)
         {
             DisableCookingPanelOverlay.Visible = shouldDisable;
         }
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
+            if(!_owner.currentState.IsMicrowaveBusy)
+                return;
+
+            if(_owner.currentState.CurrentCookTimeEnd > _owner.GetCurrentTime())
+            {
+                CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
+                ("time",_owner.currentState.CurrentCookTimeEnd.Subtract(_owner.GetCurrentTime()).Seconds)); 
+            }
+        }
     }
 }
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index 9acfb031261..3e7ca574763 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -23,7 +23,6 @@ public sealed class LateJoinGui : DefaultWindow
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IConfigurationManager _configManager = default!;
-        [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
         [Dependency] private readonly JobRequirementsManager _jobRequirements = default!;
 
diff --git a/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs b/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs
new file mode 100644
index 00000000000..1329a69ad25
--- /dev/null
+++ b/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Storage;
+using Content.Shared.Lock;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Lock.Visualizers;
+
+public sealed class LockVisualizerSystem : VisualizerSystem<LockVisualsComponent>
+{
+    protected override void OnAppearanceChange(EntityUid uid, LockVisualsComponent comp, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite == null
+            || !AppearanceSystem.TryGetData<bool>(uid, LockVisuals.Locked, out _, args.Component))
+            return;
+
+        // Lock state for the entity.
+        if (!AppearanceSystem.TryGetData<bool>(uid, LockVisuals.Locked, out var locked, args.Component))
+            locked = true;
+
+        var unlockedStateExist = args.Sprite.BaseRSI?.TryGetState(comp.StateUnlocked, out _);
+
+        if (AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.Open, out var open, args.Component))
+        {
+            args.Sprite.LayerSetVisible(LockVisualLayers.Lock, !open);
+        }
+        else if (!(bool) unlockedStateExist!)
+            args.Sprite.LayerSetVisible(LockVisualLayers.Lock, locked);
+
+        if (!open && (bool) unlockedStateExist!)
+        {
+            args.Sprite.LayerSetState(LockVisualLayers.Lock, locked ? comp.StateLocked : comp.StateUnlocked);
+        }
+    }
+}
+
+public enum LockVisualLayers : byte
+{
+    Lock
+}
diff --git a/Content.Client/Lock/Visualizers/LockVisualsComponent.cs b/Content.Client/Lock/Visualizers/LockVisualsComponent.cs
new file mode 100644
index 00000000000..93844d6d823
--- /dev/null
+++ b/Content.Client/Lock/Visualizers/LockVisualsComponent.cs
@@ -0,0 +1,20 @@
+namespace Content.Client.Lock.Visualizers;
+
+[RegisterComponent]
+[Access(typeof(LockVisualizerSystem))]
+public sealed partial class LockVisualsComponent : Component
+{
+    /// <summary>
+    /// The RSI state used for the lock indicator while the entity is locked.
+    /// </summary>
+    [DataField("stateLocked")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string? StateLocked = "locked";
+
+    /// <summary>
+    /// The RSI state used for the lock indicator entity is unlocked.
+    /// </summary>
+    [DataField("stateUnlocked")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string? StateUnlocked = "unlocked";
+}
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml b/Content.Client/MainMenu/UI/MainMenuControl.xaml
index e1d0652b933..d6c3f4b9415 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml
@@ -2,46 +2,46 @@
          xmlns:pllax="clr-namespace:Content.Client.Parallax"
          xmlns:clog="clr-namespace:Content.Client.Changelog">
     <pllax:ParallaxControl />
-    <LayoutContainer>
-        <BoxContainer Name="VBox"
-                      Orientation="Vertical"
-                      StyleIdentifier="mainMenuVBox"
-                      MinWidth="512">
-            <TextureRect Name="Logo"
-                         Stretch="KeepCentered" />
-            <Control MinSize="0 24" />
-            <BoxContainer Orientation="Horizontal"
-                          SeparationOverride="4">
-                <Label Text="{Loc 'main-menu-username-label'}" />
-                <LineEdit Name="UsernameBox"
-                          Access="Public"
-                          PlaceHolder="{Loc 'main-menu-username-text'}"
-                          HorizontalExpand="True" />
-            </BoxContainer>
+    <BoxContainer Name="VBox"
+                  Orientation="Vertical"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  HorizontalExpand="True"
+                  VerticalExpand="True"
+                  StyleIdentifier="mainMenuVBox"
+                  SeparationOverride="3">
+        <TextureRect Name="Logo"
+                     Stretch="KeepCentered"/>
+        <GridContainer Columns="2">
+            <Label Text="{Loc 'main-menu-username-label'}" />
+            <LineEdit Name="UsernameBox"
+                      Access="Public"
+                      PlaceHolder="{Loc 'main-menu-username-text'}"
+                      HorizontalExpand="True" />
+            <Label Text="{Loc 'main-menu-address-label'}"/>
             <LineEdit Name="AddressBox"
                       Access="Public"
                       Text="localhost"
                       PlaceHolder="server address:port"
                       HorizontalExpand="True" />
-            <Button Name="DirectConnectButton"
-                    Access="Public"
-                    Text="{Loc 'main-menu-direct-connect-button'}"
-                    TextAlign="Center"
-                    StyleIdentifier="mainMenu" />
-            <Control MinSize="0 2" />
-            <Button Name="OptionsButton"
-                    Access="Public"
-                    Text="{Loc 'main-menu-options-button'}"
-                    TextAlign="Center"
-                    StyleIdentifier="mainMenu" />
-            <Button Name="QuitButton"
-                    Access="Public"
-                    Text="{Loc 'main-menu-quit-button'}"
-                    TextAlign="Center"
-                    StyleIdentifier="mainMenu" />
-            <clog:ChangelogButton
-                Name="ChangelogButton"
-                Access="Public"/>
-        </BoxContainer>
-    </LayoutContainer>
+        </GridContainer>
+        <Button Name="DirectConnectButton"
+                Access="Public"
+                Text="{Loc 'main-menu-direct-connect-button'}"
+                TextAlign="Center"
+                StyleIdentifier="mainMenu"/>
+        <Button Name="OptionsButton"
+                Access="Public"
+                Text="{Loc 'main-menu-options-button'}"
+                TextAlign="Center"
+                StyleIdentifier="mainMenu"/>
+        <Button Name="QuitButton"
+                Access="Public"
+                Text="{Loc 'main-menu-quit-button'}"
+                TextAlign="Center"
+                StyleIdentifier="mainMenu"/>
+        <clog:ChangelogButton
+            Name="ChangelogButton"
+            Access="Public"/>
+    </BoxContainer>
 </Control>
diff --git a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml b/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml
index 2da84e9eb1e..ede51fc23b0 100644
--- a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml
+++ b/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml
@@ -6,7 +6,7 @@
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#4c6530"/>
                 </PanelContainer.PanelOverride>
-                <Label Name="Name" Margin="6 6 6 6" HorizontalAlignment="Center"/>
+                <Label Name="NameLabel" Margin="6 6 6 6" HorizontalAlignment="Center"/>
             </PanelContainer>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
diff --git a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml.cs b/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml.cs
index 47c00188048..3c5076e68f8 100644
--- a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml.cs
+++ b/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml.cs
@@ -13,13 +13,13 @@ namespace Content.Client.MassMedia.Ui;
 public sealed partial class MiniArticleCardControl : Control
 {
     public Action? OnDeletePressed;
-    public int ArtcileNum;
+    public int ArticleNum;
 
     public MiniArticleCardControl(string name, string author)
     {
         RobustXamlLoader.Load(this);
 
-        Name.Text = name;
+        NameLabel.Text = name;
         Author.SetMarkup(author);
 
         Delete.OnPressed += _ => OnDeletePressed?.Invoke();
diff --git a/Content.Client/MassMedia/Ui/NewsWriteMenu.xaml.cs b/Content.Client/MassMedia/Ui/NewsWriteMenu.xaml.cs
index b3cbf0cf2c2..89ab1490af3 100644
--- a/Content.Client/MassMedia/Ui/NewsWriteMenu.xaml.cs
+++ b/Content.Client/MassMedia/Ui/NewsWriteMenu.xaml.cs
@@ -31,8 +31,8 @@ public void UpdateUI(NewsArticle[] articles, bool shareAvalible)
         {
             var article = articles[i];
             var mini = new MiniArticleCardControl(article.Name, (article.Author != null ? article.Author : Loc.GetString("news-read-ui-no-author")));
-            mini.ArtcileNum = i;
-            mini.OnDeletePressed += () => DeleteButtonPressed?.Invoke(mini.ArtcileNum);
+            mini.ArticleNum = i;
+            mini.OnDeletePressed += () => DeleteButtonPressed?.Invoke(mini.ArticleNum);
 
             ArticleCardsContainer.AddChild(mini);
         }
diff --git a/Content.Client/MouseRotator/MouseRotatorSystem.cs b/Content.Client/MouseRotator/MouseRotatorSystem.cs
index 9615862dc5e..44e82053554 100644
--- a/Content.Client/MouseRotator/MouseRotatorSystem.cs
+++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs
@@ -23,7 +23,7 @@ public override void Update(float frameTime)
         if (!_timing.IsFirstTimePredicted || !_input.MouseScreenPosition.IsValid)
             return;
 
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
 
         if (player == null || !TryComp<MouseRotatorComponent>(player, out var rotator))
             return;
diff --git a/Content.Client/Movement/Systems/ContentEyeSystem.cs b/Content.Client/Movement/Systems/ContentEyeSystem.cs
index d8f73b0057e..182ac92ae05 100644
--- a/Content.Client/Movement/Systems/ContentEyeSystem.cs
+++ b/Content.Client/Movement/Systems/ContentEyeSystem.cs
@@ -23,7 +23,7 @@ public void RequestZoom(EntityUid uid, Vector2 zoom, bool ignoreLimit, ContentEy
 
     public void RequestToggleFov()
     {
-        if (_player.LocalPlayer?.ControlledEntity is { } player)
+        if (_player.LocalEntity is { } player)
             RequestToggleFov(player);
     }
 
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
index 20f1fb8d7cd..c04b42f249b 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
@@ -7,6 +7,7 @@
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.NetworkConfigurator;
 
@@ -160,7 +161,7 @@ private enum ButtonPosition
     /// </summary>
     private sealed class LinksRender : Control
     {
-        public readonly List<(string, string)> Links = new();
+        public readonly List<(ProtoId<SourcePortPrototype>, ProtoId<SinkPortPrototype>)> Links = new();
         public readonly Dictionary<string, Button> SourceButtons = new();
         public readonly Dictionary<string, Button> SinkButtons = new();
         private readonly BoxContainer _leftButtonContainer;
diff --git a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
index 0cc090fcaeb..2fd4f296556 100644
--- a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
@@ -52,8 +52,7 @@ public bool ConfiguredListIsTracked(EntityUid uid, NetworkConfiguratorComponent?
     /// </summary>
     public void ToggleVisualization(EntityUid uid, bool toggle, NetworkConfiguratorComponent? component = null)
     {
-        if (_playerManager.LocalPlayer == null
-            || _playerManager.LocalPlayer.ControlledEntity == null
+        if (_playerManager.LocalEntity == null
             || !Resolve(uid, ref component)
             || component.ActiveDeviceList == null)
             return;
@@ -77,7 +76,7 @@ public void ToggleVisualization(EntityUid uid, bool toggle, NetworkConfiguratorC
         {
             var overlay = new NetworkConfiguratorLinkOverlay();
             _overlay.AddOverlay(overlay);
-            var player = _playerManager.LocalPlayer.ControlledEntity.Value;
+            var player = _playerManager.LocalEntity.Value;
             overlay.Action = Spawn(Action);
             _actions.AddActionDirect(player, overlay.Action.Value);
         }
diff --git a/Content.Client/Options/OptionsVisualizerComponent.cs b/Content.Client/Options/OptionsVisualizerComponent.cs
new file mode 100644
index 00000000000..87999f381c1
--- /dev/null
+++ b/Content.Client/Options/OptionsVisualizerComponent.cs
@@ -0,0 +1,84 @@
+using Content.Shared.CCVar;
+
+namespace Content.Client.Options;
+
+/// <summary>
+/// Allows specifying sprite alternatives depending on the client's accessibility options.
+/// </summary>
+/// <remarks>
+/// A list of layer mappings is given that the component applies to,
+/// and it will pick one entry to apply based on the settings configuration. Example:
+///
+/// <code>
+/// - type: Sprite
+///   sprite: Effects/optionsvisualizertest.rsi
+///   layers:
+///   - state: none
+///     map: [ "layer" ]
+/// - type: OptionsVisualizer
+///   visuals:
+///     layer:
+///     - options: Default
+///       data: { state: none }
+///     - options: Test
+///       data: { state: test }
+///     - options: ReducedMotion
+///       data: { state: motion }
+///     - options: [Test, ReducedMotion]
+///       data: { state: both }
+/// </code>
+/// </remarks>
+/// <seealso cref="OptionsVisualizerSystem"/>
+/// <seealso cref="OptionVisualizerOptions"/>
+[RegisterComponent]
+public sealed partial class OptionsVisualizerComponent : Component
+{
+    /// <summary>
+    /// A mapping storing data about which sprite layer keys should be controlled.
+    /// </summary>
+    /// <remarks>
+    /// Each layer stores an array of possible options. The last entry with a
+    /// <see cref="LayerDatum.Options"/> matching the active user preferences will be picked.
+    /// This allows choosing a priority if multiple entries are matched.
+    /// </remarks>
+    [DataField(required: true)]
+    public Dictionary<string, LayerDatum[]> Visuals = default!;
+
+    /// <summary>
+    /// A single option for a layer to be selected.
+    /// </summary>
+    [DataDefinition]
+    public sealed partial class LayerDatum
+    {
+        /// <summary>
+        /// Which options must be set by the user to make this datum match.
+        /// </summary>
+        [DataField]
+        public OptionVisualizerOptions Options { get; set; }
+
+        /// <summary>
+        /// The sprite layer data to set on the sprite when this datum matches.
+        /// </summary>
+        [DataField]
+        public PrototypeLayerData Data { get; set; }
+    }
+}
+
+[Flags]
+public enum OptionVisualizerOptions
+{
+    /// <summary>
+    /// Corresponds to no special options being set, can be used as a "default" state.
+    /// </summary>
+    Default = 0,
+
+    /// <summary>
+    /// Corresponds to the <see cref="CCVars.DebugOptionVisualizerTest"/> CVar being set.
+    /// </summary>
+    Test = 1 << 0,
+
+    /// <summary>
+    /// Corresponds to the <see cref="CCVars.ReducedMotion"/> CVar being set.
+    /// </summary>
+    ReducedMotion = 1 << 1,
+}
diff --git a/Content.Client/Options/OptionsVisualizerSystem.cs b/Content.Client/Options/OptionsVisualizerSystem.cs
new file mode 100644
index 00000000000..2a297e3802a
--- /dev/null
+++ b/Content.Client/Options/OptionsVisualizerSystem.cs
@@ -0,0 +1,97 @@
+using Content.Shared.CCVar;
+using Robust.Client.GameObjects;
+using Robust.Shared.Configuration;
+using Robust.Shared.Reflection;
+
+namespace Content.Client.Options;
+
+/// <summary>
+/// Implements <see cref="OptionsVisualizerComponent"/>.
+/// </summary>
+public sealed class OptionsVisualizerSystem : EntitySystem
+{
+    private static readonly (OptionVisualizerOptions, CVarDef<bool>)[] OptionVars =
+    {
+        (OptionVisualizerOptions.Test, CCVars.DebugOptionVisualizerTest),
+        (OptionVisualizerOptions.ReducedMotion, CCVars.ReducedMotion),
+    };
+
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IReflectionManager _reflection = default!;
+
+    private OptionVisualizerOptions _currentOptions;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        foreach (var (_, cvar) in OptionVars)
+        {
+            Subs.CVar(_cfg, cvar, _ => CVarChanged());
+        }
+
+        UpdateActiveOptions();
+
+        SubscribeLocalEvent<OptionsVisualizerComponent, ComponentStartup>(OnComponentStartup);
+    }
+
+    private void CVarChanged()
+    {
+        UpdateActiveOptions();
+        UpdateAllComponents();
+    }
+
+    private void UpdateActiveOptions()
+    {
+        _currentOptions = OptionVisualizerOptions.Default;
+
+        foreach (var (value, cVar) in OptionVars)
+        {
+            if (_cfg.GetCVar(cVar))
+                _currentOptions |= value;
+        }
+    }
+
+    private void UpdateAllComponents()
+    {
+        var query = EntityQueryEnumerator<OptionsVisualizerComponent, SpriteComponent>();
+        while (query.MoveNext(out _, out var component, out var sprite))
+        {
+            UpdateComponent(component, sprite);
+        }
+    }
+
+    private void OnComponentStartup(EntityUid uid, OptionsVisualizerComponent component, ComponentStartup args)
+    {
+        if (!TryComp(uid, out SpriteComponent? sprite))
+            return;
+
+        UpdateComponent(component, sprite);
+    }
+
+    private void UpdateComponent(OptionsVisualizerComponent component, SpriteComponent sprite)
+    {
+        foreach (var (layerKeyRaw, layerData) in component.Visuals)
+        {
+            object layerKey = _reflection.TryParseEnumReference(layerKeyRaw, out var @enum)
+                ? @enum
+                : layerKeyRaw;
+
+            OptionsVisualizerComponent.LayerDatum? matchedDatum = null;
+            foreach (var datum in layerData)
+            {
+                if ((datum.Options & _currentOptions) != datum.Options)
+                    continue;
+
+                matchedDatum = datum;
+            }
+
+            if (matchedDatum == null)
+                continue;
+
+            var layerIndex = sprite.LayerMapReserveBlank(layerKey);
+            sprite.LayerSetData(layerIndex, matchedDatum.Data);
+        }
+    }
+}
+
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index db176db456c..fc94ab7b0a6 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -22,6 +22,7 @@
                    FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                    StyleClasses="LabelKeyText"/>
             <CheckBox Name="ReducedMotionCheckBox" Text="{Loc 'ui-options-reduced-motion'}" />
+            <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
             <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc 'ui-options-screen-shake-intensity'}" Margin="8 0" />
                 <Slider Name="ScreenShakeIntensitySlider"
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index b5dcf6477b7..d7a600dd79d 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -63,6 +63,7 @@ public MiscTab()
             OpaqueStorageWindowCheckBox.OnToggled += OnCheckBoxToggled;
             FancySpeechBubblesCheckBox.OnToggled += OnCheckBoxToggled;
             FancyNameBackgroundsCheckBox.OnToggled += OnCheckBoxToggled;
+            EnableColorNameCheckBox.OnToggled += OnCheckBoxToggled;
             ReducedMotionCheckBox.OnToggled += OnCheckBoxToggled;
             ScreenShakeIntensitySlider.OnValueChanged += OnScreenShakeIntensitySliderChanged;
             // ToggleWalk.OnToggled += OnCheckBoxToggled;
@@ -76,6 +77,7 @@ public MiscTab()
             OpaqueStorageWindowCheckBox.Pressed = _cfg.GetCVar(CCVars.OpaqueStorageWindow);
             FancySpeechBubblesCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
             FancyNameBackgroundsCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatFancyNameBackground);
+            EnableColorNameCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableColorName);
             ReducedMotionCheckBox.Pressed = _cfg.GetCVar(CCVars.ReducedMotion);
             ScreenShakeIntensitySlider.Value = _cfg.GetCVar(CCVars.ScreenShakeIntensity) * 100f;
             // ToggleWalk.Pressed = _cfg.GetCVar(CCVars.ToggleWalk);
@@ -120,6 +122,7 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CCVars.LoocAboveHeadShow, ShowLoocAboveHeadCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.ChatEnableColorName, EnableColorNameCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ReducedMotion, ReducedMotionCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider.Value / 100f);
             // _cfg.SetCVar(CCVars.ToggleWalk, ToggleWalk.Pressed);
@@ -145,6 +148,7 @@ private void UpdateApplyButton()
             var isLoocShowSame = ShowLoocAboveHeadCheckBox.Pressed == _cfg.GetCVar(CCVars.LoocAboveHeadShow);
             var isFancyChatSame = FancySpeechBubblesCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
             var isFancyBackgroundSame = FancyNameBackgroundsCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatFancyNameBackground);
+            var isEnableColorNameSame = EnableColorNameCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableColorName);
             var isReducedMotionSame = ReducedMotionCheckBox.Pressed == _cfg.GetCVar(CCVars.ReducedMotion);
             var isScreenShakeIntensitySame = Math.Abs(ScreenShakeIntensitySlider.Value / 100f - _cfg.GetCVar(CCVars.ScreenShakeIntensity)) < 0.01f;
             // var isToggleWalkSame = ToggleWalk.Pressed == _cfg.GetCVar(CCVars.ToggleWalk);
@@ -159,6 +163,7 @@ private void UpdateApplyButton()
                                    isLoocShowSame &&
                                    isFancyChatSame &&
                                    isFancyBackgroundSame &&
+                                   isEnableColorNameSame &&
                                    isReducedMotionSame &&
                                    isScreenShakeIntensitySame &&
                                    // isToggleWalkSame &&
diff --git a/Content.Client/Outline/InteractionOutlineSystem.cs b/Content.Client/Outline/InteractionOutlineSystem.cs
index bb341785d03..3dbbafbcaa3 100644
--- a/Content.Client/Outline/InteractionOutlineSystem.cs
+++ b/Content.Client/Outline/InteractionOutlineSystem.cs
@@ -40,17 +40,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        _configManager.OnValueChanged(CCVars.OutlineEnabled, SetCvarEnabled);
+        Subs.CVar(_configManager, CCVars.OutlineEnabled, SetCvarEnabled);
         UpdatesAfter.Add(typeof(SharedEyeSystem));
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _configManager.UnsubValueChanged(CCVars.OutlineEnabled, SetCvarEnabled);
-    }
-
     public void SetCvarEnabled(bool cvarEnabled)
     {
         _cvarEnabled = cvarEnabled;
@@ -94,8 +87,8 @@ public override void FrameUpdate(float frameTime)
             return;
 
         // If there is no local player, there is no session, and therefore nothing to do here.
-        var localPlayer = _playerManager.LocalPlayer;
-        if (localPlayer == null)
+        var localSession = _playerManager.LocalSession;
+        if (localSession == null)
             return;
 
         // TODO InteractionOutlineComponent
@@ -135,9 +128,9 @@ public override void FrameUpdate(float frameTime)
         }
 
         var inRange = false;
-        if (localPlayer.ControlledEntity != null && !Deleted(entityToClick))
+        if (localSession.AttachedEntity != null && !Deleted(entityToClick))
         {
-            inRange = _interactionSystem.InRangeUnobstructed(localPlayer.ControlledEntity.Value, entityToClick.Value);
+            inRange = _interactionSystem.InRangeUnobstructed(localSession.AttachedEntity.Value, entityToClick.Value);
         }
 
         InteractionOutlineComponent? outline;
diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs
index 1c396585b3d..2a6867f51f5 100644
--- a/Content.Client/Outline/TargetOutlineSystem.cs
+++ b/Content.Client/Outline/TargetOutlineSystem.cs
@@ -114,7 +114,7 @@ public override void Update(float frameTime)
 
     private void HighlightTargets()
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity is not { Valid: true } player)
+        if (_playerManager.LocalEntity is not { Valid: true } player)
             return;
 
         // remove current highlights
diff --git a/Content.Client/Parallax/ParallaxSystem.cs b/Content.Client/Parallax/ParallaxSystem.cs
index 720da72e80e..db4cec0be80 100644
--- a/Content.Client/Parallax/ParallaxSystem.cs
+++ b/Content.Client/Parallax/ParallaxSystem.cs
@@ -13,7 +13,6 @@ public sealed class ParallaxSystem : SharedParallaxSystem
     [Dependency] private readonly IMapManager _map = default!;
     [Dependency] private readonly IOverlayManager _overlay = default!;
     [Dependency] private readonly IParallaxManager _parallax = default!;
-    [Dependency] private readonly IPrototypeManager _protoManager = default!;
 
     [ValidatePrototypeId<ParallaxPrototype>]
     private const string Fallback = "Default";
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index 763f7b01145..7a8a6e39cff 100644
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -30,13 +30,13 @@ public override void Initialize()
         private void OnUpdatePredicted(EntityUid uid, InputMoverComponent component, ref UpdateIsPredictedEvent args)
         {
             // Enable prediction if an entity is controlled by the player
-            if (uid == _playerManager.LocalPlayer?.ControlledEntity)
+            if (uid == _playerManager.LocalEntity)
                 args.IsPredicted = true;
         }
 
         private void OnUpdateRelayTargetPredicted(EntityUid uid, MovementRelayTargetComponent component, ref UpdateIsPredictedEvent args)
         {
-            if (component.Source == _playerManager.LocalPlayer?.ControlledEntity)
+            if (component.Source == _playerManager.LocalEntity)
                 args.IsPredicted = true;
         }
 
@@ -45,7 +45,7 @@ private void OnUpdatePullablePredicted(EntityUid uid, SharedPullableComponent co
             // Enable prediction if an entity is being pulled by the player.
             // Disable prediction if an entity is being pulled by some non-player entity.
 
-            if (component.Puller == _playerManager.LocalPlayer?.ControlledEntity)
+            if (component.Puller == _playerManager.LocalEntity)
                 args.IsPredicted = true;
             else if (component.Puller != null)
                 args.BlockPrediction = true;
@@ -84,7 +84,7 @@ public override void UpdateBeforeSolve(bool prediction, float frameTime)
         {
             base.UpdateBeforeSolve(prediction, frameTime);
 
-            if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} player)
+            if (_playerManager.LocalEntity is not {Valid: true} player)
                 return;
 
             if (RelayQuery.TryGetComponent(player, out var relayMover))
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index 5027f776639..3b1e65c34e1 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -95,7 +95,7 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
             return true;
         }
 
-        var player = _playerManager.LocalPlayer?.Session;
+        var player = _playerManager.LocalSession;
         if (player == null)
             return true;
 
diff --git a/Content.Client/Pointing/PointingSystem.Visualizer.cs b/Content.Client/Pointing/PointingSystem.Visualizer.cs
index 63ce882e060..e15923618ad 100644
--- a/Content.Client/Pointing/PointingSystem.Visualizer.cs
+++ b/Content.Client/Pointing/PointingSystem.Visualizer.cs
@@ -1,7 +1,8 @@
 using Content.Client.Pointing.Components;
 using Content.Shared.Pointing;
-using Robust.Client.GameObjects;
 using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
 using Robust.Shared.Animations;
 using System.Numerics;
 
@@ -9,7 +10,9 @@ namespace Content.Client.Pointing;
 
 public sealed partial class PointingSystem : SharedPointingSystem
 {
+    [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!;
+    [Dependency] private readonly TransformSystem _transformSystem = default!;
 
     public void InitializeVisualizer()
     {
@@ -27,6 +30,8 @@ private void BeginPointAnimation(EntityUid uid, Vector2 startPosition, Vector2 o
         if (_animationPlayer.HasRunningAnimation(uid, animationKey))
             return;
 
+        startPosition = new Angle(_eyeManager.CurrentEye.Rotation + _transformSystem.GetWorldRotation(uid)).RotateVec(startPosition);
+
         var animation = new Animation
         {
             Length = PointDuration,
diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs
index 5adc2e1ff0c..1305d8bb947 100644
--- a/Content.Client/Popups/PopupOverlay.cs
+++ b/Content.Client/Popups/PopupOverlay.cs
@@ -1,12 +1,6 @@
-using System.Numerics;
-using Content.Client.Examine;
-using Content.Shared.CCVar;
 using Content.Shared.Examine;
-using Content.Shared.Interaction;
-using Content.Shared.Popups;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
-using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Shared;
 using Robust.Shared.Configuration;
@@ -26,11 +20,9 @@ public sealed class PopupOverlay : Overlay
     private readonly IPlayerManager _playerMgr;
     private readonly IUserInterfaceManager _uiManager;
     private readonly PopupSystem _popup;
+    private readonly PopupUIController _controller;
 
     private readonly ShaderInstance _shader;
-    private readonly Font _smallFont;
-    private readonly Font _mediumFont;
-    private readonly Font _largeFont;
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
 
@@ -39,8 +31,8 @@ public PopupOverlay(
         IEntityManager entManager,
         IPlayerManager playerMgr,
         IPrototypeManager protoManager,
-        IResourceCache cache,
         IUserInterfaceManager uiManager,
+        PopupUIController controller,
         PopupSystem popup)
     {
         _configManager = configManager;
@@ -48,11 +40,9 @@ public PopupOverlay(
         _playerMgr = playerMgr;
         _uiManager = uiManager;
         _popup = popup;
+        _controller = controller;
 
         _shader = protoManager.Index<ShaderPrototype>("unshaded").Instance();
-        _smallFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Italic.ttf"), 10);
-        _mediumFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Italic.ttf"), 12);
-        _largeFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-BoldItalic.ttf"), 14);
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -68,19 +58,18 @@ protected override void Draw(in OverlayDrawArgs args)
             scale = _uiManager.DefaultUIScale;
 
         DrawWorld(args.ScreenHandle, args, scale);
-        DrawScreen(args.ScreenHandle, args, scale);
 
         args.DrawingHandle.UseShader(null);
     }
 
     private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, float scale)
     {
-        if (_popup.WorldLabels.Count == 0)
+        if (_popup.WorldLabels.Count == 0 || args.ViewportControl == null)
             return;
 
-        var matrix = args.ViewportControl!.GetWorldToScreenMatrix();
+        var matrix = args.ViewportControl.GetWorldToScreenMatrix();
         var viewPos = new MapCoordinates(args.WorldAABB.Center, args.MapId);
-        var ourEntity = _playerMgr.LocalPlayer?.ControlledEntity;
+        var ourEntity = _playerMgr.LocalEntity;
 
         foreach (var popup in _popup.WorldLabels)
         {
@@ -92,62 +81,12 @@ private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, fl
             var distance = (mapPos.Position - args.WorldBounds.Center).Length();
 
             // Should handle fade here too wyci.
-            if (!args.WorldAABB.Contains(mapPos.Position) || !ExamineSystemShared.InRangeUnOccluded(viewPos, mapPos, distance,
+            if (!args.WorldBounds.Contains(mapPos.Position) || !ExamineSystemShared.InRangeUnOccluded(viewPos, mapPos, distance,
                     e => e == popup.InitialPos.EntityId || e == ourEntity, entMan: _entManager))
                 continue;
 
             var pos = matrix.Transform(mapPos.Position);
-            DrawPopup(popup, worldHandle, pos, scale);
+            _controller.DrawPopup(popup, worldHandle, pos, scale);
         }
     }
-
-    private void DrawScreen(DrawingHandleScreen screenHandle, OverlayDrawArgs args, float scale)
-    {
-        foreach (var popup in _popup.CursorLabels)
-        {
-            // Different window
-            if (popup.InitialPos.Window != args.ViewportControl?.Window?.Id)
-                continue;
-
-            DrawPopup(popup, screenHandle, popup.InitialPos.Position, scale);
-        }
-    }
-
-    private void DrawPopup(PopupSystem.PopupLabel popup, DrawingHandleScreen handle, Vector2 position, float scale)
-    {
-        var lifetime = PopupSystem.GetPopupLifetime(popup);
-
-        // Keep alpha at 1 until TotalTime passes half its lifetime, then gradually decrease to 0.
-        var alpha = MathF.Min(1f, 1f - MathF.Max(0f, popup.TotalTime - lifetime / 2) * 2 / lifetime);
-
-        var updatedPosition = position - new Vector2(0f, MathF.Min(8f, 12f * (popup.TotalTime * popup.TotalTime + popup.TotalTime)));
-        var font = _smallFont;
-        var color = Color.White.WithAlpha(alpha);
-
-        switch (popup.Type)
-        {
-            case PopupType.SmallCaution:
-                color = Color.Red;
-                break;
-            case PopupType.Medium:
-                font = _mediumFont;
-                color = Color.LightGray;
-                break;
-            case PopupType.MediumCaution:
-                font = _mediumFont;
-                color = Color.Red;
-                break;
-            case PopupType.Large:
-                font = _largeFont;
-                color = Color.LightGray;
-                break;
-            case PopupType.LargeCaution:
-                font = _largeFont;
-                color = Color.Red;
-                break;
-        }
-
-        var dimensions = handle.GetDimensions(font, popup.Text, scale);
-        handle.DrawString(font, updatedPosition - dimensions / 2f, popup.Text, scale, color.WithAlpha(alpha));
-    }
 }
diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index d9e66c79fa9..2c923ae3a71 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -23,7 +23,6 @@ public sealed class PopupSystem : SharedPopupSystem
         [Dependency] private readonly IOverlayManager _overlay = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _prototype = default!;
-        [Dependency] private readonly IResourceCache _resource = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
         [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
@@ -45,7 +44,14 @@ public override void Initialize()
             SubscribeNetworkEvent<PopupEntityEvent>(OnPopupEntityEvent);
             SubscribeNetworkEvent<RoundRestartCleanupEvent>(OnRoundRestart);
             _overlay
-                .AddOverlay(new PopupOverlay(_configManager, EntityManager, _playerManager, _prototype, _resource, _uiManager, this));
+                .AddOverlay(new PopupOverlay(
+                    _configManager,
+                    EntityManager,
+                    _playerManager,
+                    _prototype,
+                    _uiManager,
+                    _uiManager.GetUIController<PopupUIController>(),
+                    this));
         }
 
         public override void Shutdown()
diff --git a/Content.Client/Popups/PopupUIController.cs b/Content.Client/Popups/PopupUIController.cs
new file mode 100644
index 00000000000..8ce8ae21e19
--- /dev/null
+++ b/Content.Client/Popups/PopupUIController.cs
@@ -0,0 +1,121 @@
+using System.Numerics;
+using Content.Client.Gameplay;
+using Content.Shared.Popups;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controllers;
+
+namespace Content.Client.Popups;
+
+/// <summary>
+/// Handles screens-space popups. World popups are handled via PopupOverlay.
+/// </summary>
+public sealed class PopupUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>
+{
+    [UISystemDependency] private readonly PopupSystem? _popup = default!;
+
+    private Font _smallFont = default!;
+    private Font _mediumFont = default!;
+    private Font _largeFont = default!;
+
+    private PopupRootControl? _popupControl;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        var cache = IoCManager.Resolve<IResourceCache>();
+
+        _smallFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Italic.ttf"), 10);
+        _mediumFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Italic.ttf"), 12);
+        _largeFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-BoldItalic.ttf"), 14);
+    }
+
+    public void OnStateEntered(GameplayState state)
+    {
+        _popupControl = new PopupRootControl(_popup, this);
+
+        UIManager.RootControl.AddChild(_popupControl);
+    }
+
+    public void OnStateExited(GameplayState state)
+    {
+        if (_popupControl == null)
+            return;
+
+        UIManager.RootControl.RemoveChild(_popupControl);
+        _popupControl = null;
+    }
+
+    public void DrawPopup(PopupSystem.PopupLabel popup, DrawingHandleScreen handle, Vector2 position, float scale)
+    {
+        var lifetime = PopupSystem.GetPopupLifetime(popup);
+
+        // Keep alpha at 1 until TotalTime passes half its lifetime, then gradually decrease to 0.
+        var alpha = MathF.Min(1f, 1f - MathF.Max(0f, popup.TotalTime - lifetime / 2) * 2 / lifetime);
+
+        var updatedPosition = position - new Vector2(0f, MathF.Min(8f, 12f * (popup.TotalTime * popup.TotalTime + popup.TotalTime)));
+        var font = _smallFont;
+        var color = Color.White.WithAlpha(alpha);
+
+        switch (popup.Type)
+        {
+            case PopupType.SmallCaution:
+                color = Color.Red;
+                break;
+            case PopupType.Medium:
+                font = _mediumFont;
+                color = Color.LightGray;
+                break;
+            case PopupType.MediumCaution:
+                font = _mediumFont;
+                color = Color.Red;
+                break;
+            case PopupType.Large:
+                font = _largeFont;
+                color = Color.LightGray;
+                break;
+            case PopupType.LargeCaution:
+                font = _largeFont;
+                color = Color.Red;
+                break;
+        }
+
+        var dimensions = handle.GetDimensions(font, popup.Text, scale);
+        handle.DrawString(font, updatedPosition - dimensions / 2f, popup.Text, scale, color.WithAlpha(alpha));
+    }
+
+    /// <summary>
+    /// Handles drawing all screen popups.
+    /// </summary>
+    private sealed class PopupRootControl : Control
+    {
+        private readonly PopupSystem? _popup;
+        private readonly PopupUIController _controller;
+
+        public PopupRootControl(PopupSystem? system, PopupUIController controller)
+        {
+            _popup = system;
+            _controller = controller;
+        }
+
+        protected override void Draw(DrawingHandleScreen handle)
+        {
+            base.Draw(handle);
+
+            if (_popup == null)
+                return;
+
+            // Different window
+            var windowId = UserInterfaceManager.RootControl.Window.Id;
+
+            foreach (var popup in _popup.CursorLabels)
+            {
+                if (popup.InitialPos.Window != windowId)
+                    continue;
+
+                _controller.DrawPopup(popup, handle, popup.InitialPos.Position, UIScale);
+            }
+        }
+    }
+}
diff --git a/Content.Client/Replay/ContentReplayPlaybackManager.cs b/Content.Client/Replay/ContentReplayPlaybackManager.cs
index 37c066f5942..bc979575f58 100644
--- a/Content.Client/Replay/ContentReplayPlaybackManager.cs
+++ b/Content.Client/Replay/ContentReplayPlaybackManager.cs
@@ -121,7 +121,7 @@ private bool OnHandleReplayMessage(object message, bool skipEffects)
                 // Mark as handled -- the event won't get raised.
                 return true;
             case TickerJoinGameEvent:
-                if (!_entMan.EntityExists(_player.LocalPlayer?.ControlledEntity))
+                if (!_entMan.EntityExists(_player.LocalEntity))
                     _entMan.System<ReplaySpectatorSystem>().SetSpectatorPosition(default);
                 return true;
             case ChatMessage chat:
diff --git a/Content.Client/Replay/ReplayConGroup.cs b/Content.Client/Replay/ReplayConGroup.cs
index 8e856326831..cec20df4125 100644
--- a/Content.Client/Replay/ReplayConGroup.cs
+++ b/Content.Client/Replay/ReplayConGroup.cs
@@ -4,7 +4,7 @@ namespace Content.Client.Replay;
 
 public sealed class ReplayConGroup : IClientConGroupImplementation
 {
-    public event Action? ConGroupUpdated;
+    public event Action? ConGroupUpdated { add { } remove { } }
     public bool CanAdminMenu() => true;
     public bool CanAdminPlace() => true;
     public bool CanCommand(string cmdName) => true;
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
index 52abd0df084..b364b833124 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -63,7 +63,7 @@ public void  UpdatePanels(ResearchConsoleBoundInterfaceState state)
             MinHeight = 10
         });
 
-        var hasAccess = _player.LocalPlayer?.ControlledEntity is not { } local ||
+        var hasAccess = _player.LocalEntity is not { } local ||
                         !_entity.TryGetComponent<AccessReaderComponent>(Entity, out var access) ||
                         _accessReader.IsAllowed(local, Entity, access);
         foreach (var techId in _technologyDatabase.CurrentTechnologyCards)
diff --git a/Content.Client/Salvage/SalvageSystem.cs b/Content.Client/Salvage/SalvageSystem.cs
index 0a73c727a4e..fb305c5fdc4 100644
--- a/Content.Client/Salvage/SalvageSystem.cs
+++ b/Content.Client/Salvage/SalvageSystem.cs
@@ -36,7 +36,7 @@ private void OnPlayAmbientMusic(ref PlayAmbientMusicEvent ev)
         if (ev.Cancelled)
             return;
 
-        var player = _playerManager.LocalPlayer?.ControlledEntity;
+        var player = _playerManager.LocalEntity;
 
         if (!TryComp<TransformComponent>(player, out var xform) ||
             !TryComp<SalvageExpeditionComponent>(xform.MapUid, out var expedition) ||
diff --git a/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs
index 20fff4acfad..3bf4bc966a5 100644
--- a/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -35,7 +35,7 @@ public override void Shutdown()
         protected override void HandlePilotShutdown(EntityUid uid, PilotComponent component, ComponentShutdown args)
         {
             base.HandlePilotShutdown(uid, component, args);
-            if (_playerManager.LocalPlayer?.ControlledEntity != uid) return;
+            if (_playerManager.LocalEntity != uid) return;
 
             _input.Contexts.SetActiveContext("human");
         }
diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
index 565c3b8e43c..4135490416f 100644
--- a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
+++ b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
@@ -19,8 +19,6 @@ public sealed partial class LawDisplay : Control
     [Dependency] private readonly IChatManager _chatManager = default!;
     [Dependency] private readonly EntityManager _entityManager = default!;
 
-    public event Action<BaseButton.ButtonEventArgs>? OnLawAnnouncementButtonPressed;
-
     public LawDisplay(EntityUid uid, SiliconLaw law, HashSet<string>? radioChannels)
     {
         RobustXamlLoader.Load(this);
diff --git a/Content.Client/Singularity/Systems/EmitterSystem.cs b/Content.Client/Singularity/Systems/EmitterSystem.cs
index 5eb80928d88..e3396d74a29 100644
--- a/Content.Client/Singularity/Systems/EmitterSystem.cs
+++ b/Content.Client/Singularity/Systems/EmitterSystem.cs
@@ -1,7 +1,5 @@
-using Content.Client.Storage.Visualizers;
-using Content.Shared.Singularity.Components;
+using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
-using Content.Shared.Storage;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Singularity.Systems;
@@ -21,14 +19,6 @@ private void OnAppearanceChange(EntityUid uid, EmitterComponent component, ref A
         if (args.Sprite == null)
             return;
 
-        if (args.Sprite.LayerMapTryGet(StorageVisualLayers.Lock, out var lockLayer))
-        {
-            if (!_appearance.TryGetData<bool>(uid, StorageVisuals.Locked, out var locked, args.Component))
-                locked = false;
-
-            args.Sprite.LayerSetVisible(lockLayer, locked);
-        }
-
         if (!_appearance.TryGetData<EmitterVisualState>(uid, EmitterVisuals.VisualState, out var state, args.Component))
             state = EmitterVisualState.Off;
 
diff --git a/Content.Client/Sprite/SpriteFadeSystem.cs b/Content.Client/Sprite/SpriteFadeSystem.cs
index d4ed1285a89..dda3a6c948e 100644
--- a/Content.Client/Sprite/SpriteFadeSystem.cs
+++ b/Content.Client/Sprite/SpriteFadeSystem.cs
@@ -39,7 +39,7 @@ public override void FrameUpdate(float frameTime)
     {
         base.FrameUpdate(frameTime);
 
-        var player = _playerManager.LocalPlayer?.ControlledEntity;
+        var player = _playerManager.LocalEntity;
         var spriteQuery = GetEntityQuery<SpriteComponent>();
         var change = ChangeRate * frameTime;
 
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index 3e7161b1fb5..0d13baef936 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -84,21 +84,27 @@ protected override void Draw(in OverlayDrawArgs args)
                 {
                     if (accOffsetL + texture.Height > sprite.Bounds.Height * EyeManager.PixelsPerMeter)
                         break;
-                    accOffsetL += texture.Height;
+                    if (proto.Layer == StatusIconLayer.Base)
+                    {
+                        accOffsetL += texture.Height;
+                        countL++;
+                    }
                     yOffset = (bounds.Height + sprite.Offset.Y) / 2f - (float) accOffsetL / EyeManager.PixelsPerMeter;
                     xOffset = -(bounds.Width + sprite.Offset.X) / 2f;
 
-                    countL++;
                 }
                 else
                 {
                     if (accOffsetR + texture.Height > sprite.Bounds.Height * EyeManager.PixelsPerMeter)
                         break;
-                    accOffsetR += texture.Height;
+                    if (proto.Layer == StatusIconLayer.Base)
+                    {
+                        accOffsetR += texture.Height;
+                        countR++;
+                    }
                     yOffset = (bounds.Height + sprite.Offset.Y) / 2f - (float) accOffsetR / EyeManager.PixelsPerMeter;
                     xOffset = (bounds.Width + sprite.Offset.X) / 2f - (float) texture.Width / EyeManager.PixelsPerMeter;
 
-                    countR++;
                 }
 
                 var position = new Vector2(xOffset, yOffset);
diff --git a/Content.Client/StatusIcon/StatusIconSystem.cs b/Content.Client/StatusIcon/StatusIconSystem.cs
index bd708b63d01..980fd9f2a92 100644
--- a/Content.Client/StatusIcon/StatusIconSystem.cs
+++ b/Content.Client/StatusIcon/StatusIconSystem.cs
@@ -20,16 +20,8 @@ public sealed class StatusIconSystem : SharedStatusIconSystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        _configuration.OnValueChanged(CCVars.LocalStatusIconsEnabled, OnLocalStatusIconChanged, true);
-        _configuration.OnValueChanged(CCVars.GlobalStatusIconsEnabled, OnGlobalStatusIconChanged, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _configuration.UnsubValueChanged(CCVars.LocalStatusIconsEnabled, OnLocalStatusIconChanged);
-        _configuration.UnsubValueChanged(CCVars.GlobalStatusIconsEnabled, OnGlobalStatusIconChanged);
+        Subs.CVar(_configuration, CCVars.LocalStatusIconsEnabled, OnLocalStatusIconChanged, true);
+        Subs.CVar(_configuration, CCVars.GlobalStatusIconsEnabled, OnGlobalStatusIconChanged, true);
     }
 
     private void OnLocalStatusIconChanged(bool obj)
diff --git a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
index 772f516a692..ee4f2fdfd6c 100644
--- a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
+++ b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
@@ -70,25 +70,11 @@ protected override void OnAppearanceChange(EntityUid uid, EntityStorageVisualsCo
                     args.Sprite.LayerSetState(StorageVisualLayers.Base, comp.StateBaseClosed);
             }
         }
-
-        // Lock state for the storage entity. TODO: Split into its own visualizer.
-        if (AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.CanLock, out var canLock, args.Component) && canLock)
-        {
-            if (!AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.Locked, out var locked, args.Component))
-                locked = true;
-
-            args.Sprite.LayerSetVisible(StorageVisualLayers.Lock, !open);
-            if (!open)
-            {
-                args.Sprite.LayerSetState(StorageVisualLayers.Lock, locked ? comp.StateLocked : comp.StateUnlocked);
-            }
-        }
     }
 }
 
 public enum StorageVisualLayers : byte
 {
     Base,
-    Door,
-    Lock
+    Door
 }
diff --git a/Content.Client/Storage/Visualizers/EntityStorageVisualsComponent.cs b/Content.Client/Storage/Visualizers/EntityStorageVisualsComponent.cs
index dc171d6c54e..2215d8cd70d 100644
--- a/Content.Client/Storage/Visualizers/EntityStorageVisualsComponent.cs
+++ b/Content.Client/Storage/Visualizers/EntityStorageVisualsComponent.cs
@@ -32,20 +32,6 @@ public sealed partial class EntityStorageVisualsComponent : Component
     [ViewVariables(VVAccess.ReadWrite)]
     public string? StateDoorClosed;
 
-    /// <summary>
-    /// The RSI state used for the lock indicator while the storage is locked.
-    /// </summary>
-    [DataField("stateLocked")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? StateLocked = "locked";
-
-    /// <summary>
-    /// The RSI state used for the lock indicator while the storage is unlocked.
-    /// </summary>
-    [DataField("stateUnlocked")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? StateUnlocked = "unlocked";
-
     /// <summary>
     /// The drawdepth the object has when it's open
     /// </summary>
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index c909e3db3c0..345b218c935 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -998,6 +998,18 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                         itemListBackgroundSelected)
                 }),
 
+                 new StyleRule(new SelectorElement(typeof(ItemList), new[] {"transparentBackgroundItemList"}, null, null), new[]
+                {
+                    new StyleProperty(ItemList.StylePropertyBackground,
+                        new StyleBoxFlat {BackgroundColor = Color.Transparent}),
+                    new StyleProperty(ItemList.StylePropertyItemBackground,
+                        itemListItemBackground),
+                    new StyleProperty(ItemList.StylePropertyDisabledItemBackground,
+                        itemListItemBackgroundDisabled),
+                    new StyleProperty(ItemList.StylePropertySelectedItemBackground,
+                        itemListBackgroundSelected)
+                }),
+
                 // Tree
                 new StyleRule(new SelectorElement(typeof(Tree), null, null, null), new[]
                 {
diff --git a/Content.Client/SubFloor/SubFloorHideSystem.cs b/Content.Client/SubFloor/SubFloorHideSystem.cs
index 482ab94a001..64d3afc640e 100644
--- a/Content.Client/SubFloor/SubFloorHideSystem.cs
+++ b/Content.Client/SubFloor/SubFloorHideSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.DrawDepth;
 using Content.Shared.SubFloor;
 using Robust.Client.GameObjects;
 
@@ -62,6 +63,18 @@ private void OnAppearanceChanged(EntityUid uid, SubFloorHideComponent component,
         }
 
         args.Sprite.Visible = hasVisibleLayer || revealed;
+
+        // allows a t-ray to show wires/pipes above carpets/puddles
+        if (scannerRevealed)
+        {
+            component.OriginalDrawDepth ??= args.Sprite.DrawDepth;
+            args.Sprite.DrawDepth = (int) Shared.DrawDepth.DrawDepth.FloorObjects + 1;
+        }
+        else if (component.OriginalDrawDepth.HasValue)
+        {
+            args.Sprite.DrawDepth = component.OriginalDrawDepth.Value;
+            component.OriginalDrawDepth = null;
+        }
     }
 
     private void UpdateAll()
diff --git a/Content.Client/SubFloor/TrayScannerSystem.cs b/Content.Client/SubFloor/TrayScannerSystem.cs
index f4ba455303c..95bce03c0f9 100644
--- a/Content.Client/SubFloor/TrayScannerSystem.cs
+++ b/Content.Client/SubFloor/TrayScannerSystem.cs
@@ -33,7 +33,7 @@ public override void Update(float frameTime)
             return;
 
         // TODO: Multiple viewports or w/e
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
         var xformQuery = GetEntityQuery<TransformComponent>();
 
         if (!xformQuery.TryGetComponent(player, out var playerXform))
diff --git a/Content.Client/Tabletop/TabletopSystem.cs b/Content.Client/Tabletop/TabletopSystem.cs
index c71c34d0efd..696c1455e0c 100644
--- a/Content.Client/Tabletop/TabletopSystem.cs
+++ b/Content.Client/Tabletop/TabletopSystem.cs
@@ -64,7 +64,8 @@ public override void FrameUpdate(float frameTime)
                 return;
 
             // If there is no player entity, return
-            if (_playerManager.LocalPlayer is not { ControlledEntity: { } playerEntity }) return;
+            if (_playerManager.LocalEntity is not { } playerEntity)
+                return;
 
             if (!CanSeeTable(playerEntity, _table))
             {
@@ -85,7 +86,7 @@ public override void FrameUpdate(float frameTime)
             // If the dragged entity has another dragging player, drop the item
             // This should happen if the local player is dragging an item, and another player grabs it out of their hand
             if (draggableComponent.DraggingPlayer != null &&
-                draggableComponent.DraggingPlayer != _playerManager.LocalPlayer?.Session.UserId)
+                draggableComponent.DraggingPlayer != _playerManager.LocalSession!.UserId)
             {
                 StopDragging(false);
                 return;
@@ -186,7 +187,7 @@ private bool OnUseSecondary(in PointerInputCmdArgs args)
         private bool OnMouseDown(in PointerInputCmdArgs args)
         {
             // Return if no player entity
-            if (_playerManager.LocalPlayer is not {ControlledEntity: { } playerEntity})
+            if (_playerManager.LocalEntity is not { } playerEntity)
                 return false;
 
             var entity = args.EntityUid;
diff --git a/Content.Client/Traits/ParacusiaSystem.cs b/Content.Client/Traits/ParacusiaSystem.cs
index c661254bc95..3789f24cb0d 100644
--- a/Content.Client/Traits/ParacusiaSystem.cs
+++ b/Content.Client/Traits/ParacusiaSystem.cs
@@ -30,7 +30,7 @@ public override void Update(float frameTime)
         if (!_timing.IsFirstTimePredicted)
             return;
 
-        if (_player.LocalPlayer?.ControlledEntity is not EntityUid localPlayer)
+        if (_player.LocalEntity is not EntityUid localPlayer)
             return;
 
         PlayParacusiaSounds(localPlayer);
diff --git a/Content.Client/UserInterface/Controls/SplitBar.xaml.cs b/Content.Client/UserInterface/Controls/SplitBar.xaml.cs
index 7273f327bfb..2c0b716448e 100644
--- a/Content.Client/UserInterface/Controls/SplitBar.xaml.cs
+++ b/Content.Client/UserInterface/Controls/SplitBar.xaml.cs
@@ -7,6 +7,7 @@
 namespace Content.Client.UserInterface.Controls
 {
     [GenerateTypedNameReferences]
+    [Virtual]
     public partial class SplitBar : BoxContainer
     {
         public Vector2 MinBarSize = new(24, 0);
diff --git a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
index a8c4a2b1b41..791d5910f41 100644
--- a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
+++ b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
@@ -169,7 +169,7 @@ public void EnsureUIHelper()
             return;
 
         UIHelper?.Dispose();
-        var ownerUserId = _playerManager.LocalPlayer!.UserId;
+        var ownerUserId = _playerManager.LocalUser!.Value;
         UIHelper = isAdmin ? new AdminAHelpUIHandler(ownerUserId) : new UserAHelpUIHandler(ownerUserId);
         UIHelper.DiscordRelayChanged(_discordRelayActive);
 
@@ -182,15 +182,15 @@ public void EnsureUIHelper()
 
     public void Open()
     {
-        var localPlayer = _playerManager.LocalPlayer;
-        if (localPlayer == null)
+        var localUser = _playerManager.LocalUser;
+        if (localUser == null)
         {
             return;
         }
         EnsureUIHelper();
         if (UIHelper!.IsOpen)
             return;
-        UIHelper!.Open(localPlayer.UserId, _discordRelayActive);
+        UIHelper!.Open(localUser.Value, _discordRelayActive);
     }
 
     public void Open(NetUserId userId)
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 69cac8ff315..07c8ccacea1 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -15,10 +15,12 @@
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
+using Content.Shared.Decals;
 using Content.Shared.Damage.ForceSay;
 using Content.Shared.Examine;
 using Content.Shared.Input;
 using Content.Shared.Radio;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
@@ -27,9 +29,11 @@
 using Robust.Client.UserInterface.Controllers;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Configuration;
+using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -43,9 +47,11 @@ public sealed class ChatUIController : UIController
     [Dependency] private readonly IChatManager _manager = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly IEyeManager _eye = default!;
+    [Dependency] private readonly IEntityManager _ent = default!;
     [Dependency] private readonly IInputManager _input = default!;
     [Dependency] private readonly IClientNetManager _net = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IStateManager _state = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
@@ -57,6 +63,11 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
     [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //Nyano - Summary: makes the psionic chat available.
 
+    [ValidatePrototypeId<ColorPalettePrototype>]
+    private const string ChatNamePalette = "ChatNames";
+    private string[] _chatNameColors = default!;
+    private bool _chatNameColorsEnabled;
+
     private ISawmill _sawmill = default!;
 
     public static readonly Dictionary<char, ChatSelectChannel> PrefixToChannel = new()
@@ -173,6 +184,8 @@ public override void Initialize()
         _net.RegisterNetMessage<MsgChatMessage>(OnChatMessage);
         _net.RegisterNetMessage<MsgDeleteChatMessagesBy>(OnDeleteChatMessagesBy);
         SubscribeNetworkEvent<DamageForceSayEvent>(OnDamageForceSay);
+        _cfg.OnValueChanged(CCVars.ChatEnableColorName, (value) => { _chatNameColorsEnabled = value; });
+        _chatNameColorsEnabled = _cfg.GetCVar(CCVars.ChatEnableColorName);
 
         _speechBubbleRoot = new LayoutContainer();
 
@@ -217,6 +230,13 @@ public override void Initialize()
         var gameplayStateLoad = UIManager.GetUIController<GameplayStateLoadController>();
         gameplayStateLoad.OnScreenLoad += OnScreenLoad;
         gameplayStateLoad.OnScreenUnload += OnScreenUnload;
+
+        var nameColors = _prototypeManager.Index<ColorPalettePrototype>(ChatNamePalette).Colors.Values.ToArray();
+        _chatNameColors = new string[nameColors.Length];
+        for (var i = 0; i < nameColors.Length; i++)
+        {
+            _chatNameColors[i] = nameColors[i].ToHex();
+        }
     }
 
     public void OnScreenLoad()
@@ -581,7 +601,7 @@ private void UpdateQueuedSpeechBubbles(FrameEventArgs delta)
             CreateSpeechBubble(entity, msg);
         }
 
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
         var predicate = static (EntityUid uid, (EntityUid compOwner, EntityUid? attachedEntity) data)
             => uid == data.compOwner || uid == data.attachedEntity;
         var playerPos = player != null
@@ -638,7 +658,7 @@ public ChatSelectChannel MapLocalIfGhost(ChatSelectChannel channel)
     private bool TryGetRadioChannel(string text, out RadioChannelPrototype? radioChannel)
     {
         radioChannel = null;
-        return _player.LocalPlayer?.ControlledEntity is EntityUid { Valid: true } uid
+        return _player.LocalEntity is EntityUid { Valid: true } uid
            && _chatSys != null
            && _chatSys.TryProccessRadioMessage(uid, text, out _, out radioChannel, quiet: true);
     }
@@ -771,6 +791,14 @@ private void OnChatMessage(MsgChatMessage message)
 
     public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true)
     {
+        // color the name unless it's something like "the old man"
+        if ((msg.Channel == ChatChannel.Local || msg.Channel == ChatChannel.Whisper) && _chatNameColorsEnabled)
+        {
+            var grammar = _ent.GetComponentOrNull<GrammarComponent>(_ent.GetEntity(msg.SenderEntity));
+            if (grammar != null && grammar.ProperNoun == true)
+                msg.WrappedMessage = SharedChatSystem.InjectTagInsideTag(msg, "Name", "color", GetNameColor(SharedChatSystem.GetStringInsideTag(msg, "Name")));
+        }
+
         // Log all incoming chat to repopulate when filter is un-toggled
         if (!msg.HideChat)
         {
@@ -859,6 +887,17 @@ public void Repopulate()
         }
     }
 
+    /// <summary>
+    /// Returns the chat name color for a mob
+    /// </summary>
+    /// <param name="name">Name of the mob</param>
+    /// <returns>Hex value of the color</returns>
+    public string GetNameColor(string name)
+    {
+        var colorIdx = Math.Abs(name.GetHashCode() % _chatNameColors.Length);
+        return _chatNameColors[colorIdx];
+    }
+
     private readonly record struct SpeechBubbleData(ChatMessage Message, SpeechBubble.SpeechType Type);
 
     private sealed class SpeechBubbleQueueData
diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
index 936e7cdecd4..a33bee20f9f 100644
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
@@ -33,7 +33,7 @@ public ChatBox()
         _entManager = IoCManager.Resolve<IEntityManager>();
 
         ChatInput.Input.OnTextEntered += OnTextEntered;
-        ChatInput.Input.OnKeyBindDown += OnKeyBindDown;
+        ChatInput.Input.OnKeyBindDown += OnInputKeyBindDown;
         ChatInput.Input.OnTextChanged += OnTextChanged;
         ChatInput.ChannelSelector.OnChannelSelect += OnChannelSelect;
         ChatInput.FilterButton.Popup.OnChannelFilter += OnChannelFilter;
@@ -142,7 +142,7 @@ public void SafelySelectChannel(ChatSelectChannel toSelect)
         ChatInput.ChannelSelector.Select(toSelect);
     }
 
-    private void OnKeyBindDown(GUIBoundKeyEventArgs args)
+    private void OnInputKeyBindDown(GUIBoundKeyEventArgs args)
     {
         if (args.Function == EngineKeyFunctions.TextReleaseFocus)
         {
@@ -182,7 +182,7 @@ protected override void Dispose(bool disposing)
         if (!disposing) return;
         _controller.UnregisterChat(this);
         ChatInput.Input.OnTextEntered -= OnTextEntered;
-        ChatInput.Input.OnKeyBindDown -= OnKeyBindDown;
+        ChatInput.Input.OnKeyBindDown -= OnInputKeyBindDown;
         ChatInput.Input.OnTextChanged -= OnTextChanged;
         ChatInput.ChannelSelector.OnChannelSelect -= OnChannelSelect;
     }
diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
index 0485ea5dff8..c10c33a9902 100644
--- a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
+++ b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
@@ -48,7 +48,7 @@ private void OnPlayerDetached(LocalPlayerDetachedEvent args)
 
     private void OnMobStateChanged(MobStateChangedEvent args)
     {
-        if (args.Target != _playerManager.LocalPlayer?.ControlledEntity)
+        if (args.Target != _playerManager.LocalEntity)
             return;
 
         UpdateOverlays(args.Target, args.Component);
@@ -57,7 +57,7 @@ private void OnMobStateChanged(MobStateChangedEvent args)
     private void OnThresholdCheck(ref MobThresholdChecked args)
     {
 
-        if (args.Target != _playerManager.LocalPlayer?.ControlledEntity)
+        if (args.Target != _playerManager.LocalEntity)
             return;
         UpdateOverlays(args.Target, args.MobState, args.Damageable, args.Threshold);
     }
diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
index 03d7a865f71..fd748153166 100644
--- a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
+++ b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
@@ -56,7 +56,7 @@ public DamageOverlay()
 
     protected override void Draw(in OverlayDrawArgs args)
     {
-        if (!_entityManager.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out EyeComponent? eyeComp))
+        if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
             return;
 
         if (args.Viewport.Eye != eyeComp.Eye)
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
index 926a830e71c..5c5e31de03b 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
@@ -43,8 +43,8 @@ public override void Opened()
 
     private void OnMake(NetEntity entity, string name, string description, string rules, bool makeSentient)
     {
-        var player = _playerManager.LocalPlayer;
-        if (player == null)
+        var session = _playerManager.LocalSession;
+        if (session == null)
         {
             return;
         }
@@ -56,12 +56,12 @@ private void OnMake(NetEntity entity, string name, string description, string ru
             $"\"{CommandParsing.Escape(description)}\" " +
             $"\"{CommandParsing.Escape(rules)}\"";
 
-        _consoleHost.ExecuteCommand(player.Session, makeGhostRoleCommand);
+        _consoleHost.ExecuteCommand(session, makeGhostRoleCommand);
 
         if (makeSentient)
         {
             var makeSentientCommand = $"makesentient \"{CommandParsing.Escape(entity.ToString())}\"";
-            _consoleHost.ExecuteCommand(player.Session, makeSentientCommand);
+            _consoleHost.ExecuteCommand(session, makeSentientCommand);
         }
 
         _window.Close();
diff --git a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
index 3ab36a9166a..752c89ca970 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
+++ b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
@@ -30,6 +30,7 @@ public sealed class SandboxUIController : UIController, IOnStateChanged<Gameplay
     [Dependency] private readonly IEyeManager _eye = default!;
     [Dependency] private readonly IInputManager _input = default!;
     [Dependency] private readonly ILightManager _light = default!;
+    [Dependency] private readonly IClientAdminManager _admin = default!;
 
     [UISystemDependency] private readonly DebugPhysicsSystem _debugPhysics = default!;
     [UISystemDependency] private readonly MarkerSystem _marker = default!;
@@ -53,13 +54,28 @@ public void OnStateEntered(GameplayState state)
         CheckSandboxVisibility();
 
         _input.SetInputCommand(ContentKeyFunctions.OpenEntitySpawnWindow,
-            InputCmdHandler.FromDelegate(_ => EntitySpawningController.ToggleWindow()));
+            InputCmdHandler.FromDelegate(_ =>
+            {
+                if (!_admin.CanAdminPlace())
+                    return;
+                EntitySpawningController.ToggleWindow();
+            }));
         _input.SetInputCommand(ContentKeyFunctions.OpenSandboxWindow,
             InputCmdHandler.FromDelegate(_ => ToggleWindow()));
         _input.SetInputCommand(ContentKeyFunctions.OpenTileSpawnWindow,
-            InputCmdHandler.FromDelegate(_ => TileSpawningController.ToggleWindow()));
+            InputCmdHandler.FromDelegate(_ =>
+            {
+                if (!_admin.CanAdminPlace())
+                    return;
+                TileSpawningController.ToggleWindow();
+            }));
         _input.SetInputCommand(ContentKeyFunctions.OpenDecalSpawnWindow,
-            InputCmdHandler.FromDelegate(_ => DecalPlacerController.ToggleWindow()));
+            InputCmdHandler.FromDelegate(_ =>
+            {
+                if (!_admin.CanAdminPlace())
+                    return;
+                DecalPlacerController.ToggleWindow();
+            }));
 
         CommandBinds.Builder
             .Bind(ContentKeyFunctions.EditorCopyObject, new PointerInputCmdHandler(Copy))
diff --git a/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs b/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
index 668c8f2d598..d117043f425 100644
--- a/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
+++ b/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
@@ -80,7 +80,7 @@ public override void FrameUpdate(FrameEventArgs e)
 
         // verify that the current eye is not "null". Fuck IEyeManager.
 
-        var ent = _playerMan.LocalPlayer?.ControlledEntity;
+        var ent = _playerMan.LocalEntity;
         if (_eyeManager.CurrentEye.Position != default || ent == null)
             return;
 
diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 34634482c61..329a8977a68 100644
--- a/Content.Client/Verbs/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -57,7 +57,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
             if (_stateManager.CurrentState is not GameplayStateBase gameScreenBase)
                 return false;
 
-            var player = _playerManager.LocalPlayer?.ControlledEntity;
+            var player = _playerManager.LocalEntity;
             if (player == null)
                 return false;
 
diff --git a/Content.Client/Weapons/Melee/MeleeArcOverlay.cs b/Content.Client/Weapons/Melee/MeleeArcOverlay.cs
index 29bfa095650..dbd68c15e24 100644
--- a/Content.Client/Weapons/Melee/MeleeArcOverlay.cs
+++ b/Content.Client/Weapons/Melee/MeleeArcOverlay.cs
@@ -35,7 +35,7 @@ public MeleeArcOverlay(IEntityManager entManager, IEyeManager eyeManager, IInput
 
     protected override void Draw(in OverlayDrawArgs args)
     {
-        var player = _playerManager.LocalPlayer?.ControlledEntity;
+        var player = _playerManager.LocalEntity;
 
         if (!_entManager.TryGetComponent<TransformComponent>(player, out var xform) ||
             !_combatMode.IsInCombatMode(player))
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
index 2676a7ea6a9..641d56d3d14 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -50,7 +50,7 @@ public override void Update(float frameTime)
         if (!Timing.IsFirstTimePredicted)
             return;
 
-        var entityNull = _player.LocalPlayer?.ControlledEntity;
+        var entityNull = _player.LocalEntity;
 
         if (entityNull == null)
             return;
diff --git a/Content.Client/Weapons/Misc/GrapplingGunSystem.cs b/Content.Client/Weapons/Misc/GrapplingGunSystem.cs
index b54b11ee09f..df20042b4be 100644
--- a/Content.Client/Weapons/Misc/GrapplingGunSystem.cs
+++ b/Content.Client/Weapons/Misc/GrapplingGunSystem.cs
@@ -26,7 +26,7 @@ public override void Update(float frameTime)
         if (!Timing.IsFirstTimePredicted)
             return;
 
-        var local = _player.LocalPlayer?.ControlledEntity;
+        var local = _player.LocalEntity;
         var handUid = _hands.GetActiveHandEntity();
 
         if (!TryComp<GrapplingGunComponent>(handUid, out var grappling))
diff --git a/Content.Client/Weapons/Misc/TetherGunSystem.cs b/Content.Client/Weapons/Misc/TetherGunSystem.cs
index dd8f283cbf5..634dbd24e79 100644
--- a/Content.Client/Weapons/Misc/TetherGunSystem.cs
+++ b/Content.Client/Weapons/Misc/TetherGunSystem.cs
@@ -54,7 +54,7 @@ public override void Update(float frameTime)
         if (!_timing.IsFirstTimePredicted)
             return;
 
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
 
         if (player == null ||
             !TryGetTetherGun(player.Value, out var gunUid, out var gun) ||
diff --git a/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
index 665ebf71455..622a168fbf4 100644
--- a/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
+++ b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
@@ -17,4 +17,5 @@ public sealed partial class SpentAmmoVisualsComponent : Component
 public enum AmmoVisualLayers : byte
 {
     Base,
+    Tip,
 }
diff --git a/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs b/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
index 84b6ce40480..62df764ae50 100644
--- a/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
+++ b/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
@@ -33,7 +33,7 @@ protected override void Draw(in OverlayDrawArgs args)
     {
         var worldHandle = args.WorldHandle;
 
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
 
         if (player == null ||
             !_entManager.TryGetComponent<TransformComponent>(player, out var xform))
diff --git a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
index 565672ad383..401b7cdfafe 100644
--- a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
@@ -24,7 +24,7 @@ public override void Initialize()
 
     private void OnCollide(EntityUid uid, FlyBySoundComponent component, ref StartCollideEvent args)
     {
-        var attachedEnt = _player.LocalPlayer?.ControlledEntity;
+        var attachedEnt = _player.LocalEntity;
 
         // If it's not our ent or we shot it.
         if (attachedEnt == null ||
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
index 7227f333c02..adfdc89b897 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
@@ -30,5 +30,8 @@ private void OnSpentAmmoAppearance(EntityUid uid, SpentAmmoVisualsComponent comp
             state = component.State;
 
         sprite.LayerSetState(AmmoVisualLayers.Base, state);
+        if (sprite.LayerExists(AmmoVisualLayers.Tip)){
+            sprite.RemoveLayer(AmmoVisualLayers.Tip);
+        }
     }
 }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index ce43057d631..9e50cab3e10 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -132,7 +132,7 @@ public override void Update(float frameTime)
         if (!Timing.IsFirstTimePredicted)
             return;
 
-        var entityNull = _player.LocalPlayer?.ControlledEntity;
+        var entityNull = _player.LocalEntity;
 
         if (entityNull == null || !TryComp<CombatModeComponent>(entityNull, out var combat) || !combat.IsInCombatMode)
         {
diff --git a/Content.Client/Weather/WeatherSystem.cs b/Content.Client/Weather/WeatherSystem.cs
index a9c29f96c93..24de0bc8c4c 100644
--- a/Content.Client/Weather/WeatherSystem.cs
+++ b/Content.Client/Weather/WeatherSystem.cs
@@ -22,7 +22,6 @@ public sealed class WeatherSystem : SharedWeatherSystem
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly MapSystem _mapSystem = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public override void Initialize()
diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index 872af8334fb..52fdf600bb4 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -189,7 +189,7 @@ public void ValidateSettings(PoolSettings settings)
         var sPlayer = Server.ResolveDependency<IPlayerManager>();
         Assert.That(sPlayer.Sessions.Count(), Is.EqualTo(1));
         var session = sPlayer.Sessions.Single();
-        Assert.That(cPlayer.LocalPlayer?.Session.UserId, Is.EqualTo(session.UserId));
+        Assert.That(cPlayer.LocalSession?.UserId, Is.EqualTo(session.UserId));
 
         if (ticker.DummyTicker)
             return;
diff --git a/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs b/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs
index 913dcf4a40a..32b15252261 100644
--- a/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs
+++ b/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs
@@ -23,7 +23,7 @@ public async Task TestCombatActionsAdded()
         var client = pair.Client;
         var sEntMan = server.ResolveDependency<IEntityManager>();
         var cEntMan = client.ResolveDependency<IEntityManager>();
-        var clientSession = client.ResolveDependency<Robust.Client.Player.IPlayerManager>().LocalPlayer?.Session;
+        var clientSession = client.Session;
         var serverSession = server.ResolveDependency<IPlayerManager>().Sessions.Single();
         var sActionSystem = server.System<SharedActionsSystem>();
         var cActionSystem = client.System<SharedActionsSystem>();
diff --git a/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs b/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs
new file mode 100644
index 00000000000..4d19a96d9e7
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs
@@ -0,0 +1,122 @@
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameObjects;
+
+namespace Content.IntegrationTests.Tests.Chemistry;
+
+[TestFixture]
+[TestOf(typeof(ChemicalReactionSystem))]
+public sealed class SolutionRoundingTest
+{
+    // This test tests two things:
+    // * A rounding error in reaction code while I was making chloral hydrate
+    // * An assert with solution heat capacity calculations that I found a repro for while testing the above.
+
+    [TestPrototypes]
+    private const string Prototypes = @"
+- type: entity
+  id: SolutionRoundingTestContainer
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 100
+
+# This is the Chloral Hydrate recipe fyi.
+- type: reagent
+  id: SolutionRoundingTestReagentA
+  name: reagent-name-nothing
+  desc: reagent-desc-nothing
+  physicalDesc: reagent-physical-desc-nothing
+
+- type: reagent
+  id: SolutionRoundingTestReagentB
+  name: reagent-name-nothing
+  desc: reagent-desc-nothing
+  physicalDesc: reagent-physical-desc-nothing
+
+- type: reagent
+  id: SolutionRoundingTestReagentC
+  name: reagent-name-nothing
+  desc: reagent-desc-nothing
+  physicalDesc: reagent-physical-desc-nothing
+
+- type: reagent
+  id: SolutionRoundingTestReagentD
+  name: reagent-name-nothing
+  desc: reagent-desc-nothing
+  physicalDesc: reagent-physical-desc-nothing
+
+- type: reaction
+  id: SolutionRoundingTestReaction
+  impact: Medium
+  reactants:
+    SolutionRoundingTestReagentA:
+      amount: 3
+    SolutionRoundingTestReagentB:
+      amount: 1
+    SolutionRoundingTestReagentC:
+      amount: 1
+  products:
+    SolutionRoundingTestReagentD: 1
+";
+
+    [Test]
+    public async Task Test()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+        var testMap = await pair.CreateTestMap();
+
+        Solution solution = default;
+        Entity<SolutionComponent> solutionEnt = default;
+
+        await server.WaitPost(() =>
+        {
+            var system = server.System<SolutionContainerSystem>();
+            var beaker = server.EntMan.SpawnEntity("SolutionRoundingTestContainer", testMap.GridCoords);
+
+            system.TryGetSolution(beaker, "beaker", out var newSolutionEnt, out var newSolution);
+
+            solutionEnt = newSolutionEnt!.Value;
+            solution = newSolution!;
+
+            system.TryAddSolution(solutionEnt, new Solution("SolutionRoundingTestReagentC", 50));
+            system.TryAddSolution(solutionEnt, new Solution("SolutionRoundingTestReagentB", 30));
+
+            for (var i = 0; i < 9; i++)
+            {
+                system.TryAddSolution(solutionEnt, new Solution("SolutionRoundingTestReagentA", 10));
+            }
+        });
+
+        await server.WaitAssertion(() =>
+        {
+            Assert.Multiple(() =>
+            {
+                Assert.That(
+                    solution.ContainsReagent("SolutionRoundingTestReagentA", null),
+                    Is.False,
+                    "Solution should not contain reagent A");
+
+                Assert.That(
+                    solution.ContainsReagent("SolutionRoundingTestReagentB", null),
+                    Is.False,
+                    "Solution should not contain reagent B");
+
+                Assert.That(
+                    solution![new ReagentId("SolutionRoundingTestReagentC", null)].Quantity,
+                    Is.EqualTo((FixedPoint2) 20));
+
+                Assert.That(
+                    solution![new ReagentId("SolutionRoundingTestReagentD", null)].Quantity,
+                    Is.EqualTo((FixedPoint2) 30));
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs b/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs
index 408b0e0bd03..c59b42d6389 100644
--- a/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs
+++ b/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs
@@ -55,33 +55,36 @@ public async Task ConstructionGraphSpawnPrototypeValid()
             var valid = true;
             var message = new StringBuilder();
 
-            foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
+            await server.WaitPost(() =>
             {
-                foreach (var node in graph.Nodes.Values)
+                foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
                 {
-                    foreach (var action in node.Actions)
+                    foreach (var node in graph.Nodes.Values)
                     {
-                        if (IsValid(action, protoMan, out var prototype)) continue;
-
-                        valid = false;
-                        message.Append($"Invalid entity prototype \"{prototype}\" on graph action in node \"{node.Name}\" of graph \"{graph.ID}\"\n");
-                    }
-
-                    foreach (var edge in node.Edges)
-                    {
-                        foreach (var action in edge.Completed)
+                        foreach (var action in node.Actions)
                         {
                             if (IsValid(action, protoMan, out var prototype)) continue;
 
                             valid = false;
-                            message.Append($"Invalid entity prototype \"{prototype}\" on graph action in edge \"{edge.Target}\" of node \"{node.Name}\" of graph \"{graph.ID}\"\n");
+                            message.Append($"Invalid entity prototype \"{prototype}\" on graph action in node \"{node.Name}\" of graph \"{graph.ID}\"\n");
+                        }
+
+                        foreach (var edge in node.Edges)
+                        {
+                            foreach (var action in edge.Completed)
+                            {
+                                if (IsValid(action, protoMan, out var prototype)) continue;
+
+                                valid = false;
+                                message.Append($"Invalid entity prototype \"{prototype}\" on graph action in edge \"{edge.Target}\" of node \"{node.Name}\" of graph \"{graph.ID}\"\n");
+                            }
                         }
                     }
                 }
-            }
-            await pair.CleanReturnAsync();
+            });
 
             Assert.That(valid, Is.True, $"One or more SpawnPrototype actions specified invalid entity prototypes!\n{message}");
+            await pair.CleanReturnAsync();
         }
 
         [Test]
@@ -95,19 +98,24 @@ public async Task ConstructionGraphEdgeValid()
             var valid = true;
             var message = new StringBuilder();
 
-            foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
+            await server.WaitPost(() =>
             {
-                foreach (var node in graph.Nodes.Values)
+                foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
                 {
-                    foreach (var edge in node.Edges)
+                    foreach (var node in graph.Nodes.Values)
                     {
-                        if (graph.Nodes.ContainsKey(edge.Target)) continue;
+                        foreach (var edge in node.Edges)
+                        {
+                            if (graph.Nodes.ContainsKey(edge.Target))
+                                continue;
 
-                        valid = false;
-                        message.Append($"Invalid target \"{edge.Target}\" in edge on node \"{node.Name}\" of graph \"{graph.ID}\"\n");
+                            valid = false;
+                            message.Append(
+                                $"Invalid target \"{edge.Target}\" in edge on node \"{node.Name}\" of graph \"{graph.ID}\"\n");
+                        }
                     }
                 }
-            }
+            });
 
             Assert.That(valid, Is.True, $"One or more edges specified invalid node targets!\n{message}");
             await pair.CleanReturnAsync();
diff --git a/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs b/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs
index 01173c9660f..d3a10dcfaf4 100644
--- a/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs
+++ b/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs
@@ -58,13 +58,17 @@ public async Task TestStartIsValid()
 
             var protoMan = server.ResolveDependency<IPrototypeManager>();
 
-            foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+            await server.WaitAssertion(() =>
             {
-                var start = proto.StartNode;
-                var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
+                foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+                {
+                    var start = proto.StartNode;
+                    var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
 
-                Assert.That(graph.Nodes.ContainsKey(start), $"Found no startNode \"{start}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
-            }
+                    Assert.That(graph.Nodes.ContainsKey(start),
+                        $"Found no startNode \"{start}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
+                }
+            });
             await pair.CleanReturnAsync();
         }
 
@@ -76,13 +80,17 @@ public async Task TestTargetIsValid()
 
             var protoMan = server.ResolveDependency<IPrototypeManager>();
 
-            foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+            await server.WaitAssertion(() =>
             {
-                var target = proto.TargetNode;
-                var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
+                foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+                {
+                    var target = proto.TargetNode;
+                    var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
 
-                Assert.That(graph.Nodes.ContainsKey(target), $"Found no targetNode \"{target}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
-            }
+                    Assert.That(graph.Nodes.ContainsKey(target),
+                        $"Found no targetNode \"{target}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
+                }
+            });
             await pair.CleanReturnAsync();
         }
 
@@ -92,7 +100,6 @@ public async Task DeconstructionIsValid()
             await using var pair = await PoolManager.GetServerClient();
             var server = pair.Server;
 
-            var entMan = server.ResolveDependency<IEntityManager>();
             var protoMan = server.ResolveDependency<IPrototypeManager>();
             var compFact = server.ResolveDependency<IComponentFactory>();
 
@@ -126,22 +133,31 @@ public async Task TestStartReachesValidTarget()
             var protoMan = server.ResolveDependency<IPrototypeManager>();
             var entMan = server.ResolveDependency<IEntityManager>();
 
-            foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+            await server.WaitAssertion(() =>
             {
-                var start = proto.StartNode;
-                var target = proto.TargetNode;
-                var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
+                foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+                {
+                    var start = proto.StartNode;
+                    var target = proto.TargetNode;
+                    var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
 
 #pragma warning disable NUnit2045 // Interdependent assertions.
-                Assert.That(graph.TryPath(start, target, out var path), $"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\"");
-                Assert.That(path, Has.Length.GreaterThanOrEqualTo(1), $"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\".");
-                var next = path[0];
-                var nextId = next.Entity.GetId(null, null, new(entMan));
-                Assert.That(nextId, Is.Not.Null, $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) must specify an entity! Graph: {graph.ID}");
-                Assert.That(protoMan.TryIndex(nextId, out EntityPrototype entity), $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an invalid entity prototype ({nextId} [{next.Entity}])");
-                Assert.That(entity.Components.ContainsKey("Construction"), $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an entity prototype ({next.Entity}) without a ConstructionComponent.");
+                    Assert.That(graph.TryPath(start, target, out var path),
+                        $"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\"");
+                    Assert.That(path, Has.Length.GreaterThanOrEqualTo(1),
+                        $"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\".");
+                    var next = path[0];
+                    var nextId = next.Entity.GetId(null, null, new(entMan));
+                    Assert.That(nextId, Is.Not.Null,
+                        $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) must specify an entity! Graph: {graph.ID}");
+                    Assert.That(protoMan.TryIndex(nextId, out EntityPrototype entity),
+                        $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an invalid entity prototype ({nextId} [{next.Entity}])");
+                    Assert.That(entity.Components.ContainsKey("Construction"),
+                        $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an entity prototype ({next.Entity}) without a ConstructionComponent.");
 #pragma warning restore NUnit2045
-            }
+                }
+            });
+
             await pair.CleanReturnAsync();
         }
     }
diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
index 3ab90b07ebc..16744d83dce 100644
--- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
@@ -170,19 +170,19 @@ await server.WaitAssertion(() =>
 
                 // Check that damage works properly if it is NOT perfectly divisible among group members
                 types = group3.DamageTypes;
-                damageToDeal = FixedPoint2.New(types.Count * 5 - 1);
-                damage = new DamageSpecifier(group3, damageToDeal);
+
+                Assert.That(types, Has.Count.EqualTo(3));
+
+                damage = new DamageSpecifier(group3, 14);
                 sDamageableSystem.TryChangeDamage(uid, damage, true);
 
                 Assert.Multiple(() =>
                 {
-                    Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(damageToDeal));
-                    Assert.That(sDamageableComponent.DamagePerGroup[group3.ID], Is.EqualTo(damageToDeal));
-                    Assert.That(sDamageableComponent.Damage.DamageDict[type3a.ID], Is.EqualTo(damageToDeal / types.Count));
-                    Assert.That(sDamageableComponent.Damage.DamageDict[type3b.ID], Is.EqualTo(damageToDeal / types.Count));
-
-                    // last one will get 0.01 less, since its not perfectly divisble by 3
-                    Assert.That(sDamageableComponent.Damage.DamageDict[type3c.ID], Is.EqualTo(damageToDeal / types.Count - 0.01));
+                    Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.New(14)));
+                    Assert.That(sDamageableComponent.DamagePerGroup[group3.ID], Is.EqualTo(FixedPoint2.New(14)));
+                    Assert.That(sDamageableComponent.Damage.DamageDict[type3a.ID], Is.EqualTo(FixedPoint2.New(4.66f)));
+                    Assert.That(sDamageableComponent.Damage.DamageDict[type3b.ID], Is.EqualTo(FixedPoint2.New(4.67f)));
+                    Assert.That(sDamageableComponent.Damage.DamageDict[type3c.ID], Is.EqualTo(FixedPoint2.New(4.67f)));
                 });
 
                 // Heal
@@ -224,7 +224,7 @@ await server.WaitAssertion(() =>
 
                 Assert.Multiple(() =>
                 {
-                    Assert.That(sDamageableComponent.Damage.DamageDict[type3a.ID], Is.EqualTo(FixedPoint2.New(1.33)));
+                    Assert.That(sDamageableComponent.Damage.DamageDict[type3a.ID], Is.EqualTo(FixedPoint2.New(1.34)));
                     Assert.That(sDamageableComponent.Damage.DamageDict[type3b.ID], Is.EqualTo(FixedPoint2.New(3.33)));
                     Assert.That(sDamageableComponent.Damage.DamageDict[type3c.ID], Is.EqualTo(FixedPoint2.New(0)));
                 });
diff --git a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
index 1d994624a6d..26ea726211b 100644
--- a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
+++ b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
@@ -2,6 +2,7 @@
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
+using Content.Shared.DeviceNetwork;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
diff --git a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs
index 6e3db254047..400d85f2ccb 100644
--- a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs
+++ b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs
@@ -1,7 +1,6 @@
-
-using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
+using Content.Shared.DeviceNetwork;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Reflection;
 
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
index bbcd24b4156..1da77ac5589 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
@@ -24,7 +24,6 @@ public async Task AlertsTest()
             var server = pair.Server;
             var client = pair.Client;
 
-            var clientPlayerMgr = client.ResolveDependency<Robust.Client.Player.IPlayerManager>();
             var clientUIMgr = client.ResolveDependency<IUserInterfaceManager>();
             var clientEntManager = client.ResolveDependency<IEntityManager>();
 
@@ -57,9 +56,9 @@ await server.WaitAssertion(() =>
             AlertsUI clientAlertsUI = default;
             await client.WaitAssertion(() =>
             {
-                var local = clientPlayerMgr.LocalPlayer;
+                var local = client.Session;
                 Assert.That(local, Is.Not.Null);
-                var controlled = local.ControlledEntity;
+                var controlled = local.AttachedEntity;
 #pragma warning disable NUnit2045 // Interdependent assertions.
                 Assert.That(controlled, Is.Not.Null);
                 // Making sure it exists
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index 45a880fe867..bed27ba6efe 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -189,10 +189,10 @@ public virtual async Task Setup()
         // Get player data
         var sPlayerMan = Server.ResolveDependency<Robust.Server.Player.IPlayerManager>();
         var cPlayerMan = Client.ResolveDependency<Robust.Client.Player.IPlayerManager>();
-        if (cPlayerMan.LocalPlayer?.Session == null)
+        if (Client.Session == null)
             Assert.Fail("No player");
-        ClientSession = cPlayerMan.LocalPlayer!.Session!;
-        ServerSession = sPlayerMan.GetSessionByUserId(ClientSession.UserId);
+        ClientSession = Client.Session!;
+        ServerSession = sPlayerMan.GetSessionById(ClientSession.UserId);
 
         // Spawn player entity & attach
         EntityUid? old = default;
@@ -240,7 +240,7 @@ await Server.WaitPost(() =>
         Assert.Multiple(() =>
         {
             Assert.That(CEntMan.GetNetEntity(cPlayerMan.LocalEntity), Is.EqualTo(Player));
-            Assert.That(sPlayerMan.GetSessionByUserId(ClientSession.UserId).AttachedEntity, Is.EqualTo(SEntMan.GetEntity(Player)));
+            Assert.That(sPlayerMan.GetSessionById(ClientSession.UserId).AttachedEntity, Is.EqualTo(SEntMan.GetEntity(Player)));
         });
     }
 
diff --git a/Content.MapRenderer/Painters/GridPainter.cs b/Content.MapRenderer/Painters/GridPainter.cs
index 3079db436ba..416ec051995 100644
--- a/Content.MapRenderer/Painters/GridPainter.cs
+++ b/Content.MapRenderer/Painters/GridPainter.cs
@@ -85,7 +85,7 @@ private ConcurrentDictionary<EntityUid, List<EntityData>> GetEntities()
                 }
 
                 var transform = _sEntityManager.GetComponent<TransformComponent>(serverEntity);
-                if (_sMapManager.TryGetGrid(transform.GridUid, out var grid))
+                if (_sEntityManager.TryGetComponent(transform.GridUid, out MapGridComponent? grid))
                 {
                     var position = transform.LocalPosition;
 
diff --git a/Content.MapRenderer/Painters/TilePainter.cs b/Content.MapRenderer/Painters/TilePainter.cs
index cac0f960c46..7084d2caf4a 100644
--- a/Content.MapRenderer/Painters/TilePainter.cs
+++ b/Content.MapRenderer/Painters/TilePainter.cs
@@ -20,12 +20,15 @@ public sealed class TilePainter
         public const int TileImageSize = EyeManager.PixelsPerMeter;
 
         private readonly ITileDefinitionManager _sTileDefinitionManager;
+        private readonly SharedMapSystem _sMapSystem;
         private readonly IResourceManager _resManager;
 
         public TilePainter(ClientIntegrationInstance client, ServerIntegrationInstance server)
         {
             _sTileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
             _resManager = client.ResolveDependency<IResourceManager>();
+            var esm = server.ResolveDependency<IEntitySystemManager>();
+            _sMapSystem = esm.GetEntitySystem<SharedMapSystem>();
         }
 
         public void Run(Image gridCanvas, EntityUid gridUid, MapGridComponent grid)
@@ -41,7 +44,7 @@ public void Run(Image gridCanvas, EntityUid gridUid, MapGridComponent grid)
             var images = GetTileImages(_sTileDefinitionManager, _resManager, tileSize);
             var i = 0;
 
-            grid.GetAllTiles().AsParallel().ForAll(tile =>
+            _sMapSystem.GetAllTiles(gridUid, grid).AsParallel().ForAll(tile =>
             {
                 var path = _sTileDefinitionManager[tile.Tile.TypeId].Sprite.ToString();
 
diff --git a/Content.Server/Access/AccessWireAction.cs b/Content.Server/Access/AccessWireAction.cs
index 4ed9871c403..7676ce489f4 100644
--- a/Content.Server/Access/AccessWireAction.cs
+++ b/Content.Server/Access/AccessWireAction.cs
@@ -25,7 +25,7 @@ public override bool Cut(EntityUid user, Wire wire, AccessReaderComponent comp)
     {
         WiresSystem.TryCancelWireAction(wire.Owner, PulseTimeoutKey.Key);
         comp.Enabled = false;
-        EntityManager.Dirty(comp);
+        EntityManager.Dirty(wire.Owner, comp);
         return true;
     }
 
@@ -34,7 +34,7 @@ public override bool Mend(EntityUid user, Wire wire, AccessReaderComponent comp)
         if (!EntityManager.HasComponent<EmaggedComponent>(wire.Owner))
         {
             comp.Enabled = true;
-            EntityManager.Dirty(comp);
+            EntityManager.Dirty(wire.Owner, comp);
         }
         return true;
     }
@@ -42,7 +42,7 @@ public override bool Mend(EntityUid user, Wire wire, AccessReaderComponent comp)
     public override void Pulse(EntityUid user, Wire wire, AccessReaderComponent comp)
     {
         comp.Enabled = false;
-        EntityManager.Dirty(comp);
+        EntityManager.Dirty(wire.Owner, comp);
         WiresSystem.StartWireAction(wire.Owner, _pulseTimeout, PulseTimeoutKey.Key, new TimedWireEvent(AwaitPulseCancel, wire));
     }
 
@@ -61,7 +61,7 @@ private void AwaitPulseCancel(Wire wire)
             if (EntityManager.TryGetComponent<AccessReaderComponent>(wire.Owner, out var access) && !EntityManager.HasComponent<EmaggedComponent>(wire.Owner))
             {
                 access.Enabled = true;
-                EntityManager.Dirty(access);
+                EntityManager.Dirty(wire.Owner, access);
             }
         }
     }
diff --git a/Content.Server/Access/Systems/AccessOverriderSystem.cs b/Content.Server/Access/Systems/AccessOverriderSystem.cs
index 2aa22575782..10d7fd0f7a7 100644
--- a/Content.Server/Access/Systems/AccessOverriderSystem.cs
+++ b/Content.Server/Access/Systems/AccessOverriderSystem.cs
@@ -249,7 +249,7 @@ private void TryWriteToTargetAccessReaderId(EntityUid uid,
             $"{ToPrettyString(player):player} has modified {ToPrettyString(component.TargetAccessReaderId):entity} with the following allowed access level holders: [{string.Join(", ", addedTags.Union(removedTags))}] [{string.Join(", ", newAccessList)}]");
 
         accessReader.AccessLists = ConvertAccessListToHashSet(newAccessList);
-        Dirty(accessReader);
+        Dirty(component.TargetAccessReaderId, accessReader);
     }
 
     /// <summary>
diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs
index 4d242e8f81d..bd4d3b3f233 100644
--- a/Content.Server/Access/Systems/AgentIDCardSystem.cs
+++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs
@@ -7,6 +7,8 @@
 using Content.Shared.StatusIcon;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
+using Content.Shared.Roles;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Server.Access.Systems
 {
@@ -46,7 +48,7 @@ private void OnAfterInteract(EntityUid uid, AgentIDCardComponent component, Afte
                 return;
             }
 
-            Dirty(access);
+            Dirty(uid, access);
 
             if (addedLength == 1)
             {
@@ -98,6 +100,24 @@ private void OnJobIconChanged(EntityUid uid, AgentIDCardComponent comp, AgentIDC
             }
 
             _cardSystem.TryChangeJobIcon(uid, jobIcon, idCard);
+
+            if (TryFindJobProtoFromIcon(jobIcon, out var job))
+                _cardSystem.TryChangeJobDepartment(uid, job, idCard);
+        }
+
+        private bool TryFindJobProtoFromIcon(StatusIconPrototype jobIcon, [NotNullWhen(true)] out JobPrototype? job)
+        {
+            foreach (var jobPrototype in _prototypeManager.EnumeratePrototypes<JobPrototype>())
+            {
+                if(jobPrototype.Icon == jobIcon.ID)
+                {
+                    job = jobPrototype;
+                    return true;
+                }
+            }
+
+            job = null;
+            return false;
         }
     }
 }
diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
index b3b2baf28e7..791159f972b 100644
--- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs
+++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
@@ -131,6 +131,7 @@ private void TryWriteToTargetId(EntityUid uid,
             && _prototype.TryIndex<StatusIconPrototype>(job.Icon, out var jobIcon))
         {
             _idCard.TryChangeJobIcon(targetId, jobIcon, player: player);
+            _idCard.TryChangeJobDepartment(targetId, job);
         }
 
         if (!newAccessList.TrueForAll(x => component.AccessLevels.Contains(x)))
diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs
index 1c1e6874172..6b3d8db595f 100644
--- a/Content.Server/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -61,7 +61,7 @@ private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowa
                 _popupSystem.PopupEntity(Loc.GetString("id-card-component-microwave-bricked", ("id", uid)), uid);
 
                 access.Tags.Clear();
-                Dirty(access);
+                Dirty(uid, access);
 
                 _adminLogger.Add(LogType.Action, LogImpact.Medium,
                     $"{ToPrettyString(args.Microwave)} cleared access on {ToPrettyString(uid):entity}");
@@ -75,7 +75,7 @@ private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowa
             var random = _random.Pick(_prototypeManager.EnumeratePrototypes<AccessLevelPrototype>().ToArray());
 
             access.Tags.Add(random.ID);
-            Dirty(access);
+            Dirty(uid, access);
 
             _adminLogger.Add(LogType.Action, LogImpact.Medium,
                     $"{ToPrettyString(args.Microwave)} added {random.ID} access to {ToPrettyString(uid):entity}");
@@ -109,7 +109,7 @@ public bool TryChangeJobTitle(EntityUid uid, string? jobTitle, IdCardComponent?
         if (id.JobTitle == jobTitle)
             return true;
         id.JobTitle = jobTitle;
-        Dirty(id);
+        Dirty(uid, id);
         UpdateEntityName(uid, id);
 
         if (player != null)
@@ -149,6 +149,7 @@ public bool TryChangeJobDepartment(EntityUid uid, JobPrototype job, IdCardCompon
         if (!Resolve(uid, ref id))
             return false;
 
+        id.JobDepartments.Clear();
         foreach (var department in _prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
         {
             if (department.Roles.Contains(job.ID))
@@ -186,7 +187,7 @@ public bool TryChangeFullName(EntityUid uid, string? fullName, IdCardComponent?
         if (id.FullName == fullName)
             return true;
         id.FullName = fullName;
-        Dirty(id);
+        Dirty(uid, id);
         UpdateEntityName(uid, id);
 
         if (player != null)
diff --git a/Content.Server/Administration/Commands/BanCommand.cs b/Content.Server/Administration/Commands/BanCommand.cs
index 156fdf496a9..f76cfded814 100644
--- a/Content.Server/Administration/Commands/BanCommand.cs
+++ b/Content.Server/Administration/Commands/BanCommand.cs
@@ -18,6 +18,7 @@ public sealed class BanCommand : LocalizedCommands
     [Dependency] private readonly IBanManager _bans = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
 
     public override string Command => "ban";
 
@@ -28,7 +29,8 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
         uint minutes;
         if (!Enum.TryParse(_cfg.GetCVar(CCVars.ServerBanDefaultSeverity), out NoteSeverity severity))
         {
-            Logger.WarningS("admin.server_ban", "Server ban severity could not be parsed from config! Defaulting to high.");
+            _logManager.GetSawmill("admin.server_ban")
+                .Warning("Server ban severity could not be parsed from config! Defaulting to high.");
             severity = NoteSeverity.High;
         }
 
diff --git a/Content.Server/Administration/Commands/FollowCommand.cs b/Content.Server/Administration/Commands/FollowCommand.cs
index 1ced6cf8dde..9f94f83b4d3 100644
--- a/Content.Server/Administration/Commands/FollowCommand.cs
+++ b/Content.Server/Administration/Commands/FollowCommand.cs
@@ -11,8 +11,8 @@ public sealed class FollowCommand : IConsoleCommand
     [Dependency] private readonly IEntityManager _entManager = default!;
 
     public string Command => "follow";
-    public string Description => Loc.GetString("add-uplink-command-description");
-    public string Help => Loc.GetString("add-uplink-command-help");
+    public string Description => Loc.GetString("follow-command-description");
+    public string Help => Loc.GetString("follow-command-help");
 
     public void Execute(IConsoleShell shell, string argStr, string[] args)
     {
diff --git a/Content.Server/Administration/Notes/AdminNotesSystem.cs b/Content.Server/Administration/Notes/AdminNotesSystem.cs
index 8fc7a8ebaa7..069b8603ce4 100644
--- a/Content.Server/Administration/Notes/AdminNotesSystem.cs
+++ b/Content.Server/Administration/Notes/AdminNotesSystem.cs
@@ -3,7 +3,6 @@
 using Content.Server.EUI;
 using Content.Shared.Database;
 using Content.Shared.Verbs;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
@@ -12,18 +11,14 @@
 
 namespace Content.Server.Administration.Notes;
 
-public sealed class AdminNotesSystem : EntitySystem, IPostInjectInit
+public sealed class AdminNotesSystem : EntitySystem
 {
     [Dependency] private readonly IConsoleHost _console = default!;
     [Dependency] private readonly IAdminNotesManager _notes = default!;
-    [Dependency] private readonly ILogManager _logManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly EuiManager _euis = default!;
 
-    public const string SawmillId = "admin.notes_system";
-    private ISawmill _sawmill = default!;
-
     public override void Initialize()
     {
         SubscribeLocalEvent<GetVerbsEvent<Verb>>(AddVerbs);
@@ -65,7 +60,7 @@ private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs
 
         if (!_playerManager.TryGetPlayerData(e.Session.UserId, out var playerData))
         {
-            _sawmill.Error($"Could not get player data for ID {e.Session.UserId}");
+            Log.Error($"Could not get player data for ID {e.Session.UserId}");
         }
 
         var username = playerData?.UserName ?? e.Session.UserId.ToString();
@@ -83,15 +78,10 @@ private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs
                 var ui = new AdminMessageEui();
                 _euis.OpenEui(ui, e.Session);
                 ui.SetMessage(message);
-				
+
 				// Only send the message if they haven't seen it yet
 				_chat.DispatchServerMessage(e.Session, messageString);
             }
         }
     }
-
-    public void PostInject()
-    {
-        _sawmill = _logManager.GetSawmill(SawmillId);
-    }
 }
diff --git a/Content.Server/Administration/PlayerLocator.cs b/Content.Server/Administration/PlayerLocator.cs
index e2f48c9f7f9..64a85f19ad0 100644
--- a/Content.Server/Administration/PlayerLocator.cs
+++ b/Content.Server/Administration/PlayerLocator.cs
@@ -44,13 +44,15 @@ public interface IPlayerLocator
         Task<LocatedPlayerData?> LookupIdAsync(NetUserId userId, CancellationToken cancel = default);
     }
 
-    internal sealed class PlayerLocator : IPlayerLocator, IDisposable
+    internal sealed class PlayerLocator : IPlayerLocator, IDisposable, IPostInjectInit
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
         [Dependency] private readonly IServerDbManager _db = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
         private readonly HttpClient _httpClient = new();
+        private ISawmill _sawmill = default!;
 
         public PlayerLocator()
         {
@@ -87,7 +89,7 @@ public PlayerLocator()
 
             if (!resp.IsSuccessStatusCode)
             {
-                Logger.ErrorS("PlayerLocate", "Auth server returned bad response {StatusCode}!", resp.StatusCode);
+                _sawmill.Error("Auth server returned bad response {StatusCode}!", resp.StatusCode);
                 return null;
             }
 
@@ -95,7 +97,7 @@ public PlayerLocator()
 
             if (responseData == null)
             {
-                Logger.ErrorS("PlayerLocate", "Auth server returned null response!");
+                _sawmill.Error("Auth server returned null response!");
                 return null;
             }
 
@@ -127,7 +129,7 @@ public PlayerLocator()
 
             if (!resp.IsSuccessStatusCode)
             {
-                Logger.ErrorS("PlayerLocate", "Auth server returned bad response {StatusCode}!", resp.StatusCode);
+                _sawmill.Error("Auth server returned bad response {StatusCode}!", resp.StatusCode);
                 return null;
             }
 
@@ -135,7 +137,7 @@ public PlayerLocator()
 
             if (responseData == null)
             {
-                Logger.ErrorS("PlayerLocate", "Auth server returned null response!");
+                _sawmill.Error("Auth server returned null response!");
                 return null;
             }
 
@@ -163,5 +165,10 @@ void IDisposable.Dispose()
         {
             _httpClient.Dispose();
         }
+
+        void IPostInjectInit.PostInject()
+        {
+            _sawmill = _logManager.GetSawmill("PlayerLocate");
+        }
     }
 }
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index d21f6438ccf..5760f830016 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -70,13 +70,13 @@ public override void Initialize()
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
             _adminManager.OnPermsChanged += OnAdminPermsChanged;
 
-            _config.OnValueChanged(CCVars.PanicBunkerEnabled, OnPanicBunkerChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerDisableWithAdmins, OnPanicBunkerDisableWithAdminsChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerEnableWithoutAdmins, OnPanicBunkerEnableWithoutAdminsChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerCountDeadminnedAdmins, OnPanicBunkerCountDeadminnedAdminsChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerShowReason, OnShowReasonChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerMinOverallHours, OnPanicBunkerMinOverallHoursChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerEnabled, OnPanicBunkerChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerDisableWithAdmins, OnPanicBunkerDisableWithAdminsChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerEnableWithoutAdmins, OnPanicBunkerEnableWithoutAdminsChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerCountDeadminnedAdmins, OnPanicBunkerCountDeadminnedAdminsChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerShowReason, OnShowReasonChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerMinOverallHours, OnPanicBunkerMinOverallHoursChanged, true);
 
             SubscribeLocalEvent<IdentityChangedEvent>(OnIdentityChanged);
             SubscribeLocalEvent<PlayerAttachedEvent>(OnPlayerAttached);
@@ -188,14 +188,6 @@ public override void Shutdown()
             base.Shutdown();
             _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
             _adminManager.OnPermsChanged -= OnAdminPermsChanged;
-
-            _config.UnsubValueChanged(CCVars.PanicBunkerEnabled, OnPanicBunkerChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerDisableWithAdmins, OnPanicBunkerDisableWithAdminsChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerEnableWithoutAdmins, OnPanicBunkerEnableWithoutAdminsChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerCountDeadminnedAdmins, OnPanicBunkerCountDeadminnedAdminsChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerShowReason, OnShowReasonChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerMinOverallHours, OnPanicBunkerMinOverallHoursChanged);
         }
 
         private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs
index 5439b27f424..663754b8ccd 100644
--- a/Content.Server/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Server/Administration/Systems/BwoinkSystem.cs
@@ -66,11 +66,11 @@ public sealed class BwoinkSystem : SharedBwoinkSystem
         public override void Initialize()
         {
             base.Initialize();
-            _config.OnValueChanged(CCVars.DiscordAHelpWebhook, OnWebhookChanged, true);
-            _config.OnValueChanged(CCVars.DiscordAHelpFooterIcon, OnFooterIconChanged, true);
-            _config.OnValueChanged(CCVars.DiscordAHelpAvatar, OnAvatarChanged, true);
-            _config.OnValueChanged(CVars.GameHostName, OnServerNameChanged, true);
-            _config.OnValueChanged(CCVars.AdminAhelpOverrideClientName, OnOverrideChanged, true);
+            Subs.CVar(_config, CCVars.DiscordAHelpWebhook, OnWebhookChanged, true);
+            Subs.CVar(_config, CCVars.DiscordAHelpFooterIcon, OnFooterIconChanged, true);
+            Subs.CVar(_config, CCVars.DiscordAHelpAvatar, OnAvatarChanged, true);
+            Subs.CVar(_config, CVars.GameHostName, OnServerNameChanged, true);
+            Subs.CVar(_config, CCVars.AdminAhelpOverrideClientName, OnOverrideChanged, true);
             _sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("AHELP");
             _maxAdditionalChars = GenerateAHelpMessage("", "", true, _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"), _gameTicker.RunLevel).Length;
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
@@ -147,15 +147,6 @@ private void OnServerNameChanged(string obj)
             _serverName = obj;
         }
 
-        public override void Shutdown()
-        {
-            base.Shutdown();
-            _config.UnsubValueChanged(CCVars.DiscordAHelpWebhook, OnWebhookChanged);
-            _config.UnsubValueChanged(CCVars.DiscordAHelpFooterIcon, OnFooterIconChanged);
-            _config.UnsubValueChanged(CVars.GameHostName, OnServerNameChanged);
-            _config.UnsubValueChanged(CCVars.AdminAhelpOverrideClientName, OnOverrideChanged);
-        }
-
         private async void OnWebhookChanged(string url)
         {
             _webhookUrl = url;
diff --git a/Content.Server/Administration/UI/PermissionsEui.cs b/Content.Server/Administration/UI/PermissionsEui.cs
index 82ec10577d0..7c2d2cbaf20 100644
--- a/Content.Server/Administration/UI/PermissionsEui.cs
+++ b/Content.Server/Administration/UI/PermissionsEui.cs
@@ -18,7 +18,9 @@ public sealed class PermissionsEui : BaseEui
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IServerDbManager _db = default!;
         [Dependency] private readonly IAdminManager _adminManager = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
+        private readonly ISawmill _sawmill;
         private bool _isLoading;
 
         private readonly List<(Admin a, string? lastUserName)> _admins = new List<(Admin, string? lastUserName)>();
@@ -27,6 +29,7 @@ public sealed class PermissionsEui : BaseEui
         public PermissionsEui()
         {
             IoCManager.InjectDependencies(this);
+            _sawmill = _logManager.GetSawmill("admin.perms");
         }
 
         public override void Opened()
@@ -143,7 +146,7 @@ private async Task HandleRemoveAdminRank(RemoveAdminRank rr)
 
             if (!CanTouchRank(rank))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to remove higher-ranked admin rank {rank.Name}");
+                _sawmill.Warning($"{Player} tried to remove higher-ranked admin rank {rank.Name}");
                 return;
             }
 
@@ -162,13 +165,13 @@ private async Task HandleUpdateAdminRank(UpdateAdminRank ur)
 
             if (!CanTouchRank(rank))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to update higher-ranked admin rank {rank.Name}");
+                _sawmill.Warning($"{Player} tried to update higher-ranked admin rank {rank.Name}");
                 return;
             }
 
             if (!UserAdminFlagCheck(ur.Flags))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to give a rank permissions above their authorization.");
+                _sawmill.Warning($"{Player} tried to give a rank permissions above their authorization.");
                 return;
             }
 
@@ -178,7 +181,7 @@ private async Task HandleUpdateAdminRank(UpdateAdminRank ur)
             await _db.UpdateAdminRankAsync(rank);
 
             var flagText = string.Join(' ', AdminFlagsHelper.FlagsToNames(ur.Flags).Select(f => $"+{f}"));
-            Logger.InfoS("admin.perms", $"{Player} updated admin rank {rank.Name}/{flagText}.");
+            _sawmill.Info($"{Player} updated admin rank {rank.Name}/{flagText}.");
 
             _adminManager.ReloadAdminsWithRank(ur.Id);
         }
@@ -187,7 +190,7 @@ private async Task HandleAddAdminRank(AddAdminRank ar)
         {
             if (!UserAdminFlagCheck(ar.Flags))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to give a rank permissions above their authorization.");
+                _sawmill.Warning($"{Player} tried to give a rank permissions above their authorization.");
                 return;
             }
 
@@ -200,7 +203,7 @@ private async Task HandleAddAdminRank(AddAdminRank ar)
             await _db.AddAdminRankAsync(rank);
 
             var flagText = string.Join(' ', AdminFlagsHelper.FlagsToNames(ar.Flags).Select(f => $"+{f}"));
-            Logger.InfoS("admin.perms", $"{Player} added admin rank {rank.Name}/{flagText}.");
+            _sawmill.Info($"{Player} added admin rank {rank.Name}/{flagText}.");
         }
 
         private async Task HandleRemoveAdmin(RemoveAdmin ra)
@@ -214,14 +217,14 @@ private async Task HandleRemoveAdmin(RemoveAdmin ra)
 
             if (!CanTouchAdmin(admin))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to remove higher-ranked admin {ra.UserId.ToString()}");
+                _sawmill.Warning($"{Player} tried to remove higher-ranked admin {ra.UserId.ToString()}");
                 return;
             }
 
             await _db.RemoveAdminAsync(ra.UserId);
 
             var record = await _db.GetPlayerRecordByUserId(ra.UserId);
-            Logger.InfoS("admin.perms", $"{Player} removed admin {record?.LastSeenUserName ?? ra.UserId.ToString()}");
+            _sawmill.Info($"{Player} removed admin {record?.LastSeenUserName ?? ra.UserId.ToString()}");
 
             if (_playerManager.TryGetSessionById(ra.UserId, out var player))
             {
@@ -245,7 +248,7 @@ private async Task HandleUpdateAdmin(UpdateAdmin ua)
 
             if (!CanTouchAdmin(admin))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to modify higher-ranked admin {ua.UserId.ToString()}");
+                _sawmill.Warning($"{Player} tried to modify higher-ranked admin {ua.UserId.ToString()}");
                 return;
             }
 
@@ -266,7 +269,7 @@ private async Task HandleUpdateAdmin(UpdateAdmin ua)
             var title = ua.Title ?? "<no title>";
             var flags = AdminFlagsHelper.PosNegFlagsText(ua.PosFlags, ua.NegFlags);
 
-            Logger.InfoS("admin.perms", $"{Player} updated admin {name} to {title}/{rankName}/{flags}");
+            _sawmill.Info($"{Player} updated admin {name} to {title}/{rankName}/{flags}");
 
             if (_playerManager.TryGetSessionById(ua.UserId, out var player))
             {
@@ -304,8 +307,7 @@ private async Task HandleCreateAdmin(AddAdmin ca)
                 {
                     // username not in DB.
                     // TODO: Notify user.
-                    Logger.WarningS("admin.perms",
-                        $"{Player} tried to add admin with unknown username {ca.UserNameOrId}.");
+                    _sawmill.Warning($"{Player} tried to add admin with unknown username {ca.UserNameOrId}.");
                     return;
                 }
 
@@ -341,7 +343,7 @@ private async Task HandleCreateAdmin(AddAdmin ca)
             var title = ca.Title ?? "<no title>";
             var flags = AdminFlagsHelper.PosNegFlagsText(ca.PosFlags, ca.NegFlags);
 
-            Logger.InfoS("admin.perms", $"{Player} added admin {name} as {title}/{rankName}/{flags}");
+            _sawmill.Info($"{Player} added admin {name} as {title}/{rankName}/{flags}");
 
             if (_playerManager.TryGetSessionById(userId, out var player))
             {
@@ -362,7 +364,7 @@ private bool CheckCreatePerms(AdminFlags posFlags, AdminFlags negFlags)
             if (!UserAdminFlagCheck(posFlags))
             {
                 // Can't create an admin with higher perms than yourself, obviously.
-                Logger.WarningS("admin.perms", $"{Player} tried to grant admin powers above their authorization.");
+                _sawmill.Warning($"{Player} tried to grant admin powers above their authorization.");
                 return false;
             }
 
@@ -378,7 +380,7 @@ private bool CheckCreatePerms(AdminFlags posFlags, AdminFlags negFlags)
                 if (rank == null)
                 {
                     // Tried to set to nonexistent rank.
-                    Logger.WarningS("admin.perms", $"{Player} tried to assign nonexistent admin rank.");
+                    _sawmill.Warning($"{Player} tried to assign nonexistent admin rank.");
                     return (true, null);
                 }
 
@@ -388,7 +390,7 @@ private bool CheckCreatePerms(AdminFlags posFlags, AdminFlags negFlags)
                 if (!UserAdminFlagCheck(rankFlags))
                 {
                     // Can't assign a rank with flags you don't have yourself.
-                    Logger.WarningS("admin.perms", $"{Player} tried to assign admin rank above their authorization.");
+                    _sawmill.Warning($"{Player} tried to assign admin rank above their authorization.");
                     return (true, null);
                 }
             }
diff --git a/Content.Server/Administration/UI/SpawnExplosionEui.cs b/Content.Server/Administration/UI/SpawnExplosionEui.cs
index 98dc3072784..a3729b14543 100644
--- a/Content.Server/Administration/UI/SpawnExplosionEui.cs
+++ b/Content.Server/Administration/UI/SpawnExplosionEui.cs
@@ -12,6 +12,15 @@ namespace Content.Server.Administration.UI;
 [UsedImplicitly]
 public sealed class SpawnExplosionEui : BaseEui
 {
+    private readonly ExplosionSystem _explosionSystem;
+    private readonly ISawmill _sawmill;
+
+    public SpawnExplosionEui()
+    {
+        _explosionSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ExplosionSystem>();
+        _sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("explosion");
+    }
+
     public override void HandleMessage(EuiMessageBase msg)
     {
         base.HandleMessage(msg);
@@ -26,7 +35,7 @@ public override void HandleMessage(EuiMessageBase msg)
 
         if (explosion == null)
         {
-            Logger.Error("Failed to generate explosion preview.");
+            _sawmill.Error("Failed to generate explosion preview.");
             return;
         }
 
diff --git a/Content.Server/Afk/AFKSystem.cs b/Content.Server/Afk/AFKSystem.cs
index b8cfdfe6b3d..39d1e266d70 100644
--- a/Content.Server/Afk/AFKSystem.cs
+++ b/Content.Server/Afk/AFKSystem.cs
@@ -30,7 +30,7 @@ public override void Initialize()
     {
         base.Initialize();
         _playerManager.PlayerStatusChanged += OnPlayerChange;
-        _configManager.OnValueChanged(CCVars.AfkTime, SetAfkDelay, true);
+        Subs.CVar(_configManager, CCVars.AfkTime, SetAfkDelay, true);
 
         SubscribeNetworkEvent<FullInputCmdMessage>(HandleInputCmd);
     }
@@ -60,7 +60,6 @@ public override void Shutdown()
         base.Shutdown();
         _afkPlayers.Clear();
         _playerManager.PlayerStatusChanged -= OnPlayerChange;
-        _configManager.UnsubValueChanged(CCVars.AfkTime, SetAfkDelay);
     }
 
     public override void Update(float frameTime)
diff --git a/Content.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs
index 04e274ceeb5..848170ba9dc 100644
--- a/Content.Server/AlertLevel/AlertLevelSystem.cs
+++ b/Content.Server/AlertLevel/AlertLevelSystem.cs
@@ -168,7 +168,7 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
             if (detail.Sound != null)
             {
                 var filter = _stationSystem.GetInOwningStation(station);
-                _audio.PlayGlobal(detail.Sound.GetSound(), filter, true, detail.Sound.Params);
+                _audio.PlayGlobal(detail.Sound, filter, true, detail.Sound.Params);
             }
             else
             {
diff --git a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
index 2c432a24190..f52fc2b7187 100644
--- a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
+++ b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
@@ -9,19 +9,19 @@ namespace Content.Server.AlertLevel.Commands
 {
     [UsedImplicitly]
     [AdminCommand(AdminFlags.Admin)]
-    public sealed class SetAlertLevelCommand : IConsoleCommand
+    public sealed class SetAlertLevelCommand : LocalizedCommands
     {
-        public string Command => "setalertlevel";
-        public string Description => Loc.GetString("cmd-setalertlevel-desc");
-        public string Help => Loc.GetString("cmd-setalertlevel-help");
+        [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
 
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        public override string Command => "setalertlevel";
+
+        public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         {
             var levelNames = new string[] {};
             var player = shell.Player;
             if (player?.AttachedEntity != null)
             {
-                var stationUid = EntitySystem.Get<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
+                var stationUid = _entitySystems.GetEntitySystem<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
                 if (stationUid != null)
                 {
                     levelNames = GetStationLevelNames(stationUid.Value);
@@ -31,39 +31,39 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
             return args.Length switch
             {
                 1 => CompletionResult.FromHintOptions(levelNames,
-                    Loc.GetString("cmd-setalertlevel-hint-1")),
+                    LocalizationManager.GetString("cmd-setalertlevel-hint-1")),
                 2 => CompletionResult.FromHintOptions(CompletionHelper.Booleans,
-                    Loc.GetString("cmd-setalertlevel-hint-2")),
+                    LocalizationManager.GetString("cmd-setalertlevel-hint-2")),
                 _ => CompletionResult.Empty,
             };
         }
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length < 1)
             {
-                shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+                shell.WriteError(LocalizationManager.GetString("shell-wrong-arguments-number"));
                 return;
             }
 
             var locked = false;
             if (args.Length > 1 && !bool.TryParse(args[1], out locked))
             {
-                shell.WriteLine(Loc.GetString("shell-argument-must-be-boolean"));
+                shell.WriteLine(LocalizationManager.GetString("shell-argument-must-be-boolean"));
                 return;
             }
 
             var player = shell.Player;
             if (player?.AttachedEntity == null)
             {
-                shell.WriteLine(Loc.GetString("shell-only-players-can-run-this-command"));
+                shell.WriteLine(LocalizationManager.GetString("shell-only-players-can-run-this-command"));
                 return;
             }
 
-            var stationUid = EntitySystem.Get<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
+            var stationUid = _entitySystems.GetEntitySystem<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
             if (stationUid == null)
             {
-                shell.WriteLine(Loc.GetString("cmd-setalertlevel-invalid-grid"));
+                shell.WriteLine(LocalizationManager.GetString("cmd-setalertlevel-invalid-grid"));
                 return;
             }
 
@@ -71,11 +71,11 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             var levelNames = GetStationLevelNames(stationUid.Value);
             if (!levelNames.Contains(level))
             {
-                shell.WriteLine(Loc.GetString("cmd-setalertlevel-invalid-level"));
+                shell.WriteLine(LocalizationManager.GetString("cmd-setalertlevel-invalid-level"));
                 return;
             }
 
-            EntitySystem.Get<AlertLevelSystem>().SetLevel(stationUid.Value, level, true, true, true, locked);
+            _entitySystems.GetEntitySystem<AlertLevelSystem>().SetLevel(stationUid.Value, level, true, true, true, locked);
         }
 
         private string[] GetStationLevelNames(EntityUid station)
diff --git a/Content.Server/Ame/AmeNodeGroup.cs b/Content.Server/Ame/AmeNodeGroup.cs
index 25d98bf9942..608356f7605 100644
--- a/Content.Server/Ame/AmeNodeGroup.cs
+++ b/Content.Server/Ame/AmeNodeGroup.cs
@@ -5,7 +5,8 @@
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.NodeContainer.Nodes;
-using Robust.Shared.Map;
+using Robust.Server.GameObjects;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
 
 namespace Content.Server.Ame;
@@ -18,7 +19,6 @@ public sealed class AmeNodeGroup : BaseNodeGroup
 {
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
     /// <summary>
@@ -46,6 +46,7 @@ public override void LoadNodes(List<Node> groupNodes)
 
         var ameControllerSystem = _entMan.System<AmeControllerSystem>();
         var ameShieldingSystem = _entMan.System<AmeShieldingSystem>();
+        var mapSystem = _entMan.System<MapSystem>();
 
         var shieldQuery = _entMan.GetEntityQuery<AmeShieldComponent>();
         var controllerQuery = _entMan.GetEntityQuery<AmeControllerComponent>();
@@ -57,7 +58,7 @@ public override void LoadNodes(List<Node> groupNodes)
                 continue;
             if (!xformQuery.TryGetComponent(nodeOwner, out var xform))
                 continue;
-            if (!_mapManager.TryGetGrid(xform.GridUid, out var grid))
+            if (!_entMan.TryGetComponent(xform.GridUid, out MapGridComponent? grid))
                 continue;
 
             if (gridEnt == null)
@@ -65,7 +66,7 @@ public override void LoadNodes(List<Node> groupNodes)
             else if (gridEnt != xform.GridUid)
                 continue;
 
-            var nodeNeighbors = grid.GetCellsInSquareArea(xform.Coordinates, 1)
+            var nodeNeighbors = mapSystem.GetCellsInSquareArea(xform.GridUid.Value, grid, xform.Coordinates, 1)
                 .Where(entity => entity != nodeOwner && shieldQuery.HasComponent(entity));
 
             if (nodeNeighbors.Count() >= 8)
diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
index 7b42b9d8901..434a3fef66b 100644
--- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
+++ b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
@@ -25,8 +25,6 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly PowerReceiverSystem _power = default!;
 
-    private const float AttachRange = 0.15f; // The radius of one tile. It must not be set higher, otherwise the anomaly can be moved from tile to tile.
-
     public override void Initialize()
     {
         base.Initialize();
@@ -55,9 +53,9 @@ public bool TryAttachNearbyAnomaly(Entity<AnomalySynchronizerComponent> ent, Ent
         }
 
         var coords = _transform.GetMapCoordinates(ent);
-        var anomaly = _entityLookup.GetEntitiesInRange<AnomalyComponent>(coords, AttachRange).FirstOrDefault();
+        var anomaly = _entityLookup.GetEntitiesInRange<AnomalyComponent>(coords, ent.Comp.AttachRange).FirstOrDefault();
 
-        if (anomaly.Owner is {Valid: false}) // no anomaly in range
+        if (anomaly.Owner is { Valid: false }) // no anomaly in range
         {
             if (user is not null)
                 _popup.PopupEntity(Loc.GetString("anomaly-sync-no-anomaly"), ent, user.Value);
@@ -77,7 +75,6 @@ private void OnPowerChanged(Entity<AnomalySynchronizerComponent> ent, ref PowerC
         if (!TryComp<AnomalyComponent>(ent.Comp.ConnectedAnomaly, out var anomaly))
             return;
 
-        _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
         DisconneсtFromAnomaly(ent, anomaly);
     }
 
@@ -92,7 +89,8 @@ private void OnGetInteractionVerbs(Entity<AnomalySynchronizerComponent> ent, ref
             return;
 
         var user = args.User;
-        args.Verbs.Add(new() {
+        args.Verbs.Add(new()
+        {
             Act = () =>
             {
                 TryAttachNearbyAnomaly(ent, user);
@@ -117,7 +115,9 @@ private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<A
         var targetXform = _transform.GetWorldPosition(ent);
         _transform.SetWorldPosition(anomaly, targetXform);
 
-        _anomaly.DoAnomalyPulse(anomaly, anomaly);
+        if (ent.Comp.PulseOnConnect)
+            _anomaly.DoAnomalyPulse(anomaly, anomaly);
+
         _popup.PopupEntity(Loc.GetString("anomaly-sync-connected"), ent, PopupType.Medium);
         _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
     }
@@ -129,7 +129,9 @@ private void DisconneсtFromAnomaly(Entity<AnomalySynchronizerComponent> ent, An
         if (ent.Comp.ConnectedAnomaly == null)
             return;
 
-        _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
+        if (ent.Comp.PulseOnDisconnect)
+            _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
+
         _popup.PopupEntity(Loc.GetString("anomaly-sync-disconnected"), ent, PopupType.Large);
         _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
 
diff --git a/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs b/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs
index 295ce885c29..235e740cf35 100644
--- a/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs
+++ b/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs
@@ -1,5 +1,3 @@
-using Content.Shared.Anomaly;
-using Content.Shared.Anomaly.Components;
 using Content.Shared.DeviceLinking;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -18,6 +16,23 @@ public sealed partial class AnomalySynchronizerComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? ConnectedAnomaly;
 
+    /// <summary>
+    /// Should the anomaly pulse when connected to the synchronizer?
+    /// </summary>
+    [DataField]
+    public bool PulseOnConnect = true;
+
+    /// <summary>
+    /// Should the anomaly pulse when disconnected from synchronizer?
+    /// </summary>
+    [DataField]
+    public bool PulseOnDisconnect = false;
+
+    /// <summary>
+    /// minimum distance from the synchronizer to the anomaly to be attached
+    /// </summary>
+    [DataField]
+    public float AttachRange = 0.4f;
 
     [DataField]
     public ProtoId<SourcePortPrototype> DecayingPort = "Decaying";
diff --git a/Content.Server/Atmos/Components/PressureProtectionComponent.cs b/Content.Server/Atmos/Components/PressureProtectionComponent.cs
index a3a2842159b..e1f13bca793 100644
--- a/Content.Server/Atmos/Components/PressureProtectionComponent.cs
+++ b/Content.Server/Atmos/Components/PressureProtectionComponent.cs
@@ -1,18 +1,33 @@
-namespace Content.Server.Atmos.Components
+using Content.Server.Atmos.EntitySystems;
+
+namespace Content.Server.Atmos.Components;
+
+[RegisterComponent]
+[Access(typeof(BarotraumaSystem))]
+public sealed partial class PressureProtectionComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class PressureProtectionComponent : Component
-    {
-        [DataField("highPressureMultiplier")]
-        public float HighPressureMultiplier { get; private set; } = 1f;
+    [DataField]
+    public float HighPressureMultiplier = 1f;
+
+    [DataField]
+    public float HighPressureModifier;
 
-        [DataField("highPressureModifier")]
-        public float HighPressureModifier { get; private set; } = 0f;
+    [DataField]
+    public float LowPressureMultiplier = 1f;
 
-        [DataField("lowPressureMultiplier")]
-        public float LowPressureMultiplier { get; private set; } = 1f;
+    [DataField]
+    public float LowPressureModifier;
+}
 
-        [DataField("lowPressureModifier")]
-        public float LowPressureModifier { get; private set; } = 0f;
-    }
+/// <summary>
+/// Event raised on an entity with <see cref="PressureProtectionComponent"/> in order to adjust its default values.
+/// </summary>
+[ByRefEvent]
+public record struct GetPressureProtectionValuesEvent
+{
+    public float HighPressureMultiplier;
+    public float HighPressureModifier;
+    public float LowPressureMultiplier;
+    public float LowPressureModifier;
 }
+
diff --git a/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs b/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs
index 3f9d7bc7711..bdee5ff5140 100644
--- a/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs
+++ b/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs
@@ -1,11 +1,20 @@
-namespace Content.Server.Atmos.Components;
+using Content.Server.Temperature.Systems;
+
+namespace Content.Server.Atmos.Components;
 
 [RegisterComponent]
+[Access(typeof(TemperatureSystem))]
 public sealed partial class TemperatureProtectionComponent : Component
 {
     /// <summary>
     ///     How much to multiply temperature deltas by.
     /// </summary>
-    [DataField("coefficient")]
+    [DataField]
     public float Coefficient = 1.0f;
 }
+
+/// <summary>
+/// Event raised on an entity with <see cref="TemperatureProtectionComponent"/> to determine the actual value of the coefficient.
+/// </summary>
+[ByRefEvent]
+public record struct GetTemperatureProtectionEvent(float Coefficient);
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
index 7f82e6fb57b..3aaa5429fb0 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
@@ -36,25 +36,25 @@ public sealed partial class AtmosphereSystem
 
         private void InitializeCVars()
         {
-            _cfg.OnValueChanged(CCVars.SpaceWind, value => SpaceWind = value, true);
-            _cfg.OnValueChanged(CCVars.SpaceWindPressureForceDivisorThrow, value => SpaceWindPressureForceDivisorThrow = value, true);
-            _cfg.OnValueChanged(CCVars.SpaceWindPressureForceDivisorPush, value => SpaceWindPressureForceDivisorPush = value, true);
-            _cfg.OnValueChanged(CCVars.SpaceWindMaxVelocity, value => SpaceWindMaxVelocity = value, true);
-            _cfg.OnValueChanged(CCVars.SpaceWindMaxPushForce, value => SpaceWindMaxPushForce = value, true);
-            _cfg.OnValueChanged(CCVars.MonstermosEqualization, value => MonstermosEqualization = value, true);
-            _cfg.OnValueChanged(CCVars.MonstermosDepressurization, value => MonstermosDepressurization = value, true);
-            _cfg.OnValueChanged(CCVars.MonstermosRipTiles, value => MonstermosRipTiles = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosGridImpulse, value => GridImpulse = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosSpacingEscapeRatio, value => SpacingEscapeRatio = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosSpacingMinGas, value => SpacingMinGas = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosSpacingMaxWind, value => SpacingMaxWind = value, true);
-            _cfg.OnValueChanged(CCVars.Superconduction, value => Superconduction = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosMaxProcessTime, value => AtmosMaxProcessTime = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosTickRate, value => AtmosTickRate = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosSpeedup, value => Speedup = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosHeatScale, value => { HeatScale = value; InitializeGases(); }, true);
-            _cfg.OnValueChanged(CCVars.ExcitedGroups, value => ExcitedGroups = value, true);
-            _cfg.OnValueChanged(CCVars.ExcitedGroupsSpaceIsAllConsuming, value => ExcitedGroupsSpaceIsAllConsuming = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWind, value => SpaceWind = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindPressureForceDivisorThrow, value => SpaceWindPressureForceDivisorThrow = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindPressureForceDivisorPush, value => SpaceWindPressureForceDivisorPush = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindMaxVelocity, value => SpaceWindMaxVelocity = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindMaxPushForce, value => SpaceWindMaxPushForce = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosEqualization, value => MonstermosEqualization = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosDepressurization, value => MonstermosDepressurization = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosRipTiles, value => MonstermosRipTiles = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosGridImpulse, value => GridImpulse = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosSpacingEscapeRatio, value => SpacingEscapeRatio = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosSpacingMinGas, value => SpacingMinGas = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosSpacingMaxWind, value => SpacingMaxWind = value, true);
+            Subs.CVar(_cfg, CCVars.Superconduction, value => Superconduction = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosMaxProcessTime, value => AtmosMaxProcessTime = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosTickRate, value => AtmosTickRate = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosSpeedup, value => Speedup = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosHeatScale, value => { HeatScale = value; InitializeGases(); }, true);
+            Subs.CVar(_cfg, CCVars.ExcitedGroups, value => ExcitedGroups = value, true);
+            Subs.CVar(_cfg, CCVars.ExcitedGroupsSpaceIsAllConsuming, value => ExcitedGroupsSpaceIsAllConsuming = value, true);
         }
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
index 1b3e1b07a6f..023ac287634 100644
--- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.Components;
 using Content.Shared.Alert;
@@ -97,7 +98,11 @@ private void UpdateCachedResistances(EntityUid uid, BarotraumaComponent barotrau
                 foreach (var slot in barotrauma.ProtectionSlots)
                 {
                     if (!_inventorySystem.TryGetSlotEntity(uid, slot, out var equipment, inv, contMan)
-                        || !TryComp(equipment, out PressureProtectionComponent? protection))
+                        || !TryGetPressureProtectionValues(equipment.Value,
+                            out var itemHighMultiplier,
+                            out var itemHighModifier,
+                            out var itemLowMultiplier,
+                            out var itemLowModifier))
                     {
                         // Missing protection, skin is exposed.
                         hPModifier = 0f;
@@ -108,10 +113,10 @@ private void UpdateCachedResistances(EntityUid uid, BarotraumaComponent barotrau
                     }
 
                     // The entity is as protected as its weakest part protection
-                    hPModifier = Math.Max(hPModifier, protection.HighPressureModifier);
-                    hPMultiplier = Math.Max(hPMultiplier, protection.HighPressureMultiplier);
-                    lPModifier = Math.Min(lPModifier, protection.LowPressureModifier);
-                    lPMultiplier = Math.Min(lPMultiplier, protection.LowPressureMultiplier);
+                    hPModifier = Math.Max(hPModifier, itemHighModifier.Value);
+                    hPMultiplier = Math.Max(hPMultiplier, itemHighMultiplier.Value);
+                    lPModifier = Math.Min(lPModifier, itemLowModifier.Value);
+                    lPMultiplier = Math.Min(lPMultiplier, itemLowMultiplier.Value);
                 }
 
                 barotrauma.HighPressureModifier = hPModifier;
@@ -121,12 +126,16 @@ private void UpdateCachedResistances(EntityUid uid, BarotraumaComponent barotrau
             }
 
             // any innate pressure resistance ?
-            if (TryComp<PressureProtectionComponent>(uid, out var innatePressureProtection))
+            if (TryGetPressureProtectionValues(uid,
+                    out var highMultiplier,
+                    out var highModifier,
+                    out var lowMultiplier,
+                    out var lowModifier))
             {
-                barotrauma.HighPressureModifier += innatePressureProtection.HighPressureModifier;
-                barotrauma.HighPressureMultiplier *= innatePressureProtection.HighPressureMultiplier;
-                barotrauma.LowPressureModifier += innatePressureProtection.LowPressureModifier;
-                barotrauma.LowPressureMultiplier *= innatePressureProtection.LowPressureMultiplier;
+                barotrauma.HighPressureModifier += highModifier.Value;
+                barotrauma.HighPressureMultiplier *= highMultiplier.Value;
+                barotrauma.LowPressureModifier += lowModifier.Value;
+                barotrauma.LowPressureMultiplier *= lowMultiplier.Value;
             }
         }
 
@@ -156,6 +165,36 @@ public float GetFeltHighPressure(EntityUid uid, BarotraumaComponent barotrauma,
             return (environmentPressure + barotrauma.HighPressureModifier) * (barotrauma.HighPressureMultiplier);
         }
 
+        public bool TryGetPressureProtectionValues(
+            Entity<PressureProtectionComponent?> ent,
+            [NotNullWhen(true)] out float? highMultiplier,
+            [NotNullWhen(true)] out float? highModifier,
+            [NotNullWhen(true)] out float? lowMultiplier,
+            [NotNullWhen(true)] out float? lowModifier)
+        {
+            highMultiplier = null;
+            highModifier = null;
+            lowMultiplier = null;
+            lowModifier = null;
+            if (!Resolve(ent, ref ent.Comp, false))
+                return false;
+
+            var comp = ent.Comp;
+            var ev = new GetPressureProtectionValuesEvent
+            {
+                HighPressureMultiplier = comp.HighPressureMultiplier,
+                HighPressureModifier = comp.HighPressureModifier,
+                LowPressureMultiplier = comp.LowPressureMultiplier,
+                LowPressureModifier = comp.LowPressureModifier
+            };
+            RaiseLocalEvent(ent, ref ev);
+            highMultiplier = ev.HighPressureMultiplier;
+            highModifier = ev.HighPressureModifier;
+            lowMultiplier = ev.LowPressureMultiplier;
+            lowModifier = ev.LowPressureModifier;
+            return true;
+        }
+
         public override void Update(float frameTime)
         {
             _timer += frameTime;
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index cb1cb9bc150..53fcb720766 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.Stunnable;
 using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
+using Content.Server.Damage.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -20,6 +21,7 @@
 using Content.Shared.Timing;
 using Content.Shared.Toggleable;
 using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.FixedPoint;
 using Robust.Server.Audio;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -73,6 +75,8 @@ public override void Initialize()
             SubscribeLocalEvent<IgniteOnMeleeHitComponent, MeleeHitEvent>(OnMeleeHit);
 
             SubscribeLocalEvent<ExtinguishOnInteractComponent, ActivateInWorldEvent>(OnExtinguishActivateInWorld);
+
+            SubscribeLocalEvent<IgniteOnHeatDamageComponent, DamageChangedEvent>(OnDamageChanged);
         }
 
         private void OnMeleeHit(EntityUid uid, IgniteOnMeleeHitComponent component, MeleeHitEvent args)
@@ -318,6 +322,31 @@ public void Ignite(EntityUid uid, EntityUid ignitionSource, FlammableComponent?
             UpdateAppearance(uid, flammable);
         }
 
+        private void OnDamageChanged(EntityUid uid, IgniteOnHeatDamageComponent component, DamageChangedEvent args)
+        {
+            // Make sure the entity is flammable
+            if (!TryComp<FlammableComponent>(uid, out var flammable))
+                return;
+
+            // Make sure the damage delta isn't null
+            if (args.DamageDelta == null)
+                return;
+
+            // Check if its' taken any heat damage, and give the value
+            if (args.DamageDelta.DamageDict.TryGetValue("Heat", out FixedPoint2 value))
+            {
+                // Make sure the value is greater than the threshold
+                if(value <= component.Threshold)
+                    return;
+
+                // Ignite that sucker
+                flammable.FireStacks += component.FireStacks;
+                Ignite(uid, uid, flammable);
+            }
+
+
+        }
+
         public void Resist(EntityUid uid,
             FlammableComponent? flammable = null)
         {
diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
index c0fc1896e3f..8ae9517379e 100644
--- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
@@ -76,9 +76,9 @@ public override void Initialize()
             };
 
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
-            _confMan.OnValueChanged(CCVars.NetGasOverlayTickRate, UpdateTickRate, true);
-            _confMan.OnValueChanged(CCVars.GasOverlayThresholds, UpdateThresholds, true);
-            _confMan.OnValueChanged(CVars.NetPVS, OnPvsToggle, true);
+            Subs.CVar(_confMan, CCVars.NetGasOverlayTickRate, UpdateTickRate, true);
+            Subs.CVar(_confMan, CCVars.GasOverlayThresholds, UpdateThresholds, true);
+            Subs.CVar(_confMan, CVars.NetPVS, OnPvsToggle, true);
 
             SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
             SubscribeLocalEvent<GasTileOverlayComponent, ComponentStartup>(OnStartup);
@@ -95,9 +95,6 @@ public override void Shutdown()
         {
             base.Shutdown();
             _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
-            _confMan.UnsubValueChanged(CCVars.NetGasOverlayTickRate, UpdateTickRate);
-            _confMan.UnsubValueChanged(CCVars.GasOverlayThresholds, UpdateThresholds);
-            _confMan.UnsubValueChanged(CVars.NetPVS, OnPvsToggle);
         }
 
         private void OnPvsToggle(bool value)
diff --git a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
index af73bcd7f90..286b154e96f 100644
--- a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
@@ -30,13 +30,7 @@ public override void Initialize()
         SubscribeLocalEvent<HeatExchangerComponent, AtmosDeviceUpdateEvent>(OnAtmosUpdate);
 
         // Getting CVars is expensive, don't do it every tick
-        _cfg.OnValueChanged(CCVars.SuperconductionTileLoss, CacheTileLoss, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _cfg.UnsubValueChanged(CCVars.SuperconductionTileLoss, CacheTileLoss);
+        Subs.CVar(_cfg, CCVars.SuperconductionTileLoss, CacheTileLoss, true);
     }
 
     private void CacheTileLoss(float val)
diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
index b346fd63b0d..2922d0796a9 100644
--- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Atmos.Monitor.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.DeviceLinking;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.Wires;
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
index 27e64a9956d..2875d4a3d5d 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Power.Components;
 using Content.Shared.Atmos.Monitor;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Tag;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs b/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs
index 0b73ea5f351..33e4eafc741 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs
@@ -1,6 +1,7 @@
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Shared.Atmos.Monitor.Components;
+using Content.Shared.DeviceNetwork;
 
 namespace Content.Server.Atmos.Monitor.Systems;
 
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 1fcb7734d8b..28a0a01c99a 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -8,6 +8,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Monitor;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index 4ae0d70f5e7..10b9cccc099 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -13,6 +13,7 @@
 using Content.Shared.Atmos.Visuals;
 using Content.Shared.Audio;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
index 93d973d1231..5da4ec9fdf2 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
@@ -64,5 +64,11 @@ public sealed partial class GasThermoMachineComponent : Component
         /// </summary>
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public float EnergyLeakPercentage;
+
+        /// <summary>
+        /// If true, heat is exclusively exchanged with the local atmosphere instead of the inlet pipe air
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public bool Atmospheric = false;
     }
 }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index e1e7b2a7013..64d02d793bc 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -17,7 +17,6 @@
 using Content.Shared.Interaction;
 using Content.Shared.Lock;
 using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
@@ -54,7 +53,6 @@ public override void Initialize()
         SubscribeLocalEvent<GasCanisterComponent, GasCanisterHoldingTankEjectMessage>(OnHoldingTankEjectMessage);
         SubscribeLocalEvent<GasCanisterComponent, GasCanisterChangeReleasePressureMessage>(OnCanisterChangeReleasePressure);
         SubscribeLocalEvent<GasCanisterComponent, GasCanisterChangeReleaseValveMessage>(OnCanisterChangeReleaseValve);
-        SubscribeLocalEvent<GasCanisterComponent, LockToggledEvent>(OnLockToggled);
     }
 
     /// <summary>
@@ -78,11 +76,6 @@ private void OnCanisterStartup(EntityUid uid, GasCanisterComponent comp, Compone
     {
         // Ensure container
         _slots.AddItemSlot(uid, comp.ContainerName, comp.GasTankSlot);
-
-        if (TryComp<LockComponent>(uid, out var lockComp))
-        {
-            _appearance.SetData(uid, GasCanisterVisuals.Locked, lockComp.Locked);
-        }
     }
 
     private void DirtyUI(EntityUid uid,
@@ -309,11 +302,6 @@ private void OnAnalyzed(EntityUid uid, GasCanisterComponent component, GasAnalyz
         args.GasMixtures = new Dictionary<string, GasMixture?> { {Name(uid), component.Air} };
     }
 
-    private void OnLockToggled(EntityUid uid, GasCanisterComponent component, ref LockToggledEvent args)
-    {
-        _appearance.SetData(uid, GasCanisterVisuals.Locked, args.Locked);
-    }
-
     /// <summary>
     /// Check if the canister is locked, playing its sound and popup if so.
     /// </summary>
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
index ee0dca0fb0a..29000826232 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
@@ -17,6 +17,7 @@
 using Content.Shared.UserInterface;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Examine;
 
 namespace Content.Server.Atmos.Piping.Unary.EntitySystems
@@ -54,17 +55,17 @@ private void OnBeforeOpened(Entity<GasThermoMachineComponent> ent, ref BeforeAct
 
         private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent thermoMachine, ref AtmosDeviceUpdateEvent args)
         {
-            if (!(_power.IsPowered(uid) && TryComp<ApcPowerReceiverComponent>(uid, out var receiver))
-                || !TryComp<NodeContainerComponent>(uid, out var nodeContainer)
-                || !_nodeContainer.TryGetNode(nodeContainer, thermoMachine.InletName, out PipeNode? inlet))
-            {
+            if (!(_power.IsPowered(uid) && TryComp<ApcPowerReceiverComponent>(uid, out var receiver)))
+                return;
+
+            GetHeatExchangeGasMixture(uid, thermoMachine, out var heatExchangeGasMixture);
+            if (heatExchangeGasMixture == null)
                 return;
-            }
 
             float sign = Math.Sign(thermoMachine.Cp); // 1 if heater, -1 if freezer
             float targetTemp = thermoMachine.TargetTemperature;
             float highTemp = targetTemp + sign * thermoMachine.TemperatureTolerance;
-            float temp = inlet.Air.Temperature;
+            float temp = heatExchangeGasMixture.Temperature;
 
             if (sign * temp >= sign * highTemp) // upper bound
                 thermoMachine.HysteresisState = false; // turn off
@@ -73,8 +74,7 @@ private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent the
 
             if (thermoMachine.HysteresisState)
                 targetTemp = highTemp; // when on, target upper hysteresis bound
-
-            if (!thermoMachine.HysteresisState) // Hysteresis is the same as "Should this be on?"
+            else // Hysteresis is the same as "Should this be on?"
             {
                 // Turn dynamic load back on when power has been adjusted to not cause lights to
                 // blink every time this heater comes on.
@@ -86,7 +86,7 @@ private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent the
             float dQ = thermoMachine.HeatCapacity * thermoMachine.Cp * args.dt;
 
             // Clamps the heat transferred to not overshoot
-            float Cin = _atmosphereSystem.GetHeatCapacity(inlet.Air, true);
+            float Cin = _atmosphereSystem.GetHeatCapacity(heatExchangeGasMixture, true);
             float dT = targetTemp - temp;
             float dQLim = dT * Cin;
             float scale = 1f;
@@ -95,17 +95,45 @@ private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent the
                 scale = dQLim / dQ; // reduce power consumption
                 thermoMachine.HysteresisState = false; // turn off
             }
+
             float dQActual = dQ * scale;
-            float dQLeak = dQActual * thermoMachine.EnergyLeakPercentage;
-            float dQPipe = dQActual - dQLeak;
-            _atmosphereSystem.AddHeat(inlet.Air, dQPipe);
+            if (thermoMachine.Atmospheric)
+            {
+                _atmosphereSystem.AddHeat(heatExchangeGasMixture, dQActual);
+            }
+            else
+            {
+                float dQLeak = dQActual * thermoMachine.EnergyLeakPercentage;
+                float dQPipe = dQActual - dQLeak;
+                _atmosphereSystem.AddHeat(heatExchangeGasMixture, dQPipe);
 
-            if (_atmosphereSystem.GetContainingMixture(uid) is { } containingMixture)
-                _atmosphereSystem.AddHeat(containingMixture, dQLeak);
+                if (dQLeak != 0f && _atmosphereSystem.GetContainingMixture(uid) is { } containingMixture)
+                    _atmosphereSystem.AddHeat(containingMixture, dQLeak);
+            }
 
             receiver.Load = thermoMachine.HeatCapacity;// * scale; // we're not ready for dynamic load yet, see note above
         }
 
+        /// <summary>
+        /// Returns the gas mixture with which the thermomachine will exchange heat (the local atmosphere if atmospheric or the inlet pipe
+        /// air if not). Returns null if no gas mixture is found.
+        /// </summary>
+        private void GetHeatExchangeGasMixture(EntityUid uid, GasThermoMachineComponent thermoMachine, out GasMixture? heatExchangeGasMixture)
+        {
+            heatExchangeGasMixture = null;
+            if (thermoMachine.Atmospheric)
+            {
+                heatExchangeGasMixture = _atmosphereSystem.GetContainingMixture(uid);
+            }
+            else
+            {
+                if (!TryComp<NodeContainerComponent>(uid, out var nodeContainer)
+                    || !_nodeContainer.TryGetNode(nodeContainer, thermoMachine.InletName, out PipeNode? inlet))
+                    return;
+                heatExchangeGasMixture = inlet.Air;
+            }
+        }
+
         private bool IsHeater(GasThermoMachineComponent comp)
         {
             return comp.Cp >= 0;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index a35c6b1aa6e..3a3ccf75234 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -16,6 +16,7 @@
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Atmos.Visuals;
 using Content.Shared.Audio;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Examine;
 using Content.Shared.Tools.Systems;
 using JetBrains.Annotations;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
index ecf7d1d0b45..32591e9c540 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Atmos.Monitor;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Audio;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Tools.Systems;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index 1630d4cb10d..18119909abc 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -15,6 +15,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using System.Numerics;
+using Content.Shared.Gibbing.Components;
 using Content.Shared.Movement.Systems;
 using Robust.Shared.Audio.Systems;
 
@@ -106,7 +107,16 @@ protected override void RemovePart(
         _humanoidSystem.SetLayersVisibility(bodyUid, layers, false, true, humanoid);
     }
 
-    public override HashSet<EntityUid> GibBody(EntityUid bodyId, bool gibOrgans = false, BodyComponent? body = null, bool deleteItems = false, bool deleteBrain = false)
+    public override HashSet<EntityUid> GibBody(
+        EntityUid bodyId,
+        bool gibOrgans = false,
+        BodyComponent? body = null ,
+        bool launchGibs = true,
+        Vector2? splatDirection = null,
+        float splatModifier = 1,
+        Angle splatCone = default,
+        SoundSpecifier? gibSoundOverride = null
+    )
     {
         if (!Resolve(bodyId, ref body, false))
             return new HashSet<EntityUid>();
@@ -118,28 +128,8 @@ public override HashSet<EntityUid> GibBody(EntityUid bodyId, bool gibOrgans = fa
         if (xform.MapUid == null)
             return new HashSet<EntityUid>();
 
-        var gibs = base.GibBody(bodyId, gibOrgans, body, deleteItems, deleteBrain);
-
-        var coordinates = xform.Coordinates;
-        var filter = Filter.Pvs(bodyId, entityManager: EntityManager);
-        var audio = AudioParams.Default.WithVariation(0.025f);
-
-        _audio.PlayStatic(body.GibSound, filter, coordinates, true, audio);
-
-        foreach (var entity in gibs)
-        {
-            if (deleteItems)
-            {
-                if (!HasComp<BrainComponent>(entity) || deleteBrain)
-                {
-                    QueueDel(entity);
-                }
-            }
-            else
-            {
-                SharedTransform.SetCoordinates(entity, coordinates.Offset(_random.NextVector2(.3f)));
-            }
-        }
+        var gibs = base.GibBody(bodyId, gibOrgans, body, launchGibs: launchGibs,
+            splatDirection: splatDirection, splatModifier: splatModifier, splatCone:splatCone);
         RaiseLocalEvent(bodyId, new BeingGibbedEvent(gibs));
         QueueDel(bodyId);
 
diff --git a/Content.Server/Botany/Components/SeedComponent.cs b/Content.Server/Botany/Components/SeedComponent.cs
index 3e729dc9060..f475ec3cfc4 100644
--- a/Content.Server/Botany/Components/SeedComponent.cs
+++ b/Content.Server/Botany/Components/SeedComponent.cs
@@ -15,6 +15,12 @@ public sealed partial class SeedComponent : SharedSeedComponent
         [DataField("seed")]
         public SeedData? Seed;
 
+        /// <summary>
+        ///     If not null, overrides the plant's initial health. Otherwise, the plant's initial health is set to the Endurance value.
+        /// </summary>
+        [DataField]
+        public float? HealthOverride = null;
+
         /// <summary>
         ///     Name of a base seed prototype that is used if <see cref="Seed"/> is null.
         /// </summary>
diff --git a/Content.Server/Botany/Systems/BotanySystem.Seed.cs b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
index c9389f832e7..f64fcb3c43d 100644
--- a/Content.Server/Botany/Systems/BotanySystem.Seed.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
@@ -104,11 +104,12 @@ private void OnExamined(EntityUid uid, SeedComponent component, ExaminedEvent ar
     /// <summary>
     /// Spawns a new seed packet on the floor at a position, then tries to put it in the user's hands if possible.
     /// </summary>
-    public EntityUid SpawnSeedPacket(SeedData proto, EntityCoordinates coords, EntityUid user)
+    public EntityUid SpawnSeedPacket(SeedData proto, EntityCoordinates coords, EntityUid user, float? healthOverride = null)
     {
         var seed = Spawn(proto.PacketPrototype, coords);
         var seedComp = EnsureComp<SeedComponent>(seed);
         seedComp.Seed = proto;
+        seedComp.HealthOverride = healthOverride;
 
         var name = Loc.GetString(proto.Name);
         var noun = Loc.GetString(proto.Noun);
diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs
index cfa944a221a..c7ce5d47efa 100644
--- a/Content.Server/Botany/Systems/MutationSystem.cs
+++ b/Content.Server/Botany/Systems/MutationSystem.cs
@@ -131,7 +131,7 @@ public SeedData Cross(SeedData a, SeedData b)
 
         // Hybrids have a high chance of being seedless. Balances very
         // effective hybrid crossings.
-        if (a.Name == result.Name && Random(0.7f))
+        if (a.Name != result.Name && Random(0.7f))
         {
             result.Seedless = true;
         }
diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index 6bf0b9692ce..0f54fd0da50 100644
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -71,6 +71,17 @@ public override void Update(float frameTime)
         }
     }
 
+    private int GetCurrentGrowthStage(Entity<PlantHolderComponent> entity)
+    {
+        var (uid, component) = entity;
+
+        if (component.Seed == null)
+            return 0;
+
+        var result = Math.Max(1, (int) (component.Age * component.Seed.GrowthStages / component.Seed.Maturation));
+        return result;
+    }
+
     private void OnExamine(Entity<PlantHolderComponent> entity, ref ExaminedEvent args)
     {
         if (!args.IsInDetailsRange)
@@ -148,6 +159,7 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
                 if (!_botany.TryGetSeed(seeds, out var seed))
                     return;
 
+                float? seedHealth = seeds.HealthOverride;
                 var name = Loc.GetString(seed.Name);
                 var noun = Loc.GetString(seed.Noun);
                 _popup.PopupCursor(Loc.GetString("plant-holder-component-plant-success-message",
@@ -157,7 +169,14 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
                 component.Seed = seed;
                 component.Dead = false;
                 component.Age = 1;
-                component.Health = component.Seed.Endurance;
+                if (seedHealth is float realSeedHealth)
+                {
+                    component.Health = realSeedHealth;
+                }
+                else
+                {
+                    component.Health = component.Seed.Endurance;
+                }
                 component.LastCycle = _gameTiming.CurTime;
 
                 QueueDel(args.Used);
@@ -262,13 +281,19 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
                 return;
             }
 
+            if (GetCurrentGrowthStage(entity) <= 1)
+            {
+                _popup.PopupCursor(Loc.GetString("plant-holder-component-early-sample-message"), args.User);
+                return;
+            }
+
+            component.Health -= (_random.Next(3, 5) * 10);
             component.Seed.Unique = false;
-            var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User);
+            var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User, component.Health);
             _randomHelper.RandomOffset(seed, 0.25f);
             var displayName = Loc.GetString(component.Seed.DisplayName);
             _popup.PopupCursor(Loc.GetString("plant-holder-component-take-sample-message",
                 ("seedName", displayName)), args.User);
-            component.Health -= (_random.Next(3, 5) * 10);
 
             if (component.Seed != null && component.Seed.CanScream)
             {
@@ -596,6 +621,7 @@ public void Update(EntityUid uid, PlantHolderComponent? component = null)
             RemovePlant(uid, component);
             component.ForceUpdate = true;
             Update(uid, component);
+            return;
         }
 
         CheckHealth(uid, component);
@@ -897,7 +923,7 @@ public void UpdateSprite(EntityUid uid, PlantHolderComponent? component = null)
             }
             else if (component.Age < component.Seed.Maturation)
             {
-                var growthStage = Math.Max(1, (int) (component.Age * component.Seed.GrowthStages / component.Seed.Maturation));
+                var growthStage = GetCurrentGrowthStage((uid, component));
 
                 _appearance.SetData(uid, PlantHolderVisuals.PlantRsi, component.Seed.PlantRsi.ToString(), app);
                 _appearance.SetData(uid, PlantHolderVisuals.PlantState, $"stage-{growthStage}", app);
diff --git a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
index fca29a40132..5247aafbd51 100644
--- a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
@@ -31,7 +31,7 @@ public override void Initialize()
         SubscribeLocalEvent<CrewManifestCartridgeComponent, CartridgeMessageEvent>(OnUiMessage);
         SubscribeLocalEvent<CrewManifestCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
         SubscribeLocalEvent<ProgramInstallationAttempt>(OnInstallationAttempt);
-        _configManager.OnValueChanged(CCVars.CrewManifestUnsecure, OnCrewManifestUnsecureChanged, true);
+        Subs.CVar(_configManager, CCVars.CrewManifestUnsecure, OnCrewManifestUnsecureChanged, true);
     }
 
     /// <summary>
@@ -92,10 +92,4 @@ private void OnCrewManifestUnsecureChanged(bool unsecureViewersAllowed)
                 _cartridgeLoader.UninstallProgram(loaderUid, program.Value, comp);
         }
     }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configManager.UnsubValueChanged(CCVars.CrewManifestUnsecure, OnCrewManifestUnsecureChanged);
-    }
 }
diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
index 77119eefc07..11eb67056df 100644
--- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs
+++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
@@ -38,6 +38,14 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         { ":>", "chatsan-grins" },
         { ":<", "chatsan-pouts" },
         { "xD", "chatsan-laughs" },
+        { ":'(", "chatsan-cries" },
+        { ":'[", "chatsan-cries" },
+        { "='(", "chatsan-cries" },
+        { "='[", "chatsan-cries" },
+        { ")':", "chatsan-cries" },
+        { "]':", "chatsan-cries" },
+        { ")'=", "chatsan-cries" },
+        { "]'=", "chatsan-cries" },
         { ";-;", "chatsan-cries" },
         { ";_;", "chatsan-cries" },
         { "qwq", "chatsan-cries" },
@@ -47,6 +55,7 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         { ":i", "chatsan-sighs" },
         { ":|", "chatsan-sighs" },
         { ":p", "chatsan-stick-out-tongue" },
+        { ";p", "chatsan-stick-out-tongue" },
         { ":b", "chatsan-stick-out-tongue" },
         { "0-0", "chatsan-wide-eyed" },
         { "o-o", "chatsan-wide-eyed" },
@@ -69,9 +78,22 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         { "kek.", "chatsan-laughs" },
         { "rofl", "chatsan-laughs" },
         { "o7", "chatsan-salutes" },
+        { "07", "chatsan-salutes" },
         { ";_;7", "chatsan-tearfully-salutes"},
         { "idk", "chatsan-shrugs" },
         { "idk.", "chatsan-shrugs" },
+        { ";)", "chatsan-winks" },
+        { ";]", "chatsan-winks" },
+        { "(;", "chatsan-winks" },
+        { "[;", "chatsan-winks" },
+        { ":')", "chatsan-tearfully-smiles" },
+        { ":']", "chatsan-tearfully-smiles" },
+        { "=')", "chatsan-tearfully-smiles" },
+        { "=']", "chatsan-tearfully-smiles" },
+        { "(':", "chatsan-tearfully-smiles" },
+        { "[':", "chatsan-tearfully-smiles" },
+        { "('=", "chatsan-tearfully-smiles" },
+        { "['=", "chatsan-tearfully-smiles" },
     };
 
     private bool _doSanitize;
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 5f875432b9b..be6e8b78fef 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -16,7 +16,6 @@
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
-using Content.Shared.Decals;
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
@@ -30,7 +29,6 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
-using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -76,34 +74,15 @@ public sealed partial class ChatSystem : SharedChatSystem
     private bool _critLoocEnabled;
     private readonly bool _adminLoocEnabled = true;
 
-    [ValidatePrototypeId<ColorPalettePrototype>]
-    private const string ChatNamePalette = "ChatNames";
-    private string[] _chatNameColors = default!;
-
     public override void Initialize()
     {
         base.Initialize();
         CacheEmotes();
-        _configurationManager.OnValueChanged(CCVars.LoocEnabled, OnLoocEnabledChanged, true);
-        _configurationManager.OnValueChanged(CCVars.DeadLoocEnabled, OnDeadLoocEnabledChanged, true);
-        _configurationManager.OnValueChanged(CCVars.CritLoocEnabled, OnCritLoocEnabledChanged, true);
+        Subs.CVar(_configurationManager, CCVars.LoocEnabled, OnLoocEnabledChanged, true);
+        Subs.CVar(_configurationManager, CCVars.DeadLoocEnabled, OnDeadLoocEnabledChanged, true);
+        Subs.CVar(_configurationManager, CCVars.CritLoocEnabled, OnCritLoocEnabledChanged, true);
 
         SubscribeLocalEvent<GameRunLevelChangedEvent>(OnGameChange);
-
-        var nameColors = _prototypeManager.Index<ColorPalettePrototype>(ChatNamePalette).Colors.Values.ToArray();
-        _chatNameColors = new string[nameColors.Length];
-        for (var i = 0; i < nameColors.Length; i++)
-        {
-            _chatNameColors[i] = nameColors[i].ToHex();
-        }
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configurationManager.UnsubValueChanged(CCVars.LoocEnabled, OnLoocEnabledChanged);
-        _configurationManager.UnsubValueChanged(CCVars.DeadLoocEnabled, OnDeadLoocEnabledChanged);
-        _configurationManager.UnsubValueChanged(CCVars.CritLoocEnabled, OnCritLoocEnabledChanged);
     }
 
     private void OnLoocEnabledChanged(bool val)
@@ -434,13 +413,8 @@ private void SendEntitySpeak(
 
         name = FormattedMessage.EscapeText(name);
 
-        // color the name unless it's something like "the old man"
-        string coloredName = name;
-        if (!TryComp<GrammarComponent>(source, out var grammar) || grammar.ProperNoun == true)
-            coloredName = $"[color={GetNameColor(name)}]{name}[/color]";
-
         var wrappedMessage = Loc.GetString(speech.Bold ? "chat-manager-entity-say-bold-wrap-message" : "chat-manager-entity-say-wrap-message",
-            ("entityName", coloredName),
+            ("entityName", name),
             ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
             ("fontType", speech.FontId),
             ("fontSize", speech.FontSize),
@@ -509,10 +483,6 @@ private void SendEntityWhisper(
         }
         name = FormattedMessage.EscapeText(name);
 
-        // color the name unless it's something like "the old man"
-        if (!TryComp<GrammarComponent>(source, out var grammar) || grammar.ProperNoun == true)
-            name = $"[color={GetNameColor(name)}]{name}[/color]";
-
         var wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
             ("entityName", name), ("message", FormattedMessage.EscapeText(message)));
 
@@ -653,17 +623,6 @@ private void SendDeadChat(EntityUid source, ICommonSession player, string messag
 
     #region Utility
 
-    /// <summary>
-    /// Returns the chat name color for a mob
-    /// </summary>
-    /// <param name="name">Name of the mob</param>
-    /// <returns>Hex value of the color</returns>
-    public string GetNameColor(string name)
-    {
-        var colorIdx = Math.Abs(name.GetHashCode() % _chatNameColors.Length);
-        return _chatNameColors[colorIdx];
-    }
-
     private enum MessageRangeCheckResult
     {
         Disallowed,
diff --git a/Content.Server/Chemistry/Components/InjectorComponent.cs b/Content.Server/Chemistry/Components/InjectorComponent.cs
deleted file mode 100644
index d6d149ad0f4..00000000000
--- a/Content.Server/Chemistry/Components/InjectorComponent.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.FixedPoint;
-
-namespace Content.Server.Chemistry.Components
-{
-    /// <summary>
-    /// Server behavior for reagent injectors and syringes. Can optionally support both
-    /// injection and drawing or just injection. Can inject/draw reagents from solution
-    /// containers, and can directly inject into a mobs bloodstream.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class InjectorComponent : SharedInjectorComponent
-    {
-        public const string SolutionName = "injector";
-
-        /// <summary>
-        /// Whether or not the injector is able to draw from containers or if it's a single use
-        /// device that can only inject.
-        /// </summary>
-        [DataField("injectOnly")]
-        public bool InjectOnly;
-
-        /// <summary>
-        /// Whether or not the injector is able to draw from or inject from mobs
-        /// </summary>
-        /// <remarks>
-        ///     for example: droppers would ignore mobs
-        /// </remarks>
-        [DataField("ignoreMobs")]
-        public bool IgnoreMobs = false;
-
-        /// <summary>
-        ///     The minimum amount of solution that can be transferred at once from this solution.
-        /// </summary>
-        [DataField("minTransferAmount")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public FixedPoint2 MinimumTransferAmount { get; set; } = FixedPoint2.New(5);
-
-        /// <summary>
-        ///     The maximum amount of solution that can be transferred at once from this solution.
-        /// </summary>
-        [DataField("maxTransferAmount")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public FixedPoint2 MaximumTransferAmount { get; set; } = FixedPoint2.New(50);
-
-        /// <summary>
-        /// Amount to inject or draw on each usage. If the injector is inject only, it will
-        /// attempt to inject it's entire contents upon use.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("transferAmount")]
-        public FixedPoint2 TransferAmount = FixedPoint2.New(5);
-
-        /// <summary>
-        /// Injection delay (seconds) when the target is a mob.
-        /// </summary>
-        /// <remarks>
-        /// The base delay has a minimum of 1 second, but this will still be modified if the target is incapacitated or
-        /// in combat mode.
-        /// </remarks>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("delay")]
-        public float Delay = 5;
-
-        [DataField("toggleState")] private InjectorToggleMode _toggleState;
-
-        /// <summary>
-        /// The state of the injector. Determines it's attack behavior. Containers must have the
-        /// right SolutionCaps to support injection/drawing. For InjectOnly injectors this should
-        /// only ever be set to Inject
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public InjectorToggleMode ToggleState
-        {
-            get => _toggleState;
-            set
-            {
-                _toggleState = value;
-                Dirty();
-            }
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
deleted file mode 100644
index 4f149db8362..00000000000
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
+++ /dev/null
@@ -1,447 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Content.Shared.DoAfter;
-using Content.Shared.FixedPoint;
-using Content.Shared.Forensics;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Stacks;
-using Content.Shared.Verbs;
-using Robust.Shared.GameStates;
-using Robust.Shared.Player;
-
-namespace Content.Server.Chemistry.EntitySystems;
-
-public sealed partial class ChemistrySystem
-{
-
-    /// <summary>
-    ///     Default transfer amounts for the set-transfer verb.
-    /// </summary>
-    public static readonly List<int> TransferAmounts = new() { 1, 5, 10, 15 };
-    private void InitializeInjector()
-    {
-        SubscribeLocalEvent<InjectorComponent, GetVerbsEvent<AlternativeVerb>>(AddSetTransferVerbs);
-        SubscribeLocalEvent<InjectorComponent, SolutionContainerChangedEvent>(OnSolutionChange);
-        SubscribeLocalEvent<InjectorComponent, InjectorDoAfterEvent>(OnInjectDoAfter);
-        SubscribeLocalEvent<InjectorComponent, ComponentStartup>(OnInjectorStartup);
-        SubscribeLocalEvent<InjectorComponent, UseInHandEvent>(OnInjectorUse);
-        SubscribeLocalEvent<InjectorComponent, AfterInteractEvent>(OnInjectorAfterInteract);
-        SubscribeLocalEvent<InjectorComponent, ComponentGetState>(OnInjectorGetState);
-    }
-
-    private void AddSetTransferVerbs(Entity<InjectorComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
-            return;
-
-        if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
-            return;
-
-        var (uid, component) = entity;
-
-        // Add specific transfer verbs according to the container's size
-        var priority = 0;
-        var user = args.User;
-        foreach (var amount in TransferAmounts)
-        {
-            if (amount < component.MinimumTransferAmount.Int() || amount > component.MaximumTransferAmount.Int())
-                continue;
-
-            AlternativeVerb verb = new();
-            verb.Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount));
-            verb.Category = VerbCategory.SetTransferAmount;
-            verb.Act = () =>
-            {
-                component.TransferAmount = FixedPoint2.New(amount);
-                _popup.PopupEntity(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), user, user);
-            };
-
-            // we want to sort by size, not alphabetically by the verb text.
-            verb.Priority = priority;
-            priority--;
-
-            args.Verbs.Add(verb);
-        }
-    }
-
-    private void UseInjector(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
-    {
-        // Handle injecting/drawing for solutions
-        if (injector.Comp.ToggleState == SharedInjectorComponent.InjectorToggleMode.Inject)
-        {
-            if (_solutionContainers.TryGetInjectableSolution(target, out var injectableSolution, out _))
-            {
-                TryInject(injector, target, injectableSolution.Value, user, false);
-            }
-            else if (_solutionContainers.TryGetRefillableSolution(target, out var refillableSolution, out _))
-            {
-                TryInject(injector, target, refillableSolution.Value, user, true);
-            }
-            else if (TryComp<BloodstreamComponent>(target, out var bloodstream))
-            {
-                TryInjectIntoBloodstream(injector, (target, bloodstream), user);
-            }
-            else
-            {
-                _popup.PopupEntity(Loc.GetString("injector-component-cannot-transfer-message",
-                    ("target", Identity.Entity(target, EntityManager))), injector, user);
-            }
-        }
-        else if (injector.Comp.ToggleState == SharedInjectorComponent.InjectorToggleMode.Draw)
-        {
-            // Draw from a bloodstream, if the target has that
-            if (TryComp<BloodstreamComponent>(target, out var stream) &&
-                _solutionContainers.ResolveSolution(target, stream.BloodSolutionName, ref stream.BloodSolution))
-            {
-                TryDraw(injector, (target, stream), stream.BloodSolution.Value, user);
-                return;
-            }
-
-            // Draw from an object (food, beaker, etc)
-            if (_solutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
-            {
-                TryDraw(injector, target, drawableSolution.Value, user);
-            }
-            else
-            {
-                _popup.PopupEntity(Loc.GetString("injector-component-cannot-draw-message",
-                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-            }
-        }
-    }
-
-    private void OnSolutionChange(Entity<InjectorComponent> entity, ref SolutionContainerChangedEvent args)
-    {
-        Dirty(entity);
-    }
-
-    private void OnInjectorGetState(Entity<InjectorComponent> entity, ref ComponentGetState args)
-    {
-        _solutionContainers.TryGetSolution(entity.Owner, InjectorComponent.SolutionName, out _, out var solution);
-
-        var currentVolume = solution?.Volume ?? FixedPoint2.Zero;
-        var maxVolume = solution?.MaxVolume ?? FixedPoint2.Zero;
-
-        args.State = new SharedInjectorComponent.InjectorComponentState(currentVolume, maxVolume, entity.Comp.ToggleState);
-    }
-
-    private void OnInjectDoAfter(Entity<InjectorComponent> entity, ref InjectorDoAfterEvent args)
-    {
-        if (args.Cancelled || args.Handled || args.Args.Target == null)
-            return;
-
-        UseInjector(entity, args.Args.Target.Value, args.Args.User);
-        args.Handled = true;
-    }
-
-    private void OnInjectorAfterInteract(Entity<InjectorComponent> entity, ref AfterInteractEvent args)
-    {
-        if (args.Handled || !args.CanReach)
-            return;
-
-        //Make sure we have the attacking entity
-        if (args.Target is not { Valid: true } target || !HasComp<SolutionContainerManagerComponent>(entity))
-            return;
-
-        // Is the target a mob? If yes, use a do-after to give them time to respond.
-        if (HasComp<MobStateComponent>(target) || HasComp<BloodstreamComponent>(target))
-        {
-            // Are use using an injector capible of targeting a mob?
-            if (entity.Comp.IgnoreMobs)
-                return;
-
-            InjectDoAfter(entity, target, args.User);
-            args.Handled = true;
-            return;
-        }
-
-        UseInjector(entity, target, args.User);
-        args.Handled = true;
-    }
-
-    private void OnInjectorStartup(Entity<InjectorComponent> entity, ref ComponentStartup args)
-    {
-        // ???? why ?????
-        Dirty(entity);
-    }
-
-    private void OnInjectorUse(Entity<InjectorComponent> entity, ref UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        Toggle(entity, args.User);
-        args.Handled = true;
-    }
-
-    /// <summary>
-    /// Toggle between draw/inject state if applicable
-    /// </summary>
-    private void Toggle(Entity<InjectorComponent> injector, EntityUid user)
-    {
-        if (injector.Comp.InjectOnly)
-        {
-            return;
-        }
-
-        string msg;
-        switch (injector.Comp.ToggleState)
-        {
-            case SharedInjectorComponent.InjectorToggleMode.Inject:
-                injector.Comp.ToggleState = SharedInjectorComponent.InjectorToggleMode.Draw;
-                msg = "injector-component-drawing-text";
-                break;
-            case SharedInjectorComponent.InjectorToggleMode.Draw:
-                injector.Comp.ToggleState = SharedInjectorComponent.InjectorToggleMode.Inject;
-                msg = "injector-component-injecting-text";
-                break;
-            default:
-                throw new ArgumentOutOfRangeException();
-        }
-
-        _popup.PopupEntity(Loc.GetString(msg), injector, user);
-    }
-
-    /// <summary>
-    /// Send informative pop-up messages and wait for a do-after to complete.
-    /// </summary>
-    private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
-    {
-        // Create a pop-up for the user
-        _popup.PopupEntity(Loc.GetString("injector-component-injecting-user"), target, user);
-
-        if (!_solutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _, out var solution))
-            return;
-
-        var actualDelay = MathF.Max(injector.Comp.Delay, 1f);
-
-        // Injections take 0.5 seconds longer per additional 5u
-        actualDelay += (float) injector.Comp.TransferAmount / injector.Comp.Delay - 0.5f;
-
-        var isTarget = user != target;
-
-        if (isTarget)
-        {
-            // Create a pop-up for the target
-            var userName = Identity.Entity(user, EntityManager);
-            _popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
-                ("user", userName)), user, target);
-
-            // Check if the target is incapacitated or in combat mode and modify time accordingly.
-            if (_mobState.IsIncapacitated(target))
-            {
-                actualDelay /= 2.5f;
-            }
-            else if (_combat.IsInCombatMode(target))
-            {
-                // Slightly increase the delay when the target is in combat mode. Helps prevents cheese injections in
-                // combat with fast syringes & lag.
-                actualDelay += 1;
-            }
-
-            // Add an admin log, using the "force feed" log type. It's not quite feeding, but the effect is the same.
-            if (injector.Comp.ToggleState == SharedInjectorComponent.InjectorToggleMode.Inject)
-            {
-                _adminLogger.Add(LogType.ForceFeed,
-                    $"{EntityManager.ToPrettyString(user):user} is attempting to inject {EntityManager.ToPrettyString(target):target} with a solution {SolutionContainerSystem.ToPrettyString(solution):solution}");
-            }
-            else
-            {
-                _adminLogger.Add(LogType.ForceFeed,
-                    $"{EntityManager.ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from {EntityManager.ToPrettyString(target):target}");
-            }
-        }
-        else
-        {
-            // Self-injections take half as long.
-            actualDelay /= 2;
-
-            if (injector.Comp.ToggleState == SharedInjectorComponent.InjectorToggleMode.Inject)
-            {
-                _adminLogger.Add(LogType.Ingestion,
-                    $"{EntityManager.ToPrettyString(user):user} is attempting to inject themselves with a solution {SolutionContainerSystem.ToPrettyString(solution):solution}.");
-            }
-            else
-            {
-                _adminLogger.Add(LogType.ForceFeed,
-                    $"{EntityManager.ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from themselves.");
-            }
-        }
-
-        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, actualDelay, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
-        {
-            BreakOnUserMove = true,
-            BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            MovementThreshold = 0.1f,
-        });
-    }
-
-    private void TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target, EntityUid user)
-    {
-        // Get transfer amount. May be smaller than _transferAmount if not enough room
-        if (!_solutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName, ref target.Comp.ChemicalSolution, out var chemSolution))
-        {
-            _popup.PopupEntity(Loc.GetString("injector-component-cannot-inject-message", ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-            return;
-        }
-
-        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, chemSolution.AvailableVolume);
-        if (realTransferAmount <= 0)
-        {
-            _popup.PopupEntity(Loc.GetString("injector-component-cannot-inject-message", ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-            return;
-        }
-
-        // Move units from attackSolution to targetSolution
-        var removedSolution = _solutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, realTransferAmount);
-
-        _blood.TryAddToChemicals(target, removedSolution, target.Comp);
-
-        _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
-
-        _popup.PopupEntity(Loc.GetString("injector-component-inject-success-message",
-                ("amount", removedSolution.Volume),
-                ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-
-        Dirty(injector);
-        AfterInject(injector, target);
-    }
-
-    private void TryInject(Entity<InjectorComponent> injector, EntityUid targetEntity, Entity<SolutionComponent> targetSolution, EntityUid user, bool asRefill)
-    {
-        if (!_solutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out var soln, out var solution) || solution.Volume == 0)
-            return;
-
-        // Get transfer amount. May be smaller than _transferAmount if not enough room
-        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, targetSolution.Comp.Solution.AvailableVolume);
-
-        if (realTransferAmount <= 0)
-        {
-            _popup.PopupEntity(Loc.GetString("injector-component-target-already-full-message", ("target", Identity.Entity(targetEntity, EntityManager))),
-                injector.Owner, user);
-            return;
-        }
-
-        // Move units from attackSolution to targetSolution
-        Solution removedSolution;
-        if (TryComp<StackComponent>(targetEntity, out var stack))
-            removedSolution = _solutionContainers.SplitStackSolution(soln.Value, realTransferAmount, stack.Count);
-        else
-            removedSolution = _solutionContainers.SplitSolution(soln.Value, realTransferAmount);
-
-        _reactiveSystem.DoEntityReaction(targetEntity, removedSolution, ReactionMethod.Injection);
-
-        if (!asRefill)
-            _solutionContainers.Inject(targetEntity, targetSolution, removedSolution);
-        else
-            _solutionContainers.Refill(targetEntity, targetSolution, removedSolution);
-
-        _popup.PopupEntity(Loc.GetString("injector-component-transfer-success-message",
-                ("amount", removedSolution.Volume),
-                ("target", Identity.Entity(targetEntity, EntityManager))), injector.Owner, user);
-
-        Dirty(injector);
-        AfterInject(injector, targetEntity);
-    }
-
-    private void AfterInject(Entity<InjectorComponent> injector, EntityUid target)
-    {
-        // Automatically set syringe to draw after completely draining it.
-        if (_solutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _, out var solution) && solution.Volume == 0)
-        {
-            injector.Comp.ToggleState = SharedInjectorComponent.InjectorToggleMode.Draw;
-        }
-
-        // Leave some DNA from the injectee on it
-        var ev = new TransferDnaEvent { Donor = target, Recipient = injector };
-        RaiseLocalEvent(target, ref ev);
-    }
-
-    private void AfterDraw(Entity<InjectorComponent> injector, EntityUid target)
-    {
-        // Automatically set syringe to inject after completely filling it.
-        if (_solutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _, out var solution) && solution.AvailableVolume == 0)
-        {
-            injector.Comp.ToggleState = SharedInjectorComponent.InjectorToggleMode.Inject;
-        }
-
-        // Leave some DNA from the drawee on it
-        var ev = new TransferDnaEvent { Donor = target, Recipient = injector };
-        RaiseLocalEvent(target, ref ev);
-    }
-
-    private void TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamComponent?> target, Entity<SolutionComponent> targetSolution, EntityUid user)
-    {
-        if (!_solutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out var soln, out var solution) || solution.AvailableVolume == 0)
-        {
-            return;
-        }
-
-        // Get transfer amount. May be smaller than _transferAmount if not enough room, also make sure there's room in the injector
-        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, targetSolution.Comp.Solution.Volume, solution.AvailableVolume);
-
-        if (realTransferAmount <= 0)
-        {
-            _popup.PopupEntity(Loc.GetString("injector-component-target-is-empty-message", ("target", Identity.Entity(target, EntityManager))),
-                injector.Owner, user);
-            return;
-        }
-
-        // We have some snowflaked behavior for streams.
-        if (target.Comp != null)
-        {
-            DrawFromBlood(injector, (target.Owner, target.Comp), soln.Value, realTransferAmount, user);
-            return;
-        }
-
-        // Move units from attackSolution to targetSolution
-        var removedSolution = _solutionContainers.Draw(target.Owner, targetSolution, realTransferAmount);
-
-        if (!_solutionContainers.TryAddSolution(soln.Value, removedSolution))
-        {
-            return;
-        }
-
-        _popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
-                ("amount", removedSolution.Volume),
-                ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-
-        Dirty(injector);
-        AfterDraw(injector, target);
-    }
-
-    private void DrawFromBlood(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target, Entity<SolutionComponent> injectorSolution, FixedPoint2 transferAmount, EntityUid user)
-    {
-        var drawAmount = (float) transferAmount;
-
-        if (_solutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName, ref target.Comp.ChemicalSolution))
-        {
-            var chemTemp = _solutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, drawAmount * 0.15f);
-            _solutionContainers.TryAddSolution(injectorSolution, chemTemp);
-            drawAmount -= (float) chemTemp.Volume;
-        }
-
-        if (_solutionContainers.ResolveSolution(target.Owner, target.Comp.BloodSolutionName, ref target.Comp.BloodSolution))
-        {
-            var bloodTemp = _solutionContainers.SplitSolution(target.Comp.BloodSolution.Value, drawAmount);
-            _solutionContainers.TryAddSolution(injectorSolution, bloodTemp);
-        }
-
-        _popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
-                ("amount", transferAmount),
-                ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-
-        Dirty(injector);
-        AfterDraw(injector, target);
-    }
-}
diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
index a2b4f399e2d..c4f22dc63aa 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
@@ -1,12 +1,8 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Interaction;
 using Content.Server.Popups;
 using Content.Shared.Chemistry;
-using Content.Shared.CombatMode;
-using Content.Shared.DoAfter;
-using Content.Shared.Mobs.Systems;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Chemistry.EntitySystems;
@@ -16,20 +12,15 @@ public sealed partial class ChemistrySystem : EntitySystem
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
     [Dependency] private readonly InteractionSystem _interaction = default!;
-    [Dependency] private readonly BloodstreamSystem _blood = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly SharedCombatModeSystem _combat = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainers = default!;
 
     public override void Initialize()
     {
         // Why ChemMaster duplicates reagentdispenser nobody knows.
         InitializeHypospray();
-        InitializeInjector();
         InitializeMixing();
     }
 }
diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
new file mode 100644
index 00000000000..a4497c0bd65
--- /dev/null
+++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
@@ -0,0 +1,366 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Forensics;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Stacks;
+
+namespace Content.Server.Chemistry.EntitySystems;
+
+public sealed class InjectorSystem : SharedInjectorSystem
+{
+    [Dependency] private readonly BloodstreamSystem _blood = default!;
+    [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<InjectorComponent, InjectorDoAfterEvent>(OnInjectDoAfter);
+        SubscribeLocalEvent<InjectorComponent, AfterInteractEvent>(OnInjectorAfterInteract);
+    }
+
+    private void UseInjector(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
+    {
+        // Handle injecting/drawing for solutions
+        if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
+        {
+            if (SolutionContainers.TryGetInjectableSolution(target, out var injectableSolution, out _))
+            {
+                TryInject(injector, target, injectableSolution.Value, user, false);
+            }
+            else if (SolutionContainers.TryGetRefillableSolution(target, out var refillableSolution, out _))
+            {
+                TryInject(injector, target, refillableSolution.Value, user, true);
+            }
+            else if (TryComp<BloodstreamComponent>(target, out var bloodstream))
+            {
+                TryInjectIntoBloodstream(injector, (target, bloodstream), user);
+            }
+            else
+            {
+                Popup.PopupEntity(Loc.GetString("injector-component-cannot-transfer-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector, user);
+            }
+        }
+        else if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
+        {
+            // Draw from a bloodstream, if the target has that
+            if (TryComp<BloodstreamComponent>(target, out var stream) &&
+                SolutionContainers.ResolveSolution(target, stream.BloodSolutionName, ref stream.BloodSolution))
+            {
+                TryDraw(injector, (target, stream), stream.BloodSolution.Value, user);
+                return;
+            }
+
+            // Draw from an object (food, beaker, etc)
+            if (SolutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
+            {
+                TryDraw(injector, target, drawableSolution.Value, user);
+            }
+            else
+            {
+                Popup.PopupEntity(Loc.GetString("injector-component-cannot-draw-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+            }
+        }
+    }
+
+    private void OnInjectDoAfter(Entity<InjectorComponent> entity, ref InjectorDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || args.Args.Target == null)
+            return;
+
+        UseInjector(entity, args.Args.Target.Value, args.Args.User);
+        args.Handled = true;
+    }
+
+    private void OnInjectorAfterInteract(Entity<InjectorComponent> entity, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach)
+            return;
+
+        //Make sure we have the attacking entity
+        if (args.Target is not { Valid: true } target || !HasComp<SolutionContainerManagerComponent>(entity))
+            return;
+
+        // Is the target a mob? If yes, use a do-after to give them time to respond.
+        if (HasComp<MobStateComponent>(target) || HasComp<BloodstreamComponent>(target))
+        {
+            // Are use using an injector capible of targeting a mob?
+            if (entity.Comp.IgnoreMobs)
+                return;
+
+            InjectDoAfter(entity, target, args.User);
+            args.Handled = true;
+            return;
+        }
+
+        UseInjector(entity, target, args.User);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Send informative pop-up messages and wait for a do-after to complete.
+    /// </summary>
+    private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
+    {
+        // Create a pop-up for the user
+        Popup.PopupEntity(Loc.GetString("injector-component-injecting-user"), target, user);
+
+        if (!SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _, out var solution))
+            return;
+
+        var actualDelay = MathHelper.Max(injector.Comp.Delay, TimeSpan.FromSeconds(1));
+
+        // Injections take 0.5 seconds longer per additional 5u
+        actualDelay += TimeSpan.FromSeconds(injector.Comp.TransferAmount.Float() / injector.Comp.Delay.TotalSeconds - 0.5f);
+
+        var isTarget = user != target;
+
+        if (isTarget)
+        {
+            // Create a pop-up for the target
+            var userName = Identity.Entity(user, EntityManager);
+            Popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
+                ("user", userName)), user, target);
+
+            // Check if the target is incapacitated or in combat mode and modify time accordingly.
+            if (MobState.IsIncapacitated(target))
+            {
+                actualDelay /= 2.5f;
+            }
+            else if (Combat.IsInCombatMode(target))
+            {
+                // Slightly increase the delay when the target is in combat mode. Helps prevents cheese injections in
+                // combat with fast syringes & lag.
+                actualDelay += TimeSpan.FromSeconds(1);
+            }
+
+            // Add an admin log, using the "force feed" log type. It's not quite feeding, but the effect is the same.
+            if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
+            {
+                AdminLogger.Add(LogType.ForceFeed,
+                    $"{EntityManager.ToPrettyString(user):user} is attempting to inject {EntityManager.ToPrettyString(target):target} with a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution}");
+            }
+            else
+            {
+                AdminLogger.Add(LogType.ForceFeed,
+                    $"{EntityManager.ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from {EntityManager.ToPrettyString(target):target}");
+            }
+        }
+        else
+        {
+            // Self-injections take half as long.
+            actualDelay /= 2;
+
+            if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
+            {
+                AdminLogger.Add(LogType.Ingestion,
+                    $"{EntityManager.ToPrettyString(user):user} is attempting to inject themselves with a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution}.");
+            }
+            else
+            {
+                AdminLogger.Add(LogType.ForceFeed,
+                    $"{EntityManager.ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from themselves.");
+            }
+        }
+
+        DoAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, actualDelay, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
+        {
+            BreakOnUserMove = true,
+            BreakOnDamage = true,
+            BreakOnTargetMove = true,
+            MovementThreshold = 0.1f,
+        });
+    }
+
+    private void TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target,
+        EntityUid user)
+    {
+        // Get transfer amount. May be smaller than _transferAmount if not enough room
+        if (!SolutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName,
+                ref target.Comp.ChemicalSolution, out var chemSolution))
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-cannot-inject-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+            return;
+        }
+
+        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, chemSolution.AvailableVolume);
+        if (realTransferAmount <= 0)
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-cannot-inject-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+            return;
+        }
+
+        // Move units from attackSolution to targetSolution
+        var removedSolution = SolutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, realTransferAmount);
+
+        _blood.TryAddToChemicals(target, removedSolution, target.Comp);
+
+        _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
+
+        Popup.PopupEntity(Loc.GetString("injector-component-inject-success-message",
+            ("amount", removedSolution.Volume),
+            ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterInject(injector, target);
+    }
+
+    private void TryInject(Entity<InjectorComponent> injector, EntityUid targetEntity,
+        Entity<SolutionComponent> targetSolution, EntityUid user, bool asRefill)
+    {
+        if (!SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out var soln,
+                out var solution) || solution.Volume == 0)
+            return;
+
+        // Get transfer amount. May be smaller than _transferAmount if not enough room
+        var realTransferAmount =
+            FixedPoint2.Min(injector.Comp.TransferAmount, targetSolution.Comp.Solution.AvailableVolume);
+
+        if (realTransferAmount <= 0)
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-target-already-full-message",
+                    ("target", Identity.Entity(targetEntity, EntityManager))),
+                injector.Owner, user);
+            return;
+        }
+
+        // Move units from attackSolution to targetSolution
+        Solution removedSolution;
+        if (TryComp<StackComponent>(targetEntity, out var stack))
+            removedSolution = SolutionContainers.SplitStackSolution(soln.Value, realTransferAmount, stack.Count);
+        else
+            removedSolution = SolutionContainers.SplitSolution(soln.Value, realTransferAmount);
+
+        _reactiveSystem.DoEntityReaction(targetEntity, removedSolution, ReactionMethod.Injection);
+
+        if (!asRefill)
+            SolutionContainers.Inject(targetEntity, targetSolution, removedSolution);
+        else
+            SolutionContainers.Refill(targetEntity, targetSolution, removedSolution);
+
+        Popup.PopupEntity(Loc.GetString("injector-component-transfer-success-message",
+            ("amount", removedSolution.Volume),
+            ("target", Identity.Entity(targetEntity, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterInject(injector, targetEntity);
+    }
+
+    private void AfterInject(Entity<InjectorComponent> injector, EntityUid target)
+    {
+        // Automatically set syringe to draw after completely draining it.
+        if (SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _,
+                out var solution) && solution.Volume == 0)
+        {
+            SetMode(injector, InjectorToggleMode.Draw);
+        }
+
+        // Leave some DNA from the injectee on it
+        var ev = new TransferDnaEvent { Donor = target, Recipient = injector };
+        RaiseLocalEvent(target, ref ev);
+    }
+
+    private void AfterDraw(Entity<InjectorComponent> injector, EntityUid target)
+    {
+        // Automatically set syringe to inject after completely filling it.
+        if (SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _,
+                out var solution) && solution.AvailableVolume == 0)
+        {
+            SetMode(injector, InjectorToggleMode.Inject);
+        }
+
+        // Leave some DNA from the drawee on it
+        var ev = new TransferDnaEvent { Donor = target, Recipient = injector };
+        RaiseLocalEvent(target, ref ev);
+    }
+
+    private void TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamComponent?> target,
+        Entity<SolutionComponent> targetSolution, EntityUid user)
+    {
+        if (!SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out var soln,
+                out var solution) || solution.AvailableVolume == 0)
+        {
+            return;
+        }
+
+        // Get transfer amount. May be smaller than _transferAmount if not enough room, also make sure there's room in the injector
+        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, targetSolution.Comp.Solution.Volume,
+            solution.AvailableVolume);
+
+        if (realTransferAmount <= 0)
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-target-is-empty-message",
+                    ("target", Identity.Entity(target, EntityManager))),
+                injector.Owner, user);
+            return;
+        }
+
+        // We have some snowflaked behavior for streams.
+        if (target.Comp != null)
+        {
+            DrawFromBlood(injector, (target.Owner, target.Comp), soln.Value, realTransferAmount, user);
+            return;
+        }
+
+        // Move units from attackSolution to targetSolution
+        var removedSolution = SolutionContainers.Draw(target.Owner, targetSolution, realTransferAmount);
+
+        if (!SolutionContainers.TryAddSolution(soln.Value, removedSolution))
+        {
+            return;
+        }
+
+        Popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
+            ("amount", removedSolution.Volume),
+            ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterDraw(injector, target);
+    }
+
+    private void DrawFromBlood(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target,
+        Entity<SolutionComponent> injectorSolution, FixedPoint2 transferAmount, EntityUid user)
+    {
+        var drawAmount = (float) transferAmount;
+
+        if (SolutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName,
+                ref target.Comp.ChemicalSolution))
+        {
+            var chemTemp = SolutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, drawAmount * 0.15f);
+            SolutionContainers.TryAddSolution(injectorSolution, chemTemp);
+            drawAmount -= (float) chemTemp.Volume;
+        }
+
+        if (SolutionContainers.ResolveSolution(target.Owner, target.Comp.BloodSolutionName,
+                ref target.Comp.BloodSolution))
+        {
+            var bloodTemp = SolutionContainers.SplitSolution(target.Comp.BloodSolution.Value, drawAmount);
+            SolutionContainers.TryAddSolution(injectorSolution, bloodTemp);
+        }
+
+        Popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
+            ("amount", transferAmount),
+            ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterDraw(injector, target);
+    }
+}
diff --git a/Content.Server/Chunking/ChunkingSystem.cs b/Content.Server/Chunking/ChunkingSystem.cs
index 3919361af13..e4775439cb6 100644
--- a/Content.Server/Chunking/ChunkingSystem.cs
+++ b/Content.Server/Chunking/ChunkingSystem.cs
@@ -29,13 +29,7 @@ public override void Initialize()
     {
         base.Initialize();
         _xformQuery = GetEntityQuery<TransformComponent>();
-        _configurationManager.OnValueChanged(CVars.NetMaxUpdateRange, OnPvsRangeChanged, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configurationManager.UnsubValueChanged(CVars.NetMaxUpdateRange, OnPvsRangeChanged);
+        Subs.CVar(_configurationManager, CVars.NetMaxUpdateRange, OnPvsRangeChanged, true);
     }
 
     private void OnPvsRangeChanged(float value)
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 4fa60563bdd..6b0b13c410e 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -19,6 +19,7 @@
 using Content.Shared.Chat;
 using Content.Shared.Communications;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Emag.Components;
 using Content.Shared.Popups;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index 52cde02d215..e0bdf096296 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -269,7 +269,7 @@ void ShutdownContainers()
 
             if (!TryComp(newEntity, out ConstructionComponent? construction))
             {
-                _sawmill.Error($"Initial construction does not have a valid target entity! It is missing a ConstructionComponent.\nGraph: {graph.ID}, Initial Target: {edge.Target}, Ent. Prototype: {newEntityProto}\nCreated Entity {ToPrettyString(newEntity)} will be deleted.");
+                Log.Error($"Initial construction does not have a valid target entity! It is missing a ConstructionComponent.\nGraph: {graph.ID}, Initial Target: {edge.Target}, Ent. Prototype: {newEntityProto}\nCreated Entity {ToPrettyString(newEntity)} will be deleted.");
                 Del(newEntity); // Screw you, make proper construction graphs.
                 return null;
             }
@@ -321,14 +321,14 @@ public async Task<bool> TryStartItemConstruction(string prototype, EntityUid use
         {
             if (!_prototypeManager.TryIndex(prototype, out ConstructionPrototype? constructionPrototype))
             {
-                _sawmill.Error($"Tried to start construction of invalid recipe '{prototype}'!");
+                Log.Error($"Tried to start construction of invalid recipe '{prototype}'!");
                 return false;
             }
 
             if (!_prototypeManager.TryIndex(constructionPrototype.Graph,
                     out ConstructionGraphPrototype? constructionGraph))
             {
-                _sawmill.Error(
+                Log.Error(
                     $"Invalid construction graph '{constructionPrototype.Graph}' in recipe '{prototype}'!");
                 return false;
             }
@@ -394,21 +394,21 @@ private async void HandleStartStructureConstruction(TryStartStructureConstructio
         {
             if (!_prototypeManager.TryIndex(ev.PrototypeName, out ConstructionPrototype? constructionPrototype))
             {
-                _sawmill.Error($"Tried to start construction of invalid recipe '{ev.PrototypeName}'!");
+                Log.Error($"Tried to start construction of invalid recipe '{ev.PrototypeName}'!");
                 RaiseNetworkEvent(new AckStructureConstructionMessage(ev.Ack));
                 return;
             }
 
             if (!_prototypeManager.TryIndex(constructionPrototype.Graph, out ConstructionGraphPrototype? constructionGraph))
             {
-                _sawmill.Error($"Invalid construction graph '{constructionPrototype.Graph}' in recipe '{ev.PrototypeName}'!");
+                Log.Error($"Invalid construction graph '{constructionPrototype.Graph}' in recipe '{ev.PrototypeName}'!");
                 RaiseNetworkEvent(new AckStructureConstructionMessage(ev.Ack));
                 return;
             }
 
             if (args.SenderSession.AttachedEntity is not {Valid: true} user)
             {
-                _sawmill.Error($"Client sent {nameof(TryStartStructureConstructionMessage)} with no attached entity!");
+                Log.Error($"Client sent {nameof(TryStartStructureConstructionMessage)} with no attached entity!");
                 return;
             }
 
diff --git a/Content.Server/Construction/ConstructionSystem.Interactions.cs b/Content.Server/Construction/ConstructionSystem.Interactions.cs
index a19ee8df6d9..946aaa0d3ee 100644
--- a/Content.Server/Construction/ConstructionSystem.Interactions.cs
+++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs
@@ -147,7 +147,7 @@ private HandleResult HandleEdge(EntityUid uid, object ev, ConstructionGraphEdge
 
             if (step == null)
             {
-                _sawmill.Warning($"Called {nameof(HandleEdge)} on entity {ToPrettyString(uid)} but the current state is not valid for that!");
+                Log.Warning($"Called {nameof(HandleEdge)} on entity {ToPrettyString(uid)} but the current state is not valid for that!");
                 return HandleResult.False;
             }
 
@@ -513,10 +513,10 @@ private void UpdateInteractions()
                 {
                     if (construction.Deleted)
                     {
-                        _sawmill.Error($"Construction component was deleted while still processing interactions." +
-                            $"Entity {ToPrettyString(uid)}, graph: {construction.Graph}, " +
-                            $"Next: {interaction.GetType().Name}, " +
-                            $"Remaining Queue: {string.Join(", ", construction.InteractionQueue.Select(x => x.GetType().Name))}");
+                        Log.Error($"Construction component was deleted while still processing interactions." +
+                                  $"Entity {ToPrettyString(uid)}, graph: {construction.Graph}, " +
+                                  $"Next: {interaction.GetType().Name}, " +
+                                  $"Remaining Queue: {string.Join(", ", construction.InteractionQueue.Select(x => x.GetType().Name))}");
                         break;
                     }
 
@@ -527,7 +527,7 @@ private void UpdateInteractions()
                 }
                 catch (Exception e)
                 {
-                    _sawmill.Error($"Caught exception while processing construction queue. Entity {ToPrettyString(uid)}, graph: {construction.Graph}");
+                    Log.Error($"Caught exception while processing construction queue. Entity {ToPrettyString(uid)}, graph: {construction.Graph}");
                     _runtimeLog.LogException(e, $"{nameof(ConstructionSystem)}.{nameof(UpdateInteractions)}");
                     Del(uid);
                 }
diff --git a/Content.Server/Construction/ConstructionSystem.cs b/Content.Server/Construction/ConstructionSystem.cs
index 6e40b7b856c..44c6318b789 100644
--- a/Content.Server/Construction/ConstructionSystem.cs
+++ b/Content.Server/Construction/ConstructionSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.DoAfter;
-using Content.Shared.Tools;
 using JetBrains.Annotations;
 using Robust.Server.Containers;
 using Robust.Shared.Prototypes;
@@ -17,7 +16,6 @@ namespace Content.Server.Construction
     [UsedImplicitly]
     public sealed partial class ConstructionSystem : SharedConstructionSystem
     {
-        [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
         [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
@@ -25,15 +23,10 @@ public sealed partial class ConstructionSystem : SharedConstructionSystem
         [Dependency] private readonly StackSystem _stackSystem = default!;
         [Dependency] private readonly SharedToolSystem _toolSystem = default!;
 
-        private const string SawmillName = "Construction";
-        private ISawmill _sawmill = default!;
-
         public override void Initialize()
         {
             base.Initialize();
 
-            _sawmill = _logManager.GetSawmill(SawmillName);
-
             InitializeComputer();
             InitializeGraphs();
             InitializeGuided();
@@ -50,13 +43,13 @@ private void OnConstructionInit(Entity<ConstructionComponent> ent, ref Component
             var construction = ent.Comp;
             if (GetCurrentGraph(ent, construction) is not {} graph)
             {
-                _sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid graph specified.");
+                Log.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid graph specified.");
                 return;
             }
 
             if (GetNodeFromGraph(graph, construction.Node) is not {} node)
             {
-                _sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid node specified.");
+                Log.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid node specified.");
                 return;
             }
 
@@ -65,7 +58,7 @@ private void OnConstructionInit(Entity<ConstructionComponent> ent, ref Component
             {
                 if (GetEdgeFromNode(node, edgeIndex) is not {} currentEdge)
                 {
-                    _sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid edge index specified.");
+                    Log.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid edge index specified.");
                     return;
                 }
 
@@ -76,7 +69,7 @@ private void OnConstructionInit(Entity<ConstructionComponent> ent, ref Component
             {
                 if (GetNodeFromGraph(graph, targetNodeId) is not { } targetNode)
                 {
-                    _sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid target node specified.");
+                    Log.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid target node specified.");
                     return;
                 }
 
diff --git a/Content.Server/Damage/Components/IgniteOnHeatDamageComponent.cs b/Content.Server/Damage/Components/IgniteOnHeatDamageComponent.cs
new file mode 100644
index 00000000000..81018f539c9
--- /dev/null
+++ b/Content.Server/Damage/Components/IgniteOnHeatDamageComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+
+namespace Content.Server.Damage.Components;
+
+[RegisterComponent]
+public sealed partial class IgniteOnHeatDamageComponent : Component
+{
+    [DataField("fireStacks")]
+    public float FireStacks = 1f;
+
+    // The minimum amount of damage taken to apply fire stacks
+    [DataField("threshold")]
+    public FixedPoint2 Threshold = 15;
+}
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 5365bfb05b2..27ccb6ee0ea 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -260,6 +260,7 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl
             profile.SkinColor = appearance.SkinColor.ToHex();
             profile.Clothing = humanoid.Clothing.ToString();
             profile.Backpack = humanoid.Backpack.ToString();
+            profile.SpawnPriority = (int) humanoid.SpawnPriority;
             profile.Markings = markings;
             profile.Slot = slot;
             profile.PreferenceUnavailable = (DbPreferenceUnavailableMode) humanoid.PreferenceUnavailable;
diff --git a/Content.Server/Decals/DecalSystem.cs b/Content.Server/Decals/DecalSystem.cs
index 101d077d49d..5bfd91486ca 100644
--- a/Content.Server/Decals/DecalSystem.cs
+++ b/Content.Server/Decals/DecalSystem.cs
@@ -70,7 +70,7 @@ public override void Initialize()
             SubscribeNetworkEvent<RequestDecalRemovalEvent>(OnDecalRemovalRequest);
             SubscribeLocalEvent<PostGridSplitEvent>(OnGridSplit);
 
-            _conf.OnValueChanged(CVars.NetPVS, OnPvsToggle, true);
+            Subs.CVar(_conf, CVars.NetPVS, OnPvsToggle, true);
         }
 
         private void OnPvsToggle(bool value)
@@ -153,7 +153,6 @@ public override void Shutdown()
             base.Shutdown();
 
             _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
-            _conf.UnsubValueChanged(CVars.NetPVS, OnPvsToggle);
         }
 
         private void OnTileChanged(ref TileChangedEvent args)
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index 5b9b7596efb..ed5777c42aa 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -31,29 +31,38 @@ public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause
 
             var getRandomVector = () => new Vector2(system.Random.NextFloat(-Offset, Offset), system.Random.NextFloat(-Offset, Offset));
 
-            foreach (var (entityId, minMax) in Spawn)
+            var executions = 1;
+            if (system.EntityManager.TryGetComponent<StackComponent>(owner, out var stack))
             {
-                var count = minMax.Min >= minMax.Max
-                    ? minMax.Min
-                    : system.Random.Next(minMax.Min, minMax.Max + 1);
-
-                if (count == 0) continue;
+                executions = stack.Count;
+            }
 
-                if (EntityPrototypeHelpers.HasComponent<StackComponent>(entityId, system.PrototypeManager, system.ComponentFactory))
+            foreach (var (entityId, minMax) in Spawn)
+            {
+                for (var execution = 0; execution < executions; execution++)
                 {
-                    var spawned = system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
-                    system.StackSystem.SetCount(spawned, count);
+                    var count = minMax.Min >= minMax.Max
+                        ? minMax.Min
+                        : system.Random.Next(minMax.Min, minMax.Max + 1);
 
-                    TransferForensics(spawned, system, owner);
-                }
-                else
-                {
-                    for (var i = 0; i < count; i++)
+                    if (count == 0) continue;
+
+                    if (EntityPrototypeHelpers.HasComponent<StackComponent>(entityId, system.PrototypeManager, system.ComponentFactory))
                     {
                         var spawned = system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
+                        system.StackSystem.SetCount(spawned, count);
 
                         TransferForensics(spawned, system, owner);
                     }
+                    else
+                    {
+                        for (var i = 0; i < count; i++)
+                        {
+                            var spawned = system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
+
+                            TransferForensics(spawned, system, owner);
+                        }
+                    }
                 }
             }
         }
diff --git a/Content.Server/DeviceLinking/Components/TwoWayLeverComponent.cs b/Content.Server/DeviceLinking/Components/TwoWayLeverComponent.cs
deleted file mode 100644
index bbf78b6876b..00000000000
--- a/Content.Server/DeviceLinking/Components/TwoWayLeverComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.DeviceLinking;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.DeviceLinking.Components
-{
-    [RegisterComponent]
-    public sealed partial class TwoWayLeverComponent : Component
-    {
-        [DataField("state")]
-        public TwoWayLeverState State;
-
-        [DataField("nextSignalLeft")]
-        public bool NextSignalLeft;
-
-        [DataField("leftPort", customTypeSerializer: typeof(PrototypeIdSerializer<SourcePortPrototype>))]
-        public string LeftPort = "Left";
-
-        [DataField("rightPort", customTypeSerializer: typeof(PrototypeIdSerializer<SourcePortPrototype>))]
-        public string RightPort = "Right";
-
-        [DataField("middlePort", customTypeSerializer: typeof(PrototypeIdSerializer<SourcePortPrototype>))]
-        public string MiddlePort = "Middle";
-    }
-}
diff --git a/Content.Server/DeviceLinking/Events/SignalReceivedEvent.cs b/Content.Server/DeviceLinking/Events/SignalReceivedEvent.cs
index c1928575feb..c8c611103d9 100644
--- a/Content.Server/DeviceLinking/Events/SignalReceivedEvent.cs
+++ b/Content.Server/DeviceLinking/Events/SignalReceivedEvent.cs
@@ -1,4 +1,5 @@
 using Content.Server.DeviceNetwork;
+using Content.Shared.DeviceNetwork;
 
 namespace Content.Server.DeviceLinking.Events;
 
diff --git a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
index 47f632843d3..f708237480f 100644
--- a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
@@ -1,9 +1,11 @@
-using Content.Server.DeviceLinking.Components;
-using Content.Server.DeviceLinking.Events;
+using Content.Server.DeviceLinking.Components;
+using Content.Server.DeviceLinking.Events;
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Shared.DeviceLinking;
+using Content.Shared.DeviceLinking.Events;
+using Content.Shared.DeviceNetwork;
 
 namespace Content.Server.DeviceLinking.Systems;
 
@@ -14,7 +16,9 @@ public sealed class DeviceLinkSystem : SharedDeviceLinkSystem
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<DeviceLinkSinkComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
+        SubscribeLocalEvent<DeviceLinkSourceComponent, NewLinkEvent>(OnNewLink);
     }
 
     public override void Update(float frameTime)
@@ -35,15 +39,7 @@ public override void Update(float frameTime)
     }
 
     #region Sending & Receiving
-    /// <summary>
-    /// Sends a network payload directed at the sink entity.
-    /// Just raises a <see cref="SignalReceivedEvent"/> without data if the source or the sink doesn't have a <see cref="DeviceNetworkComponent"/>
-    /// </summary>
-    /// <param name="uid">The source uid that invokes the port</param>
-    /// <param name="port">The port to invoke</param>
-    /// <param name="data">Optional data to send along</param>
-    /// <param name="sourceComponent"></param>
-    public void InvokePort(EntityUid uid, string port, NetworkPayload? data = null, DeviceLinkSourceComponent? sourceComponent = null)
+    public override void InvokePort(EntityUid uid, string port, NetworkPayload? data = null, DeviceLinkSourceComponent? sourceComponent = null)
     {
         if (!Resolve(uid, ref sourceComponent) || !sourceComponent.Outputs.TryGetValue(port, out var sinks))
             return;
@@ -58,61 +54,87 @@ public void InvokePort(EntityUid uid, string port, NetworkPayload? data = null,
 
             foreach (var (source, sink) in links)
             {
-                if (source != port)
-                    continue;
-
-                if (sinkComponent.InvokeCounter > sinkComponent.InvokeLimit)
-                {
-                    sinkComponent.InvokeCounter = 0;
-                    var args = new DeviceLinkOverloadedEvent();
-                    RaiseLocalEvent(sinkUid, ref args);
-                    RemoveAllFromSink(sinkUid, sinkComponent);
-                    continue;
-                }
-
-                sinkComponent.InvokeCounter++;
-
-                //Just skip using device networking if the source or the sink doesn't support it
-                if (!HasComp<DeviceNetworkComponent>(uid) || !TryComp<DeviceNetworkComponent>(sinkUid, out var sinkNetworkComponent))
-                {
-                    var eventArgs = new SignalReceivedEvent(sink, uid);
-
-                    RaiseLocalEvent(sinkUid, ref eventArgs);
-                    continue;
-                }
-
-                var payload = new NetworkPayload()
-                {
-                    [InvokedPort] = sink
-                };
-
-                if (data != null)
-                {
-                    //Prevent overriding the invoked port
-                    data.Remove(InvokedPort);
-                    foreach (var (key, value) in data)
-                    {
-                        payload.Add(key, value);
-                    }
-                }
-
-                // force using wireless network so things like atmos devices are able to send signals
-                var network = (int) DeviceNetworkComponent.DeviceNetIdDefaults.Wireless;
-                _deviceNetworkSystem.QueuePacket(uid, sinkNetworkComponent.Address, payload, sinkNetworkComponent.ReceiveFrequency, network);
+                if (source == port)
+                    InvokeDirect((uid, sourceComponent), (sinkUid, sinkComponent), source, sink, data);
             }
         }
     }
 
+    /// <summary>
+    /// Raises an event on or sends a network packet directly to a sink from a source.
+    /// </summary>
+    private void InvokeDirect(Entity<DeviceLinkSourceComponent> source, Entity<DeviceLinkSinkComponent?> sink, string sourcePort, string sinkPort, NetworkPayload? data)
+    {
+        if (!Resolve(sink, ref sink.Comp))
+            return;
+
+        if (sink.Comp.InvokeCounter > sink.Comp.InvokeLimit)
+        {
+            sink.Comp.InvokeCounter = 0;
+            var args = new DeviceLinkOverloadedEvent();
+            RaiseLocalEvent(sink, ref args);
+            RemoveAllFromSink(sink, sink.Comp);
+            return;
+        }
+
+        sink.Comp.InvokeCounter++;
+
+        //Just skip using device networking if the source or the sink doesn't support it
+        if (!HasComp<DeviceNetworkComponent>(source) || !TryComp<DeviceNetworkComponent>(sink, out var sinkNetwork))
+        {
+            var eventArgs = new SignalReceivedEvent(sinkPort, source);
+            RaiseLocalEvent(sink, ref eventArgs);
+            return;
+        }
+
+        var payload = new NetworkPayload()
+        {
+            [InvokedPort] = sinkPort
+        };
+
+        if (data != null)
+        {
+            //Prevent overriding the invoked port
+            data.Remove(InvokedPort);
+            foreach (var (key, value) in data)
+            {
+                payload.Add(key, value);
+            }
+        }
+
+        // force using wireless network so things like atmos devices are able to send signals
+        var network = (int) DeviceNetworkComponent.DeviceNetIdDefaults.Wireless;
+        _deviceNetworkSystem.QueuePacket(source, sinkNetwork.Address, payload, sinkNetwork.ReceiveFrequency, network);
+    }
+
     /// <summary>
     /// Helper function that invokes a port with a high/low binary logic signal.
     /// </summary>
     public void SendSignal(EntityUid uid, string port, bool signal, DeviceLinkSourceComponent? comp = null)
     {
+        if (!Resolve(uid, ref comp))
+            return;
+
         var data = new NetworkPayload
         {
             [DeviceNetworkConstants.LogicState] = signal ? SignalState.High : SignalState.Low
         };
         InvokePort(uid, port, data, comp);
+
+        comp.LastSignals[port] = signal;
+    }
+
+    /// <summary>
+    /// Clears the last signals state for linking.
+    /// This is not to be confused with sending a low signal, this is the complete absence of anything.
+    /// Use if the device is in an invalid state and has no reasonable output signal.
+    /// </summary>
+    public void ClearSignal(Entity<DeviceLinkSourceComponent?> ent, string port)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        ent.Comp.LastSignals.Remove(port);
     }
 
     /// <summary>
@@ -127,5 +149,24 @@ private void OnPacketReceived(EntityUid uid, DeviceLinkSinkComponent component,
         var eventArgs = new SignalReceivedEvent(port, args.Sender, args.Data);
         RaiseLocalEvent(uid,  ref eventArgs);
     }
+
+    /// <summary>
+    /// When linking from a port that currently has a signal being sent, invoke the new link with that signal.
+    /// </summary>
+    private void OnNewLink(Entity<DeviceLinkSourceComponent> ent, ref NewLinkEvent args)
+    {
+        if (args.Source != ent.Owner)
+            return;
+
+        // only do anything if a signal is being sent from a port
+        if (!ent.Comp.LastSignals.TryGetValue(args.SourcePort, out var signal))
+            return;
+
+        var payload = new NetworkPayload()
+        {
+            [DeviceNetworkConstants.LogicState] = signal ? SignalState.High : SignalState.Low
+        };
+        InvokeDirect(ent, args.Sink, args.SourcePort, args.SinkPort, payload);
+    }
     #endregion
 }
diff --git a/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs b/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs
index 90623dbae37..1c0c9713cf1 100644
--- a/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.DeviceLinking.Components;
 using Content.Server.DeviceNetwork;
 using Content.Server.Doors.Systems;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors;
 using JetBrains.Annotations;
@@ -84,23 +85,18 @@ private void OnSignalReceived(EntityUid uid, DoorSignalControlComponent componen
 
         private void OnStateChanged(EntityUid uid, DoorSignalControlComponent door, DoorStateChangedEvent args)
         {
-            var data = new NetworkPayload()
-            {
-                { DeviceNetworkConstants.LogicState, SignalState.Momentary }
-            };
-
             if (args.State == DoorState.Closed)
             {
-                data[DeviceNetworkConstants.LogicState] = SignalState.Low;
-                _signalSystem.InvokePort(uid, door.OutOpen, data);
+                // only ever say the door is closed when it is completely airtight
+                _signalSystem.SendSignal(uid, door.OutOpen, false);
             }
             else if (args.State == DoorState.Open
                   || args.State == DoorState.Opening
                   || args.State == DoorState.Closing
                   || args.State == DoorState.Emagging)
             {
-                data[DeviceNetworkConstants.LogicState] = SignalState.High;
-                _signalSystem.InvokePort(uid, door.OutOpen, data);
+                // say the door is open whenever it would be letting air pass
+                _signalSystem.SendSignal(uid, door.OutOpen, true);
             }
         }
     }
diff --git a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
index 0426ee7cc36..f9c2d3430e9 100644
--- a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
@@ -68,7 +68,7 @@ public void Trigger(EntityUid uid, SignalTimerComponent signalTimer)
 
         if (TryComp<AppearanceComponent>(uid, out var appearance))
         {
-            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, new[] { signalTimer.Label }, appearance);
+            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, signalTimer.Label, appearance);
         }
 
         _audio.PlayPvs(signalTimer.DoneSound, uid);
@@ -142,7 +142,7 @@ private void OnTextChangedMessage(EntityUid uid, SignalTimerComponent component,
         component.Label = args.Text[..Math.Min(5, args.Text.Length)];
 
         if (!HasComp<ActiveSignalTimerComponent>(uid))
-            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, new string?[] { component.Label });
+            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, component.Label);
     }
 
     /// <summary>
@@ -186,7 +186,7 @@ public void OnStartTimer(EntityUid uid, SignalTimerComponent component)
         if (appearance != null)
         {
             _appearanceSystem.SetData(uid, TextScreenVisuals.TargetTime, timer.TriggerTime, appearance);
-            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, new string?[] { }, appearance);
+            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, string.Empty, appearance);
         }
 
         _signalSystem.InvokePort(uid, component.StartPort);
diff --git a/Content.Server/DeviceNetwork/NetworkPayload.cs b/Content.Server/DeviceNetwork/NetworkPayload.cs
deleted file mode 100644
index eefbaa6eea5..00000000000
--- a/Content.Server/DeviceNetwork/NetworkPayload.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Robust.Shared.Utility;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Content.Server.DeviceNetwork
-{
-    public sealed class NetworkPayload : Dictionary<string, object?>
-    {
-        /// <summary>
-        /// Tries to get a value from the payload and checks if that value is of type  T.
-        /// </summary>
-        /// <typeparam name="T">The type that should be casted to</typeparam>
-        /// <returns>Whether the value was present in the payload and of the required type</returns>
-        public bool TryGetValue<T>(string key, [NotNullWhen(true)] out T? value)
-        {
-            if (this.TryCastValue(key, out T? result))
-            {
-                value = result;
-                return true;
-            }
-
-            value = default;
-            return false;
-        }
-    }
-
-}
diff --git a/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs b/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
index 11dc628df1c..9a4a81a4c0a 100644
--- a/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Components.Devices;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Interaction;
 
 namespace Content.Server.DeviceNetwork.Systems.Devices
diff --git a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
index 1a819ab0fb1..001abad3dcd 100644
--- a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
+++ b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Disposal.Unit.EntitySystems;
 using Content.Server.Power.Components;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Disposal;
 using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index 0dfc1ffe0d4..35b2afc2e0f 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -198,7 +198,7 @@ private void OnDoAfter(EntityUid uid, SharedDisposalUnitComponent component, DoA
         if (args.Handled || args.Cancelled || args.Args.Target == null || args.Args.Used == null)
             return;
 
-        AfterInsert(uid, component, args.Args.Target.Value, args.Args.User);
+        AfterInsert(uid, component, args.Args.Target.Value, args.Args.User, doInsert: true);
 
         args.Handled = true;
     }
@@ -512,7 +512,7 @@ public bool TryInsert(EntityUid unitId, EntityUid toInsertId, EntityUid? userId,
 
         if (delay <= 0 || userId == null)
         {
-            AfterInsert(unitId, unit, toInsertId, userId);
+            AfterInsert(unitId, unit, toInsertId, userId, doInsert: true);
             return true;
         }
 
@@ -796,11 +796,11 @@ public void QueueAutomaticEngage(EntityUid uid, SharedDisposalUnitComponent comp
         Dirty(component);
     }
 
-    public void AfterInsert(EntityUid uid, SharedDisposalUnitComponent component, EntityUid inserted, EntityUid? user = null)
+    public void AfterInsert(EntityUid uid, SharedDisposalUnitComponent component, EntityUid inserted, EntityUid? user = null, bool doInsert = false)
     {
         _audioSystem.PlayPvs(component.InsertSound, uid);
 
-        if (!_containerSystem.Insert(inserted, component.Container))
+        if (doInsert && !_containerSystem.Insert(inserted, component.Container))
             return;
 
         if (user != inserted && user != null)
diff --git a/Content.Server/Entry/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs
index c1b646ec4f9..fe073da7a49 100644
--- a/Content.Server/Entry/IgnoredComponents.cs
+++ b/Content.Server/Entry/IgnoredComponents.cs
@@ -19,6 +19,7 @@ public static class IgnoredComponents
             "InventorySlots",
             "LightFade",
             "HolidayRsiSwap",
+            "OptionsVisualizer",
         };
     }
 }
diff --git a/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
index 09c2be33a0e..78e41c59ae2 100644
--- a/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
@@ -1,15 +1,12 @@
 using Content.Server.Explosion.Components;
 using Content.Shared.Flash.Components;
-using Content.Shared.Explosion;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Throwing;
 using Robust.Shared.Containers;
 using Robust.Shared.Random;
 using Content.Server.Weapons.Ranged.Systems;
 using System.Numerics;
 using Content.Shared.Explosion.Components;
-using Content.Shared.Flash.Components;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
index d03c64fd378..1f031093333 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
@@ -15,34 +15,13 @@ public sealed partial class ExplosionSystem : EntitySystem
 
     private void SubscribeCvars()
     {
-        _cfg.OnValueChanged(CCVars.ExplosionTilesPerTick, SetTilesPerTick, true);
-        _cfg.OnValueChanged(CCVars.ExplosionThrowLimit, SetThrowLimit, true);
-        _cfg.OnValueChanged(CCVars.ExplosionSleepNodeSys, SetSleepNodeSys, true);
-        _cfg.OnValueChanged(CCVars.ExplosionMaxArea, SetMaxArea, true);
-        _cfg.OnValueChanged(CCVars.ExplosionMaxIterations, SetMaxIterations, true);
-        _cfg.OnValueChanged(CCVars.ExplosionMaxProcessingTime, SetMaxProcessingTime, true);
-        _cfg.OnValueChanged(CCVars.ExplosionIncrementalTileBreaking, SetIncrementalTileBreaking, true);
-        _cfg.OnValueChanged(CCVars.ExplosionSingleTickAreaLimit, SetSingleTickAreaLimit, true);
+        Subs.CVar(_cfg, CCVars.ExplosionTilesPerTick, value => TilesPerTick = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionThrowLimit, value => ThrowLimit = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionSleepNodeSys, value => SleepNodeSys = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionMaxArea, value => MaxArea = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionMaxIterations, value => MaxIterations = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionMaxProcessingTime, value => MaxProcessingTime = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionIncrementalTileBreaking, value => IncrementalTileBreaking = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionSingleTickAreaLimit, value => SingleTickAreaLimit = value, true);
     }
-
-    private void UnsubscribeCvars()
-    {
-        _cfg.UnsubValueChanged(CCVars.ExplosionTilesPerTick, SetTilesPerTick);
-        _cfg.UnsubValueChanged(CCVars.ExplosionThrowLimit, SetThrowLimit);
-        _cfg.UnsubValueChanged(CCVars.ExplosionSleepNodeSys, SetSleepNodeSys);
-        _cfg.UnsubValueChanged(CCVars.ExplosionMaxArea, SetMaxArea);
-        _cfg.UnsubValueChanged(CCVars.ExplosionMaxIterations, SetMaxIterations);
-        _cfg.UnsubValueChanged(CCVars.ExplosionMaxProcessingTime, SetMaxProcessingTime);
-        _cfg.UnsubValueChanged(CCVars.ExplosionIncrementalTileBreaking, SetIncrementalTileBreaking);
-        _cfg.UnsubValueChanged(CCVars.ExplosionSingleTickAreaLimit, SetSingleTickAreaLimit);
-    }
-
-    private void SetTilesPerTick(int value) => TilesPerTick = value;
-    private void SetThrowLimit(int value) => ThrowLimit = value;
-    private void SetSleepNodeSys(bool value) => SleepNodeSys = value;
-    private void SetMaxArea(int value) => MaxArea = value;
-    private void SetMaxIterations(int value) => MaxIterations = value;
-    private void SetMaxProcessingTime(float value) => MaxProcessingTime = value;
-    private void SetIncrementalTileBreaking(bool value) => IncrementalTileBreaking = value;
-    private void SetSingleTickAreaLimit(int value) => SingleTickAreaLimit = value;
 }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 31df23b89d2..7495ecbb349 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -122,7 +122,6 @@ private void OnReset(RoundRestartCleanupEvent ev)
     public override void Shutdown()
     {
         base.Shutdown();
-        UnsubscribeCvars();
         _nodeGroupSystem.PauseUpdating = false;
         _pathfindingSystem.PauseUpdating = false;
     }
diff --git a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
index 2f475a07b44..c0775947ba4 100644
--- a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
@@ -3,8 +3,6 @@
 using Content.Server.Fluids.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Coordinates.Helpers;
-using Content.Shared.Explosion.Components.OnTrigger;
-using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.Maps;
 using Robust.Shared.Map;
 
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index aa81f80c501..9b9a042641f 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Explosion.Components.OnTrigger;
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
+using Content.Shared.Inventory;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Payload.Components;
@@ -28,6 +29,8 @@
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Player;
+using Content.Shared.Coordinates;
 
 namespace Content.Server.Explosion.EntitySystems
 {
@@ -68,6 +71,7 @@ public sealed partial class TriggerSystem : EntitySystem
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+        [Dependency] private readonly InventorySystem _inventory = default!;
 
         public override void Initialize()
         {
@@ -101,9 +105,15 @@ public override void Initialize()
 
         private void OnSoundTrigger(EntityUid uid, SoundOnTriggerComponent component, TriggerEvent args)
         {
-            _audio.PlayPvs(component.Sound, uid);
-            if (component.RemoveOnTrigger)
-                RemCompDeferred<SoundOnTriggerComponent>(uid);
+            if (component.RemoveOnTrigger) // if the component gets removed when it's triggered
+            {
+                var xform = Transform(uid);
+                _audio.PlayPvs(component.Sound, xform.Coordinates); // play the sound at its last known coordinates
+            }
+            else // if the component doesn't get removed when triggered
+            {
+                _audio.PlayPvs(component.Sound, uid); // have the sound follow the entity itself
+            }
         }
 
         private void OnAnchorTrigger(EntityUid uid, AnchorOnTriggerComponent component, TriggerEvent args)
@@ -154,9 +164,15 @@ private void HandleGibTrigger(EntityUid uid, GibOnTriggerComponent component, Tr
         {
             if (!TryComp<TransformComponent>(uid, out var xform))
                 return;
-
-            _body.GibBody(xform.ParentUid, true, deleteItems: component.DeleteItems);
-
+            if (component.DeleteItems)
+            {
+                var items = _inventory.GetHandOrInventoryEntities(xform.ParentUid);
+                foreach (var item in items)
+                {
+                    Del(item);
+                }
+            }
+            _body.GibBody(xform.ParentUid, true);
             args.Handled = true;
         }
 
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index f25fb625425..265a20ce1c9 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Emag.Components;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Fax;
@@ -50,6 +51,9 @@ public sealed class FaxSystem : EntitySystem
     /// </summary>
     [ValidatePrototypeId<EntityPrototype>]
     private const string DefaultPaperPrototypeId = "Paper";
+    
+    [ValidatePrototypeId<EntityPrototype>]
+    private const string OfficePaperPrototypeId = "PaperOffice";
 
     public override void Initialize()
     {
@@ -71,6 +75,7 @@ public override void Initialize()
 
         // UI
         SubscribeLocalEvent<FaxMachineComponent, AfterActivatableUIOpenEvent>(OnToggleInterface);
+        SubscribeLocalEvent<FaxMachineComponent, FaxFileMessage>(OnFileButtonPressed);
         SubscribeLocalEvent<FaxMachineComponent, FaxCopyMessage>(OnCopyButtonPressed);
         SubscribeLocalEvent<FaxMachineComponent, FaxSendMessage>(OnSendButtonPressed);
         SubscribeLocalEvent<FaxMachineComponent, FaxRefreshMessage>(OnRefreshButtonPressed);
@@ -300,6 +305,12 @@ private void OnToggleInterface(EntityUid uid, FaxMachineComponent component, Aft
         UpdateUserInterface(uid, component);
     }
 
+    private void OnFileButtonPressed(EntityUid uid, FaxMachineComponent component, FaxFileMessage args)
+    {
+        args.Content = args.Content[..Math.Min(args.Content.Length, FaxFileMessageValidation.MaxContentSize)];
+        PrintFile(uid, component, args);
+    }
+
     private void OnCopyButtonPressed(EntityUid uid, FaxMachineComponent component, FaxCopyMessage args)
     {
         Copy(uid, component);
@@ -386,6 +397,27 @@ public void Refresh(EntityUid uid, FaxMachineComponent? component = null)
         _deviceNetworkSystem.QueuePacket(uid, null, payload);
     }
 
+    /// <summary>
+    ///     Makes fax print from a file from the computer. A timeout is set after copying,
+    ///     which is shared by the send button.
+    /// </summary>
+    public void PrintFile(EntityUid uid, FaxMachineComponent component, FaxFileMessage args)
+    {
+        string prototype;
+        if (args.OfficePaper)
+            prototype = OfficePaperPrototypeId;
+        else
+            prototype = DefaultPaperPrototypeId;
+
+        var name  = Loc.GetString("fax-machine-printed-paper-name");
+        
+        var printout = new FaxPrintout(args.Content, name, prototype);
+        component.PrintingQueue.Enqueue(printout);
+        component.SendTimeoutRemaining += component.SendTimeout;
+
+        UpdateUserInterface(uid, component);
+    }
+
     /// <summary>
     ///     Copies the paper in the fax. A timeout is set after copying,
     ///     which is shared by the send button.
diff --git a/Content.Server/Flash/Components/DamagedByFlashingComponent.cs b/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
new file mode 100644
index 00000000000..2a9024607d6
--- /dev/null
+++ b/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Damage;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Flash.Components;
+
+// Also needed FlashableComponent on entity to work
+[RegisterComponent, Access(typeof(DamagedByFlashingSystem))]
+public sealed partial class DamagedByFlashingComponent : Component
+{
+    /// <summary>
+    /// damage from flashing
+    /// </summary>
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
+    public DamageSpecifier FlashDamage = new ();
+}
diff --git a/Content.Server/Flash/DamagedByFlashingSystem.cs b/Content.Server/Flash/DamagedByFlashingSystem.cs
new file mode 100644
index 00000000000..cf0368ca42a
--- /dev/null
+++ b/Content.Server/Flash/DamagedByFlashingSystem.cs
@@ -0,0 +1,22 @@
+using Content.Server.Flash.Components;
+using Content.Shared.Damage;
+
+namespace Content.Server.Flash;
+public sealed class DamagedByFlashingSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamagedByFlashingComponent, FlashAttemptEvent>(OnFlashAttempt);
+    }
+    private void OnFlashAttempt(Entity<DamagedByFlashingComponent> ent, ref FlashAttemptEvent args)
+    {
+        _damageable.TryChangeDamage(ent, ent.Comp.FlashDamage);
+
+        //To Do: It would be more logical if different flashes had different power,
+        //and the damage would be inflicted depending on the strength of the flash.
+    }
+}
diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index 4f0ccc27fdc..fe7eb81d1e1 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -8,7 +8,6 @@
 using Content.Shared.Charges.Systems;
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Flash;
-using Content.Shared.Flash.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
@@ -20,7 +19,6 @@
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
-using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
 
@@ -33,6 +31,7 @@ internal sealed class FlashSystem : SharedFlashSystem
         [Dependency] private readonly SharedChargesSystem _charges = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly SharedInteractionSystem _interaction = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
         [Dependency] private readonly PopupSystem _popup = default!;
@@ -152,27 +151,23 @@ public void Flash(EntityUid target,
         public void FlashArea(EntityUid source, EntityUid? user, float range, float duration, float slowTo = 0.8f, bool displayPopup = false, SoundSpecifier? sound = null)
         {
             var transform = EntityManager.GetComponent<TransformComponent>(source);
-            var mapPosition = transform.MapPosition;
-            var flashableEntities = new List<EntityUid>();
+            var mapPosition = _transform.GetMapCoordinates(transform);
             var flashableQuery = GetEntityQuery<FlashableComponent>();
 
             foreach (var entity in _entityLookup.GetEntitiesInRange(transform.Coordinates, range))
             {
-                if (!flashableQuery.HasComponent(entity))
+                if (!flashableQuery.TryGetComponent(entity, out var flashable))
                     continue;
 
-                flashableEntities.Add(entity);
-            }
 
-            foreach (var entity in flashableEntities)
-            {
                 // Check for unobstructed entities while ignoring the mobs with flashable components.
-                if (!_interaction.InRangeUnobstructed(entity, mapPosition, range, CollisionGroup.Opaque, (e) => flashableEntities.Contains(e) || e == source))
+                if (!_interaction.InRangeUnobstructed(entity, mapPosition, range, flashable.CollisionGroup, (e) => e == source))
                     continue;
 
                 // They shouldn't have flash removed in between right?
                 Flash(entity, user, source, duration, slowTo, displayPopup, flashableQuery.GetComponent(entity));
             }
+
             if (sound != null)
             {
                 _audio.PlayPvs(sound, source, AudioParams.Default.WithVolume(1f).WithMaxDistance(3f));
diff --git a/Content.Server/GameTicking/GameTicker.CVars.cs b/Content.Server/GameTicking/GameTicker.CVars.cs
index c77d56ad14c..6e1fda3e2d7 100644
--- a/Content.Server/GameTicking/GameTicker.CVars.cs
+++ b/Content.Server/GameTicking/GameTicker.CVars.cs
@@ -33,7 +33,7 @@ public sealed partial class GameTicker
 
         private void InitializeCVars()
         {
-            _configurationManager.OnValueChanged(CCVars.GameLobbyEnabled, value =>
+            Subs.CVar(_configurationManager, CCVars.GameLobbyEnabled, value =>
             {
                 LobbyEnabled = value;
                 foreach (var (userId, status) in _playerGameStatuses)
@@ -44,23 +44,23 @@ private void InitializeCVars()
                         LobbyEnabled ? PlayerGameStatus.NotReadyToPlay : PlayerGameStatus.ReadyToPlay;
                 }
             }, true);
-            _configurationManager.OnValueChanged(CCVars.GameDummyTicker, value => DummyTicker = value, true);
-            _configurationManager.OnValueChanged(CCVars.GameLobbyDuration, value => LobbyDuration = TimeSpan.FromSeconds(value), true);
-            _configurationManager.OnValueChanged(CCVars.GameDisallowLateJoins,
+            Subs.CVar(_configurationManager, CCVars.GameDummyTicker, value => DummyTicker = value, true);
+            Subs.CVar(_configurationManager, CCVars.GameLobbyDuration, value => LobbyDuration = TimeSpan.FromSeconds(value), true);
+            Subs.CVar(_configurationManager, CCVars.GameDisallowLateJoins,
                 value => { DisallowLateJoin = value; UpdateLateJoinStatus(); }, true);
-            _configurationManager.OnValueChanged(CCVars.AdminLogsServerName, value =>
+            Subs.CVar(_configurationManager, CCVars.AdminLogsServerName, value =>
             {
                 // TODO why tf is the server name on admin logs
                 ServerName = value;
             }, true);
-            _configurationManager.OnValueChanged(CCVars.DiscordRoundUpdateWebhook, value =>
+            Subs.CVar(_configurationManager, CCVars.DiscordRoundUpdateWebhook, value =>
             {
                 if (!string.IsNullOrWhiteSpace(value))
                 {
                     _discord.GetWebhook(value, data => _webhookIdentifier = data.ToIdentifier());
                 }
             }, true);
-            _configurationManager.OnValueChanged(CCVars.DiscordRoundEndRoleWebhook, value =>
+            Subs.CVar(_configurationManager, CCVars.DiscordRoundEndRoleWebhook, value =>
             {
                 DiscordRoundEndRole = value;
 
@@ -70,7 +70,7 @@ private void InitializeCVars()
                 }
             }, true);
 #if EXCEPTION_TOLERANCE
-            _configurationManager.OnValueChanged(CCVars.RoundStartFailShutdownCount, value => RoundStartFailShutdownCount = value, true);
+            Subs.CVar(_configurationManager, CCVars.RoundStartFailShutdownCount, value => RoundStartFailShutdownCount = value, true);
 #endif
         }
     }
diff --git a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs b/Content.Server/GameTicking/GameTicker.LobbyBackground.cs
index 7f2ccfe235b..2090e3e31f0 100644
--- a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs
+++ b/Content.Server/GameTicking/GameTicker.LobbyBackground.cs
@@ -13,7 +13,7 @@ public sealed partial class GameTicker
     [ViewVariables]
     private List<ResPath>? _lobbyBackgrounds;
 
-    private static readonly string[] WhitelistedBackgroundExtensions = new string[] {"png", "jpg", "jpeg"};
+    private static readonly string[] WhitelistedBackgroundExtensions = new string[] {"png", "jpg", "jpeg", "webp"};
 
     private void InitializeLobbyBackground()
     {
diff --git a/Content.Server/GameTicking/GameTicker.Replays.cs b/Content.Server/GameTicking/GameTicker.Replays.cs
index 7e1a553a856..f23482585cc 100644
--- a/Content.Server/GameTicking/GameTicker.Replays.cs
+++ b/Content.Server/GameTicking/GameTicker.Replays.cs
@@ -2,6 +2,10 @@
 using Robust.Shared;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Replays;
+using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Serialization.Markdown;
+using Robust.Shared.Serialization.Markdown.Mapping;
+using Robust.Shared.Serialization.Markdown.Value;
 using Robust.Shared.Utility;
 
 namespace Content.Server.GameTicking;
@@ -10,12 +14,15 @@ public sealed partial class GameTicker
 {
     [Dependency] private readonly IReplayRecordingManager _replays = default!;
     [Dependency] private readonly IResourceManager _resourceManager = default!;
+    [Dependency] private readonly ISerializationManager _serialman = default!;
+
 
     private ISawmill _sawmillReplays = default!;
 
     private void InitializeReplays()
     {
         _replays.RecordingFinished += ReplaysOnRecordingFinished;
+        _replays.RecordingStopped += ReplaysOnRecordingStopped;
     }
 
     /// <summary>
@@ -108,6 +115,20 @@ private void ReplaysOnRecordingFinished(ReplayRecordingFinished data)
         data.Directory.Rename(data.Path, state.MoveToPath.Value);
     }
 
+    private void ReplaysOnRecordingStopped(MappingDataNode metadata)
+    {
+        // Write round info like map and round end summery into the replay_final.yml file. Useful for external parsers.
+
+        metadata["map"] = new ValueDataNode(_gameMapManager.GetSelectedMap()?.MapName);
+        metadata["gamemode"] = new ValueDataNode(CurrentPreset != null ? Loc.GetString(CurrentPreset.ModeTitle) : string.Empty);
+        metadata["roundEndPlayers"] = _serialman.WriteValue(_replayRoundPlayerInfo);
+        metadata["roundEndText"] = new ValueDataNode(_replayRoundText);
+        metadata["server_id"] = new ValueDataNode(_configurationManager.GetCVar(CCVars.ServerId));
+        // These should be set to null to prepare them for the next round.
+        _replayRoundPlayerInfo = null;
+        _replayRoundText = null;
+    }
+
     private ResPath GetAutoReplayPath()
     {
         var cfgValue = _cfg.GetCVar(CCVars.ReplayAutoRecordName);
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 6f0463aaf8f..ffe26aeb346 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -46,6 +46,10 @@ public sealed partial class GameTicker
         [ViewVariables]
         private GameRunLevel _runLevel;
 
+        private RoundEndMessageEvent.RoundEndPlayerInfo[]? _replayRoundPlayerInfo;
+
+        private string? _replayRoundText;
+
         [ViewVariables]
         public GameRunLevel RunLevel
         {
@@ -372,11 +376,14 @@ public void ShowRoundEndScoreboard(string text = "")
                     PlayerOOCName = contentPlayerData?.Name ?? "(IMPOSSIBLE: REGISTERED MIND WITH NO OWNER)",
                     // Character name takes precedence over current entity name
                     PlayerICName = playerIcName,
+                    PlayerGuid = userId,
                     PlayerNetEntity = GetNetEntity(entity),
                     Role = antag
                         ? roles.First(role => role.Antagonist).Name
                         : roles.FirstOrDefault().Name ?? Loc.GetString("game-ticker-unknown-role"),
                     Antag = antag,
+                    JobPrototypes = roles.Where(role => !role.Antagonist).Select(role => role.Prototype).ToArray(),
+                    AntagPrototypes = roles.Where(role => role.Antagonist).Select(role => role.Prototype).ToArray(),
                     Observer = observer,
                     Connected = connected
                 };
@@ -389,6 +396,9 @@ public void ShowRoundEndScoreboard(string text = "")
 
             RaiseNetworkEvent(new RoundEndMessageEvent(gamemodeTitle, roundEndText, roundDuration, RoundId,
                 listOfPlayerInfoFinal.Length, listOfPlayerInfoFinal, LobbySong, sound));
+
+            _replayRoundPlayerInfo = listOfPlayerInfoFinal;
+            _replayRoundText = roundEndText;
         }
 
         private async void SendRoundEndDiscordMessage()
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index af2c5b5e791..52b59703e3a 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -93,7 +93,7 @@ private void SpawnPlayers(List<ICommonSession> readyPlayers, Dictionary<NetUserI
             {
                 if (job == null)
                 {
-                    var playerSession = _playerManager.GetSessionByUserId(netUser);
+                    var playerSession = _playerManager.GetSessionById(netUser);
                     _chatManager.DispatchServerMessage(playerSession, Loc.GetString("job-not-available-wait-in-lobby"));
                 }
                 else
@@ -110,13 +110,13 @@ private void SpawnPlayers(List<ICommonSession> readyPlayers, Dictionary<NetUserI
                 if (job == null)
                     continue;
 
-                SpawnPlayer(_playerManager.GetSessionByUserId(player), profiles[player], station, job, false);
+                SpawnPlayer(_playerManager.GetSessionById(player), profiles[player], station, job, false);
             }
 
             RefreshLateJoinAllowed();
 
             // Allow rules to add roles to players who have been spawned in. (For example, on-station traitors)
-            RaiseLocalEvent(new RulePlayerJobsAssignedEvent(assignedJobs.Keys.Select(x => _playerManager.GetSessionByUserId(x)).ToArray(), profiles, force));
+            RaiseLocalEvent(new RulePlayerJobsAssignedEvent(assignedJobs.Keys.Select(x => _playerManager.GetSessionById(x)).ToArray(), profiles, force));
         }
 
         private void SpawnPlayer(ICommonSession player, EntityUid station, string? jobId = null, bool lateJoin = true, bool silent = false)
diff --git a/Content.Server/Holiday/HolidaySystem.cs b/Content.Server/Holiday/HolidaySystem.cs
index 865d78c8f11..001508593da 100644
--- a/Content.Server/Holiday/HolidaySystem.cs
+++ b/Content.Server/Holiday/HolidaySystem.cs
@@ -23,7 +23,7 @@ public sealed class HolidaySystem : EntitySystem
 
         public override void Initialize()
         {
-            _configManager.OnValueChanged(CCVars.HolidaysEnabled, OnHolidaysEnableChange);
+            Subs.CVar(_configManager, CCVars.HolidaysEnabled, OnHolidaysEnableChange);
             SubscribeLocalEvent<GameRunLevelChangedEvent>(OnRunLevelChanged);
             SubscribeLocalEvent<HolidayVisualsComponent, ComponentInit>(OnVisualsInit);
         }
diff --git a/Content.Server/Holosign/HolosignSystem.cs b/Content.Server/Holosign/HolosignSystem.cs
index f0fc3bbe142..58a0bf0d5f9 100644
--- a/Content.Server/Holosign/HolosignSystem.cs
+++ b/Content.Server/Holosign/HolosignSystem.cs
@@ -1,19 +1,22 @@
-using Content.Shared.Interaction.Events;
 using Content.Shared.Examine;
 using Content.Shared.Coordinates.Helpers;
 using Content.Server.Power.Components;
 using Content.Server.PowerCell;
+using Content.Shared.Interaction;
+using Content.Shared.Storage;
 
 namespace Content.Server.Holosign;
 
 public sealed class HolosignSystem : EntitySystem
 {
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<HolosignProjectorComponent, UseInHandEvent>(OnUse);
+        SubscribeLocalEvent<HolosignProjectorComponent, BeforeRangedInteractEvent>(OnBeforeInteract);
         SubscribeLocalEvent<HolosignProjectorComponent, ExaminedEvent>(OnExamine);
     }
 
@@ -36,16 +39,22 @@ private void OnExamine(EntityUid uid, HolosignProjectorComponent component, Exam
         }
     }
 
-    private void OnUse(EntityUid uid, HolosignProjectorComponent component, UseInHandEvent args)
+    private void OnBeforeInteract(EntityUid uid, HolosignProjectorComponent component, BeforeRangedInteractEvent args)
     {
-        if (args.Handled ||
-            !_powerCell.TryGetBatteryFromSlot(uid, out var battery) ||
-            !battery.TryUseCharge(component.ChargeUse))
+
+        if (args.Handled
+            || !args.CanReach // prevent placing out of range
+            || HasComp<StorageComponent>(args.Target) // if it's a storage component like a bag, we ignore usage so it can be stored
+            || !_powerCell.TryUseCharge(uid, component.ChargeUse) // if no battery or no charge, doesn't work
+            )
             return;
 
-        // TODO: Too tired to deal
-        var holo = EntityManager.SpawnEntity(component.SignProto, Transform(args.User).Coordinates.SnapToGrid(EntityManager));
-        Transform(holo).Anchored = true;
+        // places the holographic sign at the click location, snapped to grid.
+        // overlapping of the same holo on one tile remains allowed to allow holofan refreshes
+        var holoUid = EntityManager.SpawnEntity(component.SignProto, args.ClickLocation.SnapToGrid(EntityManager));
+        var xform = Transform(holoUid);
+        if (!xform.Anchored)
+            _transform.AnchorEntity(holoUid, xform); // anchor to prevent any tempering with (don't know what could even interact with it)
 
         args.Handled = true;
     }
diff --git a/Content.Server/Info/InfoSystem.cs b/Content.Server/Info/InfoSystem.cs
index 69bce80592d..04fa6a57e59 100644
--- a/Content.Server/Info/InfoSystem.cs
+++ b/Content.Server/Info/InfoSystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Info;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
-using Robust.Shared.Log;
 
 namespace Content.Server.Info;
 
@@ -16,9 +15,9 @@ public override void Initialize()
         SubscribeNetworkEvent<RequestRulesMessage>(OnRequestRules);
     }
 
-    protected void OnRequestRules(RequestRulesMessage message, EntitySessionEventArgs eventArgs)
+    private void OnRequestRules(RequestRulesMessage message, EntitySessionEventArgs eventArgs)
     {
-        Logger.DebugS("info", "Client requested rules.");
+        Log.Debug("info", "Client requested rules.");
         var title = Loc.GetString(_cfg.GetCVar(CCVars.RulesHeader));
         var path = _cfg.GetCVar(CCVars.RulesFile);
         var rules = "Server could not read its rules.";
@@ -28,7 +27,7 @@ protected void OnRequestRules(RequestRulesMessage message, EntitySessionEventArg
         }
         catch (Exception)
         {
-            Logger.ErrorS("info", "Could not read server rules file.");
+            Log.Debug("info", "Could not read server rules file.");
         }
         var response = new RulesMessage(title, rules);
         RaiseNetworkEvent(response, eventArgs.SenderSession.Channel);
diff --git a/Content.Server/Info/ShowRulesCommand.cs b/Content.Server/Info/ShowRulesCommand.cs
index 66273e4f632..32c24c29995 100644
--- a/Content.Server/Info/ShowRulesCommand.cs
+++ b/Content.Server/Info/ShowRulesCommand.cs
@@ -60,7 +60,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
         var message = new SharedRulesManager.ShowRulesPopupMessage();
         message.PopupTime = seconds;
 
-        var player = IoCManager.Resolve<IPlayerManager>().GetSessionByUserId(located.UserId);
+        var player = IoCManager.Resolve<IPlayerManager>().GetSessionById(located.UserId);
         netManager.ServerSendMessage(message, player.Channel);
     }
 }
diff --git a/Content.Server/Instruments/InstrumentSystem.CVars.cs b/Content.Server/Instruments/InstrumentSystem.CVars.cs
index 0467d94f2bb..cf4cca30b3e 100644
--- a/Content.Server/Instruments/InstrumentSystem.CVars.cs
+++ b/Content.Server/Instruments/InstrumentSystem.CVars.cs
@@ -11,37 +11,9 @@ public sealed partial class InstrumentSystem
 
     private void InitializeCVars()
     {
-        _cfg.OnValueChanged(CCVars.MaxMidiEventsPerSecond, OnMaxMidiEventsPerSecondChanged, true);
-        _cfg.OnValueChanged(CCVars.MaxMidiEventsPerBatch, OnMaxMidiEventsPerBatchChanged, true);
-        _cfg.OnValueChanged(CCVars.MaxMidiBatchesDropped, OnMaxMidiBatchesDroppedChanged, true);
-        _cfg.OnValueChanged(CCVars.MaxMidiLaggedBatches, OnMaxMidiLaggedBatchesChanged, true);
-    }
-
-    private void ShutdownCVars()
-    {
-        _cfg.UnsubValueChanged(CCVars.MaxMidiEventsPerSecond, OnMaxMidiEventsPerSecondChanged);
-        _cfg.UnsubValueChanged(CCVars.MaxMidiEventsPerBatch, OnMaxMidiEventsPerBatchChanged);
-        _cfg.UnsubValueChanged(CCVars.MaxMidiBatchesDropped, OnMaxMidiBatchesDroppedChanged);
-        _cfg.UnsubValueChanged(CCVars.MaxMidiLaggedBatches, OnMaxMidiLaggedBatchesChanged);
-    }
-
-    private void OnMaxMidiLaggedBatchesChanged(int obj)
-    {
-        MaxMidiLaggedBatches = obj;
-    }
-
-    private void OnMaxMidiBatchesDroppedChanged(int obj)
-    {
-        MaxMidiBatchesDropped = obj;
-    }
-
-    private void OnMaxMidiEventsPerBatchChanged(int obj)
-    {
-        MaxMidiEventsPerBatch = obj;
-    }
-
-    private void OnMaxMidiEventsPerSecondChanged(int obj)
-    {
-        MaxMidiEventsPerSecond = obj;
+        Subs.CVar(_cfg, CCVars.MaxMidiEventsPerSecond, obj => MaxMidiEventsPerSecond = obj, true);
+        Subs.CVar(_cfg, CCVars.MaxMidiEventsPerBatch, obj => MaxMidiEventsPerBatch = obj, true);
+        Subs.CVar(_cfg, CCVars.MaxMidiBatchesDropped, obj => MaxMidiBatchesDropped = obj, true);
+        Subs.CVar(_cfg, CCVars.MaxMidiLaggedBatches, obj => MaxMidiLaggedBatches = obj, true);
     }
 }
diff --git a/Content.Server/Instruments/InstrumentSystem.cs b/Content.Server/Instruments/InstrumentSystem.cs
index 17899b72328..8dd9644e3c5 100644
--- a/Content.Server/Instruments/InstrumentSystem.cs
+++ b/Content.Server/Instruments/InstrumentSystem.cs
@@ -191,13 +191,6 @@ private void OnMidiSetFilteredChannel(InstrumentSetFilteredChannelEvent msg, Ent
         Dirty(uid, instrument);
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        ShutdownCVars();
-    }
-
     private void OnBoundUIClosed(EntityUid uid, InstrumentComponent component, BoundUIClosedEvent args)
     {
         if (HasComp<ActiveInstrumentComponent>(uid)
diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
index 142a98236a7..815ba8f5213 100644
--- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
@@ -56,6 +56,12 @@ public sealed partial class MicrowaveComponent : Component
         [DataField("currentCookTimerTime"), ViewVariables(VVAccess.ReadWrite)]
         public uint CurrentCookTimerTime = 0;
 
+        /// <summary>
+        /// Tracks the elapsed time of the current cook timer.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public TimeSpan CurrentCookTimeEnd = TimeSpan.Zero;
+
         /// <summary>
         /// The maximum number of seconds a microwave can be set to.
         /// This is currently only used for validation and the client does not check this.
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index b8ea32c2a6f..cf3544a7e19 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -369,7 +369,8 @@ public void UpdateUserInterfaceState(EntityUid uid, MicrowaveComponent component
                 GetNetEntityArray(component.Storage.ContainedEntities.ToArray()),
                 HasComp<ActiveMicrowaveComponent>(uid),
                 component.CurrentCookTimeButtonIndex,
-                component.CurrentCookTimerTime
+                component.CurrentCookTimerTime,
+                component.CurrentCookTimeEnd
             ));
         }
 
@@ -492,6 +493,7 @@ public void Wzhzhzh(EntityUid uid, MicrowaveComponent component, EntityUid? user
             activeComp.CookTimeRemaining = component.CurrentCookTimerTime * component.CookTimeMultiplier;
             activeComp.TotalTime = component.CurrentCookTimerTime; //this doesn't scale so that we can have the "actual" time
             activeComp.PortionedRecipe = portionedRecipe;
+            component.CurrentCookTimeEnd = _gameTiming.CurTime + TimeSpan.FromSeconds(component.CurrentCookTimerTime);
             if (malfunctioning)
                 activeComp.MalfunctionTime = _gameTiming.CurTime + TimeSpan.FromSeconds(component.MalfunctionInterval);
             UpdateUserInterfaceState(uid, component);
@@ -557,7 +559,7 @@ public override void Update(float frameTime)
 
                 active.CookTimeRemaining -= frameTime;
 
-                RollMalfunction((uid, active,microwave));
+                RollMalfunction((uid, active, microwave));
 
                 //check if there's still cook time left
                 if (active.CookTimeRemaining > 0)
@@ -580,6 +582,7 @@ public override void Update(float frameTime)
                 }
 
                 _container.EmptyContainer(microwave.Storage);
+                microwave.CurrentCookTimeEnd = TimeSpan.Zero;
                 UpdateUserInterfaceState(uid, microwave);
                 _audio.PlayPvs(microwave.FoodDoneSound, uid);
                 StopCooking((uid, microwave));
@@ -617,6 +620,7 @@ private void OnSelectTime(Entity<MicrowaveComponent> ent, ref MicrowaveSelectCoo
 
             ent.Comp.CurrentCookTimeButtonIndex = args.ButtonIndex;
             ent.Comp.CurrentCookTimerTime = args.NewCookTime;
+            ent.Comp.CurrentCookTimeEnd = TimeSpan.Zero;
             _audio.PlayPvs(ent.Comp.ClickSound, ent, AudioParams.Default.WithVolume(-2));
             UpdateUserInterfaceState(ent, ent.Comp);
         }
diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
index ca44b1a4c99..e880cec5bbb 100644
--- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
@@ -23,11 +23,6 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
-using Content.Shared.DoAfter;
-using Content.Server.Emp;
-using Content.Server.DeviceLinking.Events;
-using Content.Server.DeviceLinking.Systems;
-using Content.Shared.Inventory;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Light.EntitySystems
diff --git a/Content.Server/Mapping/MappingSystem.cs b/Content.Server/Mapping/MappingSystem.cs
index 5b4609bcd67..0678dab7ce2 100644
--- a/Content.Server/Mapping/MappingSystem.cs
+++ b/Content.Server/Mapping/MappingSystem.cs
@@ -45,14 +45,7 @@ public override void Initialize()
             ToggleAutosaveCommand);
 
         _sawmill = Logger.GetSawmill("autosave");
-        _cfg.OnValueChanged(CCVars.AutosaveEnabled, SetAutosaveEnabled, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _cfg.UnsubValueChanged(CCVars.AutosaveEnabled, SetAutosaveEnabled);
+        Subs.CVar(_cfg, CCVars.AutosaveEnabled, SetAutosaveEnabled, true);
     }
 
     private void SetAutosaveEnabled(bool b)
diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs
index 40e2a0911b3..01dee54cabc 100644
--- a/Content.Server/MassMedia/Systems/NewsSystem.cs
+++ b/Content.Server/MassMedia/Systems/NewsSystem.cs
@@ -17,22 +17,10 @@
 using Content.Shared.MassMedia.Systems;
 using Content.Shared.PDA;
 using Robust.Server.GameObjects;
-using System.Linq;
-using Content.Server.Administration.Logs;
-using Content.Server.CartridgeLoader.Cartridges;
-using Content.Shared.CartridgeLoader;
-using Content.Shared.CartridgeLoader.Cartridges;
-using Content.Server.CartridgeLoader;
-using Content.Server.GameTicking;
 using Robust.Shared.Timing;
-using Content.Server.Popups;
-using Content.Server.StationRecords.Systems;
-using Content.Shared.Database;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
-using Robust.Shared.Timing;
 
 namespace Content.Server.MassMedia.Systems;
 
diff --git a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
index 785ef60af90..bff7f1565a1 100644
--- a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
+++ b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.Medical.SuitSensors;
 using Content.Server.Power.Components;
 using Content.Server.Station.Systems;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Medical.SuitSensor;
 using Robust.Shared.Timing;
 
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index aa6dca718d5..38a7b0a4517 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -8,6 +8,7 @@
 using Content.Server.Popups;
 using Content.Server.Station.Systems;
 using Content.Shared.Damage;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Emp;
 using Content.Shared.Examine;
 using Content.Shared.Inventory.Events;
diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs
index 5e84e6c94e9..4035fa0f864 100644
--- a/Content.Server/Mind/MindSystem.cs
+++ b/Content.Server/Mind/MindSystem.cs
@@ -122,12 +122,6 @@ public override bool TryGetMind(NetUserId user, [NotNullWhen(true)] out EntityUi
         return false;
     }
 
-    public bool TryGetSession(EntityUid? mindId, [NotNullWhen(true)] out ICommonSession? session)
-    {
-        session = null;
-        return TryComp(mindId, out MindComponent? mind) && (session = mind.Session) != null;
-    }
-
     public ICommonSession? GetSession(MindComponent mind)
     {
         return mind.Session;
@@ -251,7 +245,7 @@ public override void TransferTo(EntityUid mindId, EntityUid? entity, bool ghostC
 
             var position = Deleted(mind.OwnedEntity)
                 ? _gameTicker.GetObserverSpawnPoint().ToMap(EntityManager, _transform)
-                : Transform(mind.OwnedEntity.Value).MapPosition;
+                : _transform.GetMapCoordinates(mind.OwnedEntity.Value);
 
             entity = Spawn(GameTicker.ObserverPrototypeName, position);
             component = EnsureComp<MindContainerComponent>(entity.Value);
diff --git a/Content.Server/Motd/MOTDSystem.cs b/Content.Server/Motd/MOTDSystem.cs
index 65c14040658..3cf77cdf081 100644
--- a/Content.Server/Motd/MOTDSystem.cs
+++ b/Content.Server/Motd/MOTDSystem.cs
@@ -24,16 +24,10 @@ public sealed class MOTDSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        _configurationManager.OnValueChanged(CCVars.MOTD, OnMOTDChanged, invokeImmediately: true);
+        Subs.CVar(_configurationManager, CCVars.MOTD, OnMOTDChanged, invokeImmediately: true);
         SubscribeLocalEvent<PlayerJoinedLobbyEvent>(OnPlayerJoinedLobby);
     }
 
-    public override void Shutdown()
-    {
-        _configurationManager.UnsubValueChanged(CCVars.MOTD, OnMOTDChanged);
-        base.Shutdown();
-    }
-
     /// <summary>
     /// Sends the Message Of The Day, if any, to all connected players.
     /// </summary>
diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs
index 11ba4d102b1..2ae20817e28 100644
--- a/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs
+++ b/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs
@@ -1,10 +1,7 @@
 using System.Numerics;
 using Content.Server.NPC.Components;
-using Content.Server.NPC.Events;
 using Content.Shared.CombatMode;
 using Content.Shared.NPC;
-using Content.Shared.NPC;
-using Content.Shared.Weapons.Melee;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
index 3db7c586743..149a330919f 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -103,8 +103,8 @@ public override void Initialize()
         }
 
         UpdatesBefore.Add(typeof(SharedPhysicsSystem));
-        _configManager.OnValueChanged(CCVars.NPCEnabled, SetNPCEnabled, true);
-        _configManager.OnValueChanged(CCVars.NPCPathfinding, SetNPCPathfinding, true);
+        Subs.CVar(_configManager, CCVars.NPCEnabled, SetNPCEnabled, true);
+        Subs.CVar(_configManager, CCVars.NPCPathfinding, SetNPCPathfinding, true);
 
         SubscribeLocalEvent<NPCSteeringComponent, ComponentShutdown>(OnSteeringShutdown);
         SubscribeLocalEvent<NPCSteeringComponent, EntityUnpausedEvent>(OnSteeringUnpaused);
@@ -140,13 +140,6 @@ private void SetNPCPathfinding(bool value)
         }
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configManager.UnsubValueChanged(CCVars.NPCEnabled, SetNPCEnabled);
-        _configManager.UnsubValueChanged(CCVars.NPCPathfinding, SetNPCPathfinding);
-    }
-
     private void OnDebugRequest(RequestNPCSteeringDebugEvent msg, EntitySessionEventArgs args)
     {
         if (!_admin.IsAdmin(args.SenderSession))
diff --git a/Content.Server/NPC/Systems/NPCSystem.cs b/Content.Server/NPC/Systems/NPCSystem.cs
index 7d33133a376..8abe0f7f54c 100644
--- a/Content.Server/NPC/Systems/NPCSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSystem.cs
@@ -34,8 +34,8 @@ public override void Initialize()
         {
             base.Initialize();
 
-            _configurationManager.OnValueChanged(CCVars.NPCEnabled, SetEnabled, true);
-            _configurationManager.OnValueChanged(CCVars.NPCMaxUpdates, SetMaxUpdates, true);
+            Subs.CVar(_configurationManager, CCVars.NPCEnabled, value => Enabled = value, true);
+            Subs.CVar(_configurationManager, CCVars.NPCMaxUpdates, obj => _maxUpdates = obj, true);
         }
 
         public void OnPlayerNPCAttach(EntityUid uid, HTNComponent component, PlayerAttachedEvent args)
@@ -51,16 +51,6 @@ public void OnPlayerNPCDetach(EntityUid uid, HTNComponent component, PlayerDetac
             WakeNPC(uid, component);
         }
 
-        private void SetMaxUpdates(int obj) => _maxUpdates = obj;
-        private void SetEnabled(bool value) => Enabled = value;
-
-        public override void Shutdown()
-        {
-            base.Shutdown();
-            _configurationManager.UnsubValueChanged(CCVars.NPCEnabled, SetEnabled);
-            _configurationManager.UnsubValueChanged(CCVars.NPCMaxUpdates, SetMaxUpdates);
-        }
-
         public void OnNPCMapInit(EntityUid uid, HTNComponent component, MapInitEvent args)
         {
             component.Blackboard.SetValue(NPCBlackboard.Owner, uid);
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 77689c4e2b1..652852ece28 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.DoAfter;
+using Content.Shared.Examine;
 using Content.Shared.Maps;
 using Content.Shared.Nuke;
 using Content.Shared.Popups;
@@ -40,6 +41,7 @@ public sealed class NukeSystem : EntitySystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly AppearanceSystem _appearance = default!;
 
     /// <summary>
     ///     Used to calculate when the nuke song should start playing for maximum kino with the nuke sfx
@@ -60,6 +62,7 @@ public override void Initialize()
         SubscribeLocalEvent<NukeComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<NukeComponent, EntInsertedIntoContainerMessage>(OnItemSlotChanged);
         SubscribeLocalEvent<NukeComponent, EntRemovedFromContainerMessage>(OnItemSlotChanged);
+        SubscribeLocalEvent<NukeComponent, ExaminedEvent>(OnExaminedEvent);
 
         // Shouldn't need re-anchoring.
         SubscribeLocalEvent<NukeComponent, AnchorStateChangedEvent>(OnAnchorChanged);
@@ -148,6 +151,8 @@ private void OnAnchorChanged(EntityUid uid, NukeComponent component, ref AnchorS
             // without the doafter. but that takes some effort, and it won't allow you to disarm a nuke that can't be disarmed by the doafter.
             DisarmBomb(uid, component);
         }
+
+        UpdateAppearance(uid, component);
     }
 
     #endregion
@@ -299,6 +304,7 @@ private void TickTimer(EntityUid uid, float frameTime, NukeComponent? nuke = nul
             _sound.PlayGlobalOnStation(uid, _audio.GetSound(nuke.AlertSound), new AudioParams{Volume = -5f});
             _sound.StopStationEventMusic(uid, StationEventMusicType.Nuke);
             nuke.PlayedAlertSound = true;
+            UpdateAppearance(uid, nuke);
         }
 
         if (nuke.RemainingTime <= 0)
@@ -473,6 +479,7 @@ public void ArmBomb(EntityUid uid, NukeComponent? component = null)
 
         component.Status = NukeStatus.ARMED;
         UpdateUserInterface(uid, component);
+        UpdateAppearance(uid, component);
     }
 
     /// <summary>
@@ -514,6 +521,7 @@ public void DisarmBomb(EntityUid uid, NukeComponent? component = null)
         component.CooldownTime = component.Cooldown;
 
         UpdateUserInterface(uid, component);
+        UpdateAppearance(uid, component);
     }
 
     /// <summary>
@@ -589,6 +597,36 @@ private void DisarmBombDoafter(EntityUid uid, EntityUid user, NukeComponent nuke
         _popups.PopupEntity(Loc.GetString("nuke-component-doafter-warning"), user,
             user, PopupType.LargeCaution);
     }
+
+    private void UpdateAppearance(EntityUid uid, NukeComponent nuke)
+    {
+        var xform = Transform(uid);
+
+        _appearance.SetData(uid, NukeVisuals.Deployed, xform.Anchored);
+
+        NukeVisualState state;
+        if (nuke.PlayedAlertSound)
+            state = NukeVisualState.YoureFucked;
+        else if (nuke.Status == NukeStatus.ARMED)
+            state = NukeVisualState.Armed;
+        else
+            state = NukeVisualState.Idle;
+
+        _appearance.SetData(uid, NukeVisuals.State, state);
+    }
+
+    private void OnExaminedEvent(EntityUid uid, NukeComponent component, ExaminedEvent args)
+    {
+        if (component.PlayedAlertSound)
+            args.PushMarkup(Loc.GetString("nuke-examine-exploding"));
+        else if (component.Status == NukeStatus.ARMED)
+            args.PushMarkup(Loc.GetString("nuke-examine-armed"));
+
+        if (Transform(uid).Anchored)
+            args.PushMarkup(Loc.GetString("examinable-anchored"));
+        else
+            args.PushMarkup(Loc.GetString("examinable-unanchored"));
+    }
 }
 
 public sealed class NukeExplodedEvent : EntityEventArgs
diff --git a/Content.Server/Nutrition/Components/OpenableComponent.cs b/Content.Server/Nutrition/Components/OpenableComponent.cs
index 63efd520962..cc24bf44dca 100644
--- a/Content.Server/Nutrition/Components/OpenableComponent.cs
+++ b/Content.Server/Nutrition/Components/OpenableComponent.cs
@@ -14,20 +14,20 @@ public sealed partial class OpenableComponent : Component
     /// Whether this drink or food is opened or not.
     /// Drinks can only be drunk or poured from/into when open, and food can only be eaten when open.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool Opened;
 
     /// <summary>
     /// If this is false you cant press Z to open it.
     /// Requires an OpenBehavior damage threshold or other logic to open.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool OpenableByHand = true;
 
     /// <summary>
     /// Text shown when examining and its open.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public LocId ExamineText = "drink-component-on-examine-is-opened";
 
     /// <summary>
@@ -35,12 +35,38 @@ public sealed partial class OpenableComponent : Component
     /// Defaults to the popup drink uses since its "correct".
     /// It's still generic enough that you should change it if you make openable non-drinks, i.e. unwrap it first, peel it first.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public LocId ClosedPopup = "drink-component-try-use-drink-not-open";
 
+    /// <summary>
+    /// Text to show in the verb menu for the "Open" action.
+    /// You may want to change this for non-drinks, i.e. "Peel", "Unwrap"
+    /// </summary>
+    [DataField]
+    public LocId OpenVerbText = "openable-component-verb-open";
+
+    /// <summary>
+    /// Text to show in the verb menu for the "Close" action.
+    /// You may want to change this for non-drinks, i.e. "Wrap"
+    /// </summary>
+    [DataField]
+    public LocId CloseVerbText = "openable-component-verb-close";
+
     /// <summary>
     /// Sound played when opening.
     /// </summary>
     [DataField]
     public SoundSpecifier Sound = new SoundCollectionSpecifier("canOpenSounds");
+
+    /// <summary>
+    /// Can this item be closed again after opening?
+    /// </summary>
+    [DataField]
+    public bool Closeable;
+
+    /// <summary>
+    /// Sound played when closing.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? CloseSound;
 }
diff --git a/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
index d7b7da25b88..373b97700f4 100644
--- a/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
@@ -1,22 +1,23 @@
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Server.Nutrition.Components;
 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;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.GameObjects;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Nutrition.EntitySystems;
 
 /// <summary>
 /// Provides API for openable food and drinks, handles opening on use and preventing transfer when closed.
 /// </summary>
-public sealed class OpenableSystem : EntitySystem
+public sealed class OpenableSystem : SharedOpenableSystem
 {
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -32,6 +33,7 @@ public override void Initialize()
         SubscribeLocalEvent<OpenableComponent, SolutionTransferAttemptEvent>(OnTransferAttempt);
         SubscribeLocalEvent<OpenableComponent, MeleeHitEvent>(HandleIfClosed);
         SubscribeLocalEvent<OpenableComponent, AfterInteractEvent>(HandleIfClosed);
+        SubscribeLocalEvent<OpenableComponent, GetVerbsEvent<Verb>>(AddOpenCloseVerbs);
     }
 
     private void OnInit(EntityUid uid, OpenableComponent comp, ComponentInit args)
@@ -71,6 +73,36 @@ private void HandleIfClosed(EntityUid uid, OpenableComponent comp, HandledEntity
         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)
+            };
+        }
+        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.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.
@@ -123,6 +155,17 @@ public void SetOpen(EntityUid uid, bool opened = true, OpenableComponent? comp =
 
         comp.Opened = opened;
 
+        if (opened)
+        {
+            var ev = new OpenableOpenedEvent();
+            RaiseLocalEvent(uid, ref ev);
+        }
+        else
+        {
+            var ev = new OpenableClosedEvent();
+            RaiseLocalEvent(uid, ref ev);
+        }
+
         UpdateAppearance(uid, comp);
     }
 
@@ -139,4 +182,19 @@ public bool TryOpen(EntityUid uid, OpenableComponent? comp = null)
         _audio.PlayPvs(comp.Sound, uid);
         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)
+    {
+        if (!Resolve(uid, ref comp, false) || !comp.Opened || !comp.Closeable)
+            return false;
+
+        SetOpen(uid, false, comp);
+        if (comp.CloseSound != null)
+            _audio.PlayPvs(comp.CloseSound, uid);
+        return true;
+    }
 }
diff --git a/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs b/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs
index 01023046689..1954f2bdc10 100644
--- a/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs
+++ b/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs
@@ -53,7 +53,7 @@ public bool HasObjective(EntityUid mindId, string proto, MindComponent? mind = n
         if (!Resolve(mindId, ref mind))
             return false;
 
-        foreach (var objective in mind.AllObjectives)
+        foreach (var objective in mind.Objectives)
         {
             if (Prototype(objective)?.ID == proto)
                 return true;
diff --git a/Content.Server/PDA/Ringer/RingerSystem.cs b/Content.Server/PDA/Ringer/RingerSystem.cs
index f8aadac461d..885503713f8 100644
--- a/Content.Server/PDA/Ringer/RingerSystem.cs
+++ b/Content.Server/PDA/Ringer/RingerSystem.cs
@@ -13,7 +13,6 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using System.Linq;
 using Robust.Server.Audio;
 
 namespace Content.Server.PDA.Ringer
diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs
index 80cc8fa4aed..27c94313b21 100644
--- a/Content.Server/Paper/PaperSystem.cs
+++ b/Content.Server/Paper/PaperSystem.cs
@@ -160,6 +160,8 @@ private void OnInputTextMessage(EntityUid uid, PaperComponent paperComp, PaperIn
                 if (args.Session.AttachedEntity != null)
                     _adminLogger.Add(LogType.Chat, LogImpact.Low,
                         $"{ToPrettyString(args.Session.AttachedEntity.Value):player} has written on {ToPrettyString(uid):entity} the following text: {args.Text}");
+
+                _audio.PlayPvs(paperComp.Sound, uid);
             }
 
             paperComp.Mode = PaperAction.Read;
diff --git a/Content.Server/Parallax/BiomeSystem.cs b/Content.Server/Parallax/BiomeSystem.cs
index f4514ac2285..0b8c7a4d82d 100644
--- a/Content.Server/Parallax/BiomeSystem.cs
+++ b/Content.Server/Parallax/BiomeSystem.cs
@@ -83,17 +83,11 @@ public override void Initialize()
         SubscribeLocalEvent<BiomeComponent, MapInitEvent>(OnBiomeMapInit);
         SubscribeLocalEvent<FTLStartedEvent>(OnFTLStarted);
         SubscribeLocalEvent<ShuttleFlattenEvent>(OnShuttleFlatten);
-        _configManager.OnValueChanged(CVars.NetMaxUpdateRange, SetLoadRange, true);
+        Subs.CVar(_configManager, CVars.NetMaxUpdateRange, SetLoadRange, true);
         InitializeCommands();
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(ProtoReload);
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configManager.UnsubValueChanged(CVars.NetMaxUpdateRange, SetLoadRange);
-    }
-
     private void ProtoReload(PrototypesReloadedEventArgs obj)
     {
         if (!obj.ByType.TryGetValue(typeof(BiomeTemplatePrototype), out var reloads))
diff --git a/Content.Server/Pinpointer/PinpointerSystem.cs b/Content.Server/Pinpointer/PinpointerSystem.cs
index 63b39b388c6..be9a715d5d5 100644
--- a/Content.Server/Pinpointer/PinpointerSystem.cs
+++ b/Content.Server/Pinpointer/PinpointerSystem.cs
@@ -24,7 +24,7 @@ public override void Initialize()
         SubscribeLocalEvent<FTLCompletedEvent>(OnLocateTarget);
     }
 
-    public bool TogglePinpointer(EntityUid uid, PinpointerComponent? pinpointer = null)
+    public override bool TogglePinpointer(EntityUid uid, PinpointerComponent? pinpointer = null)
     {
         if (!Resolve(uid, ref pinpointer))
             return false;
@@ -128,26 +128,13 @@ public override void Update(float frameTime)
     }
 
     /// <summary>
-    ///     Set pinpointers target to track
+    ///     Update direction from pinpointer to selected target (if it was set)
     /// </summary>
-    public void SetTarget(EntityUid uid, EntityUid? target, PinpointerComponent? pinpointer = null)
+    protected override void UpdateDirectionToTarget(EntityUid uid, PinpointerComponent? pinpointer = null)
     {
         if (!Resolve(uid, ref pinpointer))
             return;
 
-        if (pinpointer.Target == target)
-            return;
-
-        pinpointer.Target = target;
-        if (pinpointer.IsActive)
-            UpdateDirectionToTarget(uid, pinpointer);
-    }
-
-    /// <summary>
-    ///     Update direction from pinpointer to selected target (if it was set)
-    /// </summary>
-    private void UpdateDirectionToTarget(EntityUid uid, PinpointerComponent pinpointer)
-    {
         if (!pinpointer.IsActive)
             return;
 
diff --git a/Content.Server/Power/Generation/Teg/TegSystem.cs b/Content.Server/Power/Generation/Teg/TegSystem.cs
index 54f40a1bf34..3510a3da45d 100644
--- a/Content.Server/Power/Generation/Teg/TegSystem.cs
+++ b/Content.Server/Power/Generation/Teg/TegSystem.cs
@@ -7,6 +7,7 @@
 using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.Power.Components;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Examine;
 using Content.Shared.Power.Generation.Teg;
 using Content.Shared.Rounding;
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.Cvar.cs b/Content.Server/Radiation/Systems/RadiationSystem.Cvar.cs
index ffe533f9a61..cd19367f380 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.Cvar.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.Cvar.cs
@@ -12,37 +12,9 @@ public partial class RadiationSystem
 
     private void SubscribeCvars()
     {
-        _cfg.OnValueChanged(CCVars.RadiationMinIntensity, SetMinRadiationIntensity, true);
-        _cfg.OnValueChanged(CCVars.RadiationGridcastUpdateRate, SetGridcastUpdateRate, true);
-        _cfg.OnValueChanged(CCVars.RadiationGridcastSimplifiedSameGrid, SetGridcastSimplifiedSameGrid, true);
-        _cfg.OnValueChanged(CCVars.RadiationGridcastMaxDistance, SetGridcastMaxDistance, true);
-    }
-
-    private void UnsubscribeCvars()
-    {
-        _cfg.UnsubValueChanged(CCVars.RadiationMinIntensity, SetMinRadiationIntensity);
-        _cfg.UnsubValueChanged(CCVars.RadiationGridcastUpdateRate, SetGridcastUpdateRate);
-        _cfg.UnsubValueChanged(CCVars.RadiationGridcastSimplifiedSameGrid, SetGridcastSimplifiedSameGrid);
-        _cfg.UnsubValueChanged(CCVars.RadiationGridcastMaxDistance, SetGridcastMaxDistance);
-    }
-
-    private void SetMinRadiationIntensity(float radiationMinIntensity)
-    {
-        MinIntensity = radiationMinIntensity;
-    }
-
-    private void SetGridcastUpdateRate(float updateRate)
-    {
-        GridcastUpdateRate = updateRate;
-    }
-
-    private void SetGridcastSimplifiedSameGrid(bool simplifiedSameGrid)
-    {
-        GridcastSimplifiedSameGrid = simplifiedSameGrid;
-    }
-
-    private void SetGridcastMaxDistance(float maxDistance)
-    {
-        GridcastMaxDistance = maxDistance;
+        Subs.CVar(_cfg, CCVars.RadiationMinIntensity, radiationMinIntensity => MinIntensity = radiationMinIntensity, true);
+        Subs.CVar(_cfg, CCVars.RadiationGridcastUpdateRate, updateRate => GridcastUpdateRate = updateRate, true);
+        Subs.CVar(_cfg, CCVars.RadiationGridcastSimplifiedSameGrid, simplifiedSameGrid => GridcastSimplifiedSameGrid = simplifiedSameGrid, true);
+        Subs.CVar(_cfg, CCVars.RadiationGridcastMaxDistance, maxDistance => GridcastMaxDistance = maxDistance, true);
     }
 }
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.cs b/Content.Server/Radiation/Systems/RadiationSystem.cs
index ffb7ab1a11f..e184c022f2f 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.cs
@@ -21,12 +21,6 @@ public override void Initialize()
         InitRadBlocking();
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        UnsubscribeCvars();
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
diff --git a/Content.Server/RandomAppearance/RandomAppearanceComponent.cs b/Content.Server/RandomAppearance/RandomAppearanceComponent.cs
index 8560eebb57f..4631abc13ce 100644
--- a/Content.Server/RandomAppearance/RandomAppearanceComponent.cs
+++ b/Content.Server/RandomAppearance/RandomAppearanceComponent.cs
@@ -1,11 +1,10 @@
-using Robust.Shared.Reflection;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 namespace Content.Server.RandomAppearance;
 
 [RegisterComponent]
 [Access(typeof(RandomAppearanceSystem))]
-public sealed partial class RandomAppearanceComponent : Component, ISerializationHooks
+public sealed partial class RandomAppearanceComponent : Component
 {
     [DataField("spriteStates")]
     public string[] SpriteStates = { "0", "1", "2", "3", "4" };
@@ -13,23 +12,6 @@ public sealed partial class RandomAppearanceComponent : Component, ISerializatio
     /// <summary>
     ///     What appearance enum key should be set to the random sprite state?
     /// </summary>
-    [DataField("key", required: true)]
-    public string EnumKeyRaw = default!;
-
-    /// <summary>
-    ///     The actual enum after reflection.
-    /// </summary>
+    [DataField(required: true, customTypeSerializer: typeof(EnumSerializer))]
     public Enum? EnumKey;
-
-    void ISerializationHooks.AfterDeserialization()
-    {
-        if (IoCManager.Resolve<IReflectionManager>().TryParseEnumReference(EnumKeyRaw, out var @enum))
-        {
-            EnumKey = @enum;
-        }
-        else
-        {
-            Logger.Error($"RandomAppearance enum key {EnumKeyRaw} could not be parsed!");
-        }
-    }
 }
diff --git a/Content.Server/Remotes/DoorRemoteSystem.cs b/Content.Server/Remotes/DoorRemoteSystem.cs
index c63b2295c16..a88508ce53d 100644
--- a/Content.Server/Remotes/DoorRemoteSystem.cs
+++ b/Content.Server/Remotes/DoorRemoteSystem.cs
@@ -10,6 +10,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Examine;
 using static Content.Server.Remotes.DoorRemoteComponent;
 
 namespace Content.Server.Remotes
@@ -65,10 +66,9 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
             if (args.Handled
                 || args.Target == null
                 || !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
-                // The remote can be used anywhere the user can see the door.
-                // This doesn't work that well, but I don't know of an alternative
-                || !_interactionSystem.InRangeUnobstructed(args.User, args.Target.Value,
-                    SharedInteractionSystem.MaxRaycastRange, CollisionGroup.Opaque))
+                // Only able to control doors if they are within your vision and within your max range.
+                // Not affected by mobs or machines anymore.
+                || !ExamineSystemShared.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
             {
                 return;
             }
diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs
index 10d4bea8b54..3a8331f3f7a 100644
--- a/Content.Server/RoundEnd/RoundEndSystem.cs
+++ b/Content.Server/RoundEnd/RoundEndSystem.cs
@@ -14,6 +14,7 @@
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.GameTicking;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index f0d4661a070..1eb1cc3027f 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -40,7 +40,7 @@ private void InitializeExpeditions()
         SubscribeLocalEvent<SalvageStructureComponent, ExaminedEvent>(OnStructureExamine);
 
         _cooldown = _configurationManager.GetCVar(CCVars.SalvageExpeditionCooldown);
-        _configurationManager.OnValueChanged(CCVars.SalvageExpeditionCooldown, SetCooldownChange);
+        Subs.CVar(_configurationManager, CCVars.SalvageExpeditionCooldown, SetCooldownChange);
     }
 
     private void OnExpeditionGetState(EntityUid uid, SalvageExpeditionComponent component, ref ComponentGetState args)
@@ -51,11 +51,6 @@ private void OnExpeditionGetState(EntityUid uid, SalvageExpeditionComponent comp
         };
     }
 
-    private void ShutdownExpeditions()
-    {
-        _configurationManager.UnsubValueChanged(CCVars.SalvageExpeditionCooldown, SetCooldownChange);
-    }
-
     private void SetCooldownChange(float obj)
     {
         // Update the active cooldowns if we change it.
diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs
index 545a385bff8..a1a3b686b2f 100644
--- a/Content.Server/Salvage/SalvageSystem.cs
+++ b/Content.Server/Salvage/SalvageSystem.cs
@@ -73,12 +73,6 @@ public override void Initialize()
             InitializeRunner();
         }
 
-        public override void Shutdown()
-        {
-            base.Shutdown();
-            ShutdownExpeditions();
-        }
-
         private void Report(EntityUid source, string channelName, string messageKey, params (string, object)[] args)
         {
             var message = args.Length == 0 ? Loc.GetString(messageKey) : Loc.GetString(messageKey, args);
diff --git a/Content.Server/SensorMonitoring/BatterySensorSystem.cs b/Content.Server/SensorMonitoring/BatterySensorSystem.cs
index 20e990b14c3..eb2ab21075c 100644
--- a/Content.Server/SensorMonitoring/BatterySensorSystem.cs
+++ b/Content.Server/SensorMonitoring/BatterySensorSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Power.Components;
+using Content.Shared.DeviceNetwork;
 
 namespace Content.Server.SensorMonitoring;
 
diff --git a/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs b/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs
index fdd340ba0ae..ddd7812394e 100644
--- a/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs
+++ b/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs
@@ -10,13 +10,13 @@
 using Content.Shared.Atmos.Monitor;
 using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.SensorMonitoring;
 using Robust.Server.GameObjects;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using ConsoleUIState = Content.Shared.SensorMonitoring.SensorMonitoringConsoleBoundInterfaceState;
 
 namespace Content.Server.SensorMonitoring;
 
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index 6503e4bf517..7d63b835881 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -16,6 +16,7 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Parallax.Biomes;
@@ -97,7 +98,7 @@ public override void Initialize()
 
         // Don't invoke immediately as it will get set in the natural course of things.
         Enabled = _cfgManager.GetCVar(CCVars.ArrivalsShuttles);
-        _cfgManager.OnValueChanged(CCVars.ArrivalsShuttles, SetArrivals);
+        Subs.CVar(_cfgManager, CCVars.ArrivalsShuttles, SetArrivals);
 
         // Command so admins can set these for funsies
         _console.RegisterCommand("arrivals", ArrivalsCommand, ArrivalsCompletion);
@@ -181,12 +182,6 @@ private void ArrivalsCommand(IConsoleShell shell, string argstr, string[] args)
         }
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _cfgManager.UnsubValueChanged(CCVars.ArrivalsShuttles, SetArrivals);
-    }
-
     /// <summary>
     ///     First sends shuttle timer data, then kicks people off the shuttle if it isn't leaving the arrivals terminal
     /// </summary>
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
index 37c70c4e486..f8e6f2423f9 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Access;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Popups;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Events;
@@ -84,9 +85,9 @@ public sealed partial class EmergencyShuttleSystem
 
     private void InitializeEmergencyConsole()
     {
-        _configManager.OnValueChanged(CCVars.EmergencyShuttleMinTransitTime, SetMinTransitTime, true);
-        _configManager.OnValueChanged(CCVars.EmergencyShuttleMaxTransitTime, SetMaxTransitTime, true);
-        _configManager.OnValueChanged(CCVars.EmergencyShuttleAuthorizeTime, SetAuthorizeTime, true);
+        Subs.CVar(_configManager, CCVars.EmergencyShuttleMinTransitTime, SetMinTransitTime, true);
+        Subs.CVar(_configManager, CCVars.EmergencyShuttleMaxTransitTime, SetMaxTransitTime, true);
+        Subs.CVar(_configManager, CCVars.EmergencyShuttleAuthorizeTime, SetAuthorizeTime, true);
         SubscribeLocalEvent<EmergencyShuttleConsoleComponent, ComponentStartup>(OnEmergencyStartup);
         SubscribeLocalEvent<EmergencyShuttleConsoleComponent, EmergencyShuttleAuthorizeMessage>(OnEmergencyAuthorize);
         SubscribeLocalEvent<EmergencyShuttleConsoleComponent, EmergencyShuttleRepealMessage>(OnEmergencyRepeal);
@@ -122,13 +123,6 @@ private void SetMaxTransitTime(float obj)
         MaximumTransitTime = Math.Max(MinimumTransitTime, obj);
     }
 
-    private void ShutdownEmergencyConsole()
-    {
-        _configManager.UnsubValueChanged(CCVars.EmergencyShuttleAuthorizeTime, SetAuthorizeTime);
-        _configManager.UnsubValueChanged(CCVars.EmergencyShuttleMinTransitTime, SetMinTransitTime);
-        _configManager.UnsubValueChanged(CCVars.EmergencyShuttleMaxTransitTime, SetMaxTransitTime);
-    }
-
     private void OnEmergencyStartup(EntityUid uid, EmergencyShuttleConsoleComponent component, ComponentStartup args)
     {
         UpdateConsoleState(uid, component);
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index d984c727376..66214b0577e 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -5,7 +5,6 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Systems;
 using Content.Server.Communications;
-using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.GameTicking.Events;
@@ -19,6 +18,7 @@
 using Content.Shared.Access.Systems;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Events;
 using Content.Shared.Tag;
@@ -77,7 +77,7 @@ public override void Initialize()
         _sawmill = Logger.GetSawmill("shuttle.emergency");
         _emergencyShuttleEnabled = _configManager.GetCVar(CCVars.EmergencyShuttleEnabled);
         // Don't immediately invoke as roundstart will just handle it.
-        _configManager.OnValueChanged(CCVars.EmergencyShuttleEnabled, SetEmergencyShuttleEnabled);
+        Subs.CVar(_configManager, CCVars.EmergencyShuttleEnabled, SetEmergencyShuttleEnabled);
 
         SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
         SubscribeLocalEvent<StationEmergencyShuttleComponent, ComponentStartup>(OnStationStartup);
@@ -152,12 +152,6 @@ public override void Update(float frameTime)
         UpdateEmergencyConsole(frameTime);
     }
 
-    public override void Shutdown()
-    {
-        _configManager.UnsubValueChanged(CCVars.EmergencyShuttleEnabled, SetEmergencyShuttleEnabled);
-        ShutdownEmergencyConsole();
-    }
-
     /// <summary>
     ///     If the client is requesting debug info on where an emergency shuttle would dock.
     /// </summary>
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
index 5958bf0ebdd..444a3514f8b 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
@@ -18,12 +18,7 @@ private void InitializeGridFills()
 
         SubscribeLocalEvent<GridFillComponent, MapInitEvent>(OnGridFillMapInit);
 
-        _cfg.OnValueChanged(CCVars.GridFill, OnGridFillChange);
-    }
-
-    private void ShutdownGridFills()
-    {
-        _cfg.UnsubValueChanged(CCVars.GridFill, OnGridFillChange);
+        Subs.CVar(_cfg, CCVars.GridFill, OnGridFillChange);
     }
 
     private void OnGridFillChange(bool obj)
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 3e941e67b40..ef24a4de2ad 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -69,13 +69,6 @@ public override void Initialize()
         SubscribeLocalEvent<FixturesComponent, GridFixtureChangeEvent>(OnGridFixtureChange);
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        ShutdownGridFills();
-    }
-
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index a89a101845c..cc57c34c475 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Silicons.Borgs.Components;
diff --git a/Content.Server/Species/Systems/NymphSystem.cs b/Content.Server/Species/Systems/NymphSystem.cs
new file mode 100644
index 00000000000..8d0646ae8e4
--- /dev/null
+++ b/Content.Server/Species/Systems/NymphSystem.cs
@@ -0,0 +1,41 @@
+using Content.Server.Mind;
+using Content.Shared.Species.Components;
+using Content.Shared.Body.Events;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Species.Systems;
+
+public sealed partial class NymphSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _protoManager= default!;
+    [Dependency] private readonly MindSystem _mindSystem = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<NymphComponent, RemovedFromPartInBodyEvent>(OnRemovedFromPart);
+    }
+
+    private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, RemovedFromPartInBodyEvent args)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.OldBody))
+            return;
+
+        if (!_protoManager.TryIndex<EntityPrototype>(comp.EntityPrototype, out var entityProto))
+            return;
+
+        var coords = Transform(uid).Coordinates;
+        var nymph = EntityManager.SpawnAtPosition(entityProto.ID, coords);
+
+        if (comp.TransferMind == true && _mindSystem.TryGetMind(args.OldBody, out var mindId, out var mind))
+            _mindSystem.TransferTo(mindId, nymph, mind: mind);
+
+        QueueDel(uid);
+    }
+}
diff --git a/Content.Server/Speech/Components/FrenchAccentComponent.cs b/Content.Server/Speech/Components/FrenchAccentComponent.cs
new file mode 100644
index 00000000000..f696c35ea03
--- /dev/null
+++ b/Content.Server/Speech/Components/FrenchAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Server.Speech.EntitySystems;
+
+namespace Content.Server.Speech.Components;
+
+/// <summary>
+/// French accent replaces spoken letters. "th" becomes "z" and "H" at the start of a word becomes "'".
+/// </summary>
+[RegisterComponent]
+[Access(typeof(FrenchAccentSystem))]
+public sealed partial class FrenchAccentComponent : Component
+{ }
diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
new file mode 100644
index 00000000000..56372887325
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
@@ -0,0 +1,45 @@
+using Content.Server.Speech.Components;
+using System.Text.RegularExpressions;
+
+namespace Content.Server.Speech.EntitySystems;
+
+/// <summary>
+/// System that gives the speaker a faux-French accent.
+/// </summary>
+public sealed class FrenchAccentSystem : EntitySystem
+{
+    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FrenchAccentComponent, AccentGetEvent>(OnAccentGet);
+    }
+
+    public string Accentuate(string message, FrenchAccentComponent component)
+    {
+        var msg = message;
+
+        msg = _replacement.ApplyReplacements(msg, "french");
+
+        // replaces th with dz 
+        msg = Regex.Replace(msg, @"th", "'z", RegexOptions.IgnoreCase);
+
+        // removes the letter h from the start of words.
+        msg = Regex.Replace(msg, @"(?<!\w)[h]", "'", RegexOptions.IgnoreCase);
+
+        // spaces out ! ? : and ;.
+        msg = Regex.Replace(msg, @"(?<=\w\w)!(?!\w)", " !", RegexOptions.IgnoreCase);
+        msg = Regex.Replace(msg, @"(?<=\w\w)[?](?!\w)", " ?", RegexOptions.IgnoreCase);
+        msg = Regex.Replace(msg, @"(?<=\w\w)[;](?!\w)", " ;", RegexOptions.IgnoreCase);
+        msg = Regex.Replace(msg, @"(?<=\w\w)[:](?!\w)", " :", RegexOptions.IgnoreCase);
+
+        return msg;
+    }
+
+    private void OnAccentGet(EntityUid uid, FrenchAccentComponent component, AccentGetEvent args)
+    {
+        args.Message = Accentuate(args.Message, component);
+    }
+}
diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs
index 7bfc496deae..a3b7a573545 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.cs
@@ -35,7 +35,7 @@ public override void Initialize()
         SubscribeLocalEvent<StationJobsComponent, StationRenamedEvent>(OnStationRenamed);
         SubscribeLocalEvent<StationJobsComponent, ComponentShutdown>(OnStationDeletion);
         SubscribeLocalEvent<PlayerJoinedLobbyEvent>(OnPlayerJoinedLobby);
-        _configurationManager.OnValueChanged(CCVars.GameDisallowLateJoins, _ => UpdateJobsAvailable(), true);
+        Subs.CVar(_configurationManager, CCVars.GameDisallowLateJoins, _ => UpdateJobsAvailable(), true);
     }
 
     public override void Update(float _)
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 2e684e23a1f..b7b7192f40e 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -57,7 +57,7 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        _configurationManager.OnValueChanged(CCVars.ICRandomCharacters, e => _randomizeCharacters = e, true);
+        Subs.CVar(_configurationManager, CCVars.ICRandomCharacters, e => _randomizeCharacters = e, true);
 
         _spawnerCallbacks = new Dictionary<SpawnPriorityPreference, Action<PlayerSpawningEvent>>()
         {
diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs
index be3fc57967b..4647392665b 100644
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -57,9 +57,9 @@ public override void Initialize()
         SubscribeLocalEvent<StationMemberComponent, ComponentShutdown>(OnStationGridDeleted);
         SubscribeLocalEvent<StationMemberComponent, PostGridSplitEvent>(OnStationSplitEvent);
 
-        _configurationManager.OnValueChanged(CCVars.StationOffset, x => _randomStationOffset = x, true);
-        _configurationManager.OnValueChanged(CCVars.MaxStationOffset, x => _maxRandomStationOffset = x, true);
-        _configurationManager.OnValueChanged(CCVars.StationRotation, x => _randomStationRotation = x, true);
+        Subs.CVar(_configurationManager, CCVars.StationOffset, x => _randomStationOffset = x, true);
+        Subs.CVar(_configurationManager, CCVars.MaxStationOffset, x => _maxRandomStationOffset = x, true);
+        Subs.CVar(_configurationManager, CCVars.StationRotation, x => _randomStationRotation = x, true);
 
         _player.PlayerStatusChanged += OnPlayerStatusChanged;
     }
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index c4b21f3aa8e..f62aed4f0f4 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -30,7 +30,7 @@ public override void Initialize()
 
         _sawmill = Logger.GetSawmill("events");
 
-        _configurationManager.OnValueChanged(CCVars.EventsEnabled, SetEnabled, true);
+        Subs.CVar(_configurationManager, CCVars.EventsEnabled, SetEnabled, true);
 
         SubscribeLocalEvent<StationEventComponent, EntityUnpausedEvent>(OnUnpaused);
     }
@@ -42,12 +42,6 @@ private void OnUnpaused(EntityUid uid, StationEventComponent component, ref Enti
             component.EndTime = component.EndTime.Value + args.PausedTime;
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configurationManager.UnsubValueChanged(CCVars.EventsEnabled, SetEnabled);
-    }
-
     /// <summary>
     /// Randomly runs a valid event.
     /// </summary>
diff --git a/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs b/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs
index 7c58bcccca7..9b65daf461a 100644
--- a/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs
+++ b/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs
@@ -2,11 +2,7 @@
 using Content.Server.Storage.Components;
 using Content.Shared.Audio;
 using Content.Shared.Storage.Components;
-using Robust.Shared.Audio;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
-using System.Linq;
-using Content.Shared.Storage.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 
diff --git a/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs b/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs
index 3a3df725c45..1df4fce177f 100644
--- a/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs
+++ b/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs
@@ -1,9 +1,7 @@
-using Content.Server.Humanoid;
 using Content.Shared.Humanoid;
 using Content.Shared.Store;
 using Content.Shared.Humanoid.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
-using Content.Shared.Humanoid;
 
 namespace Content.Server.Store.Conditions;
 
diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index 89eb202b25e..50a9cb9b691 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -238,7 +238,8 @@ bool Check()
                 _popup.PopupEntity(message, target, target, PopupType.Large);
             }
 
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):user} is trying to place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
+            var prefix = ev.Stealth ? "stealthily " : "";
+            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
 
             var result = await _doAfter.WaitDoAfter(doAfterArgs);
             if (result != DoAfterStatus.Finished)
@@ -250,7 +251,7 @@ bool Check()
             {
                 _inventorySystem.TryEquip(user, target, held, slot);
 
-                _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
+                _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
             }
         }
 
@@ -305,14 +306,15 @@ bool Check()
                 DuplicateCondition = DuplicateConditions.SameTool
             };
 
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):user} is trying to place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
+            var prefix = ev.Stealth ? "stealthily " : "";
+                _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
 
             var result = await _doAfter.WaitDoAfter(doAfterArgs);
             if (result != DoAfterStatus.Finished) return;
 
             _handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: userHands);
             _handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: hands);
-            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
             // hand update will trigger strippable update
         }
 
@@ -381,7 +383,8 @@ bool Check()
                 }
             }
 
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):user} is trying to strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}");
+            var prefix = ev.Stealth ? "stealthily " : "";
+            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
 
             var result = await _doAfter.WaitDoAfter(doAfterArgs);
             if (result != DoAfterStatus.Finished)
@@ -394,7 +397,7 @@ bool Check()
             RaiseLocalEvent(item, new DroppedEvent(user), true);
 
             _handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth);
-            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}");
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
 
         }
 
@@ -453,8 +456,9 @@ bool Check()
                     strippable.Owner);
             }
 
+            var prefix = ev.Stealth ? "stealthily " : "";
             _adminLogger.Add(LogType.Stripping, LogImpact.Low,
-                $"{ToPrettyString(user):user} is trying to strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}");
+                $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
 
             var result = await _doAfter.WaitDoAfter(doAfterArgs);
             if (result != DoAfterStatus.Finished)
@@ -464,7 +468,7 @@ bool Check()
             _handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: userHands);
             // hand update will trigger strippable update
             _adminLogger.Add(LogType.Stripping, LogImpact.Medium,
-                $"{ToPrettyString(user):user} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}");
+                $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
         }
     }
 }
diff --git a/Content.Server/Stunnable/Systems/StunbatonSystem.cs b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
index 027259495c1..5f019490b5c 100644
--- a/Content.Server/Stunnable/Systems/StunbatonSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
@@ -48,6 +48,12 @@ private void OnExamined(Entity<StunbatonComponent> entity, ref ExaminedEvent arg
             ? Loc.GetString("comp-stunbaton-examined-on")
             : Loc.GetString("comp-stunbaton-examined-off");
             args.PushMarkup(onMsg);
+
+            if (TryComp<BatteryComponent>(entity.Owner, out var battery))
+            {
+                var count = (int) (battery.CurrentCharge / entity.Comp.EnergyPerUse);
+                args.PushMarkup(Loc.GetString("melee-battery-examine", ("color", "yellow"), ("count", count)));
+            }
         }
 
         private void ToggleDone(Entity<StunbatonComponent> entity, ref ItemToggledEvent args)
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
index cbc2f6d31ec..f258fbe89cf 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Power.Components;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.UserInterface;
 using Content.Shared.SurveillanceCamera;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index 9f7057d9b61..aef4b89d509 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -293,7 +293,10 @@ private void ChangeDamage(EntityUid uid, TemperatureComponent temperature)
     private void OnTemperatureChangeAttempt(EntityUid uid, TemperatureProtectionComponent component,
         InventoryRelayedEvent<ModifyChangedTemperatureEvent> args)
     {
-        args.Args.TemperatureDelta *= component.Coefficient;
+        var ev = new GetTemperatureProtectionEvent(component.Coefficient);
+        RaiseLocalEvent(uid, ref ev);
+
+        args.Args.TemperatureDelta *= ev.Coefficient;
     }
 
     private void OnParentChange(EntityUid uid, TemperatureComponent component,
diff --git a/Content.Server/Tips/TipsSystem.cs b/Content.Server/Tips/TipsSystem.cs
index 1c342fcadf8..cc45a3a1d5e 100644
--- a/Content.Server/Tips/TipsSystem.cs
+++ b/Content.Server/Tips/TipsSystem.cs
@@ -36,10 +36,10 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<GameRunLevelChangedEvent>(OnGameRunLevelChanged);
-        _cfg.OnValueChanged(CCVars.TipFrequencyOutOfRound, SetOutOfRound, true);
-        _cfg.OnValueChanged(CCVars.TipFrequencyInRound, SetInRound, true);
-        _cfg.OnValueChanged(CCVars.TipsEnabled, SetEnabled, true);
-        _cfg.OnValueChanged(CCVars.TipsDataset, SetDataset, true);
+        Subs.CVar(_cfg, CCVars.TipFrequencyOutOfRound, SetOutOfRound, true);
+        Subs.CVar(_cfg, CCVars.TipFrequencyInRound, SetInRound, true);
+        Subs.CVar(_cfg, CCVars.TipsEnabled, SetEnabled, true);
+        Subs.CVar(_cfg, CCVars.TipsDataset, SetDataset, true);
 
         RecalculateNextTipTime();
     }
diff --git a/Content.Server/UserInterface/ActivatableUIComponent.cs b/Content.Server/UserInterface/ActivatableUIComponent.cs
index 34f9c0f3970..54639dd2b05 100644
--- a/Content.Server/UserInterface/ActivatableUIComponent.cs
+++ b/Content.Server/UserInterface/ActivatableUIComponent.cs
@@ -1,14 +1,12 @@
 using Robust.Shared.Player;
-using Robust.Shared.Reflection;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 namespace Content.Server.UserInterface
 {
     [RegisterComponent]
-    public sealed partial class ActivatableUIComponent : Component,
-            ISerializationHooks
+    public sealed partial class ActivatableUIComponent : Component
     {
-        [ViewVariables]
+        [DataField(required: true, customTypeSerializer:typeof(EnumSerializer))]
         public Enum? Key { get; set; }
 
         [ViewVariables(VVAccess.ReadWrite)]
@@ -22,9 +20,6 @@ public sealed partial class ActivatableUIComponent : Component,
         [DataField]
         public bool AdminOnly { get; set; } = false;
 
-        [DataField("key", required: true)]
-        private string _keyRaw = default!;
-
         [DataField]
         public LocId VerbText = "ui-verb-toggle-open";
 
@@ -66,13 +61,6 @@ public sealed partial class ActivatableUIComponent : Component,
         /// </summary>
         [ViewVariables]
         public ICommonSession? CurrentSingleUser;
-
-        void ISerializationHooks.AfterDeserialization()
-        {
-            var reflectionManager = IoCManager.Resolve<IReflectionManager>();
-            if (reflectionManager.TryParseEnumReference(_keyRaw, out var key))
-                Key = key;
-        }
     }
 }
 
diff --git a/Content.Server/Wagging/WaggingSystem.cs b/Content.Server/Wagging/WaggingSystem.cs
index 5d4163fa65f..7ccc19e20c6 100644
--- a/Content.Server/Wagging/WaggingSystem.cs
+++ b/Content.Server/Wagging/WaggingSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Actions;
-using Content.Server.Chat.Systems;
 using Content.Server.Humanoid;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
@@ -16,7 +15,6 @@ namespace Content.Server.Wagging;
 public sealed class WaggingSystem : EntitySystem
 {
     [Dependency] private readonly ActionsSystem _actions = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearance = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
 
@@ -50,9 +48,6 @@ private void OnWaggingToggle(EntityUid uid, WaggingComponent component, ref Togg
 
     private void OnMobStateChanged(EntityUid uid, WaggingComponent component, MobStateChangedEvent args)
     {
-        if (args.NewMobState != MobState.Dead)
-            return;
-
         if (component.Wagging)
             TryToggleWagging(uid, wagging: component);
     }
@@ -102,9 +97,6 @@ public bool TryToggleWagging(EntityUid uid, WaggingComponent? wagging = null, Hu
                 humanoid: humanoid);
         }
 
-        var emoteText = Loc.GetString(wagging.Wagging ? "wagging-emote-start" : "wagging-emote-stop", ("ent", uid));
-        _chat.TrySendInGameICMessage(uid, emoteText, InGameICChatType.Emote, ChatTransmitRange.Normal); // Ok while emotes dont have radial menu
-
         return true;
     }
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 756a4c90656..b8f8f122111 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -87,8 +87,6 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                     Audio.PlayPvs(clumsy.ClumsySound, gunUid);
 
                     PopupSystem.PopupEntity(Loc.GetString("gun-clumsy"), user.Value);
-                    _adminLogger.Add(LogType.EntityDelete, LogImpact.Medium, $"Clumsy fire by {ToPrettyString(user.Value)} deleted {ToPrettyString(gunUid)}");
-                    Del(gunUid);
                     userImpulse = false;
                     return;
                 }
diff --git a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
index 70db152b4e2..d3eeeb6037a 100644
--- a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
+++ b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
@@ -34,8 +34,8 @@ public override void Initialize()
     {
         SubscribeLocalEvent<RoundStartingEvent>(OnLoadingMaps);
         _conHost.RegisterCommand("applyworldgenconfig", Loc.GetString("cmd-applyworldgenconfig-description"), Loc.GetString("cmd-applyworldgenconfig-help"), ApplyWorldgenConfigCommand);
-        _cfg.OnValueChanged(CCVars.WorldgenEnabled, b => _enabled = b, true);
-        _cfg.OnValueChanged(CCVars.WorldgenConfig, s => _worldgenConfig = s, true);
+        Subs.CVar(_cfg, CCVars.WorldgenEnabled, b => _enabled = b, true);
+        Subs.CVar(_cfg, CCVars.WorldgenConfig, s => _worldgenConfig = s, true);
     }
 
     [AdminCommand(AdminFlags.Mapping)]
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index 09fdc260d7c..6606f284327 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
@@ -106,7 +106,7 @@ public void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageCompone
             if (!TryComp<BodyComponent>(contained, out var body))
                 Del(contained);
 
-            var gibs = _body.GibBody(contained, body: body, gibOrgans: true, deleteBrain: true);
+            var gibs = _body.GibBody(contained, body: body, gibOrgans: true);
             foreach (var gib in gibs)
             {
                 ContainerSystem.Insert((gib, null, null, null), crusher.OutputContainer);
diff --git a/Content.Shared/Access/Systems/SharedAccessSystem.cs b/Content.Shared/Access/Systems/SharedAccessSystem.cs
index eaacaf277b3..965ccb24128 100644
--- a/Content.Shared/Access/Systems/SharedAccessSystem.cs
+++ b/Content.Shared/Access/Systems/SharedAccessSystem.cs
@@ -27,7 +27,7 @@ private void OnAccessInit(EntityUid uid, AccessComponent component, MapInitEvent
                     continue;
 
                 component.Tags.UnionWith(proto.Tags);
-                Dirty(component);
+                Dirty(uid, component);
             }
         }
 
@@ -58,7 +58,7 @@ public bool TrySetTags(EntityUid uid, IEnumerable<string> newTags, AccessCompone
 
             access.Tags.Clear();
             access.Tags.UnionWith(newTags);
-            Dirty(access);
+            Dirty(uid, access);
 
             return true;
         }
@@ -85,7 +85,7 @@ public bool TryAddGroups(EntityUid uid, IEnumerable<string> newGroups, AccessCom
                 access.Tags.UnionWith(proto.Tags);
             }
 
-            Dirty(access);
+            Dirty(uid, access);
             return true;
         }
 
@@ -107,7 +107,7 @@ public void SetAccessToJob(
 
             access.Tags.Clear();
             access.Tags.UnionWith(prototype.Access);
-            Dirty(access);
+            Dirty(uid, access);
 
             TryAddGroups(uid, prototype.AccessGroups, access);
 
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 4eaa641eeb7..90508bff9d7 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -30,7 +30,6 @@ public abstract class SharedActionsSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
-    [Dependency] private readonly MetaDataSystem _metaData = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs
index c33a6be86f3..64cf522faaf 100644
--- a/Content.Shared/Administration/AdminFlags.cs
+++ b/Content.Shared/Administration/AdminFlags.cs
@@ -89,10 +89,16 @@ public enum AdminFlags : uint
         /// </summary>
         EditNotes = 1 << 14,
 
+
+        /// <summary>
+        ///     Lets you Massban, on SS14.Admin
+        /// </summary>
+        MassBan = 1 << 15,
+
         /// <summary>
         ///     DeltaV - The ability to whitelist people. Either this permission or +BAN is required for remove.
         /// </summary>
-        Whitelist = 1 << 15,
+        Whitelist = 1 << 20,
 
         /// <summary>
         ///     Dangerous host permissions like scsi.
diff --git a/Content.Shared/Alert/AlertPrototype.cs b/Content.Shared/Alert/AlertPrototype.cs
index c24ac8582b0..ac43cb45f3b 100644
--- a/Content.Shared/Alert/AlertPrototype.cs
+++ b/Content.Shared/Alert/AlertPrototype.cs
@@ -1,5 +1,4 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Alert
@@ -8,7 +7,7 @@ namespace Content.Shared.Alert
     /// An alert popup with associated icon, tooltip, and other data.
     /// </summary>
     [Prototype("alert")]
-    public sealed partial class AlertPrototype : IPrototype, ISerializationHooks
+    public sealed partial class AlertPrototype : IPrototype
     {
         [ViewVariables]
         string IPrototype.ID => AlertType.ToString();
@@ -52,7 +51,7 @@ public sealed partial class AlertPrototype : IPrototype, ISerializationHooks
         /// Key which is unique w.r.t category semantics (alerts with same category have equal keys,
         /// alerts with no category have different keys).
         /// </summary>
-        public AlertKey AlertKey { get; private set; }
+        public AlertKey AlertKey => new(AlertType, Category);
 
         /// <summary>
         /// -1 (no effect) unless MaxSeverity is specified. Defaults to 1. Minimum severity level supported by this state.
@@ -80,16 +79,6 @@ public sealed partial class AlertPrototype : IPrototype, ISerializationHooks
         [DataField("onClick", serverOnly: true)]
         public IAlertClick? OnClick { get; private set; }
 
-        void ISerializationHooks.AfterDeserialization()
-        {
-            if (AlertType == AlertType.Error)
-            {
-                Logger.ErrorS("alert", "missing or invalid alertType for alert with name {0}", Name);
-            }
-
-            AlertKey = new AlertKey(AlertType, Category);
-        }
-
         /// <param name="severity">severity level, if supported by this alert</param>
         /// <returns>the icon path to the texture for the provided severity level</returns>
         public SpriteSpecifier GetIcon(short? severity = null)
diff --git a/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs b/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
index eca71e6fd73..f4b7cc8bf4f 100644
--- a/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
+++ b/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
@@ -5,16 +5,17 @@
 using Content.Shared.Throwing;
 using Robust.Shared.Map;
 using Content.Shared.Physics;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 
 namespace Content.Shared.Anomaly.Effects;
 
 public abstract class SharedGravityAnomalySystem : EntitySystem
 {
-    [Dependency] private readonly IMapManager _map = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -47,13 +48,18 @@ private void OnAnomalyPulse(EntityUid uid, GravityAnomalyComponent component, re
     private void OnSupercritical(EntityUid uid, GravityAnomalyComponent component, ref AnomalySupercriticalEvent args)
     {
         var xform = Transform(uid);
-        if (!_map.TryGetGrid(xform.GridUid, out var grid))
+        if (!TryComp(xform.GridUid, out MapGridComponent? grid))
             return;
 
         var worldPos = _xform.GetWorldPosition(xform);
-        var tileref = grid.GetTilesIntersecting(new Circle(worldPos, component.SpaceRange)).ToArray();
+        var tileref = _mapSystem.GetTilesIntersecting(
+                xform.GridUid.Value,
+                grid,
+                new Circle(worldPos, component.SpaceRange))
+            .ToArray();
+
         var tiles = tileref.Select(t => (t.GridIndices, Tile.Empty)).ToList();
-        grid.SetTiles(tiles);
+        _mapSystem.SetTiles(xform.GridUid.Value, grid, tiles);
 
         var range = component.MaxThrowRange * 2;
         var strength = component.MaxThrowStrength * 2;
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index 711f9d1493c..6eba4221b49 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -27,7 +27,7 @@ public abstract class SharedAnomalySystem : EntitySystem
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] protected readonly IRobustRandom Random = default!;
-    [Dependency] protected readonly ISharedAdminLogManager Log = default!;
+    [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
@@ -92,7 +92,7 @@ public void DoAnomalyBurnDamage(EntityUid source, EntityUid target, AnomalyCompo
     private void OnAnomalyUnpause(EntityUid uid, AnomalyComponent component, ref EntityUnpausedEvent args)
     {
         component.NextPulseTime += args.PausedTime;
-        Dirty(component);
+        Dirty(uid, component);
     }
 
     private void OnPulsingUnpause(EntityUid uid, AnomalyPulsingComponent component, ref EntityUnpausedEvent args)
@@ -103,7 +103,7 @@ private void OnPulsingUnpause(EntityUid uid, AnomalyPulsingComponent component,
     private void OnSupercriticalUnpause(EntityUid uid, AnomalySupercriticalComponent component, ref EntityUnpausedEvent args)
     {
         component.EndTime += args.PausedTime;
-        Dirty(component);
+        Dirty(uid, component);
     }
 
     public void DoAnomalyPulse(EntityUid uid, AnomalyComponent? component = null)
@@ -132,7 +132,7 @@ public void DoAnomalyPulse(EntityUid uid, AnomalyComponent? component = null)
         var stability = Random.NextFloat(minStability, maxStability);
         ChangeAnomalyStability(uid, stability, component);
 
-        Log.Add(LogType.Anomaly, LogImpact.Medium, $"Anomaly {ToPrettyString(uid)} pulsed with severity {component.Severity}.");
+        AdminLog.Add(LogType.Anomaly, LogImpact.Medium, $"Anomaly {ToPrettyString(uid)} pulsed with severity {component.Severity}.");
         if (_net.IsServer)
             Audio.PlayPvs(component.PulseSound, uid);
 
@@ -154,14 +154,14 @@ public void StartSupercriticalEvent(EntityUid uid)
         if (HasComp<AnomalySupercriticalComponent>(uid))
             return;
 
-        Log.Add(LogType.Anomaly, LogImpact.High, $"Anomaly {ToPrettyString(uid)} began to go supercritical.");
+        AdminLog.Add(LogType.Anomaly, LogImpact.High, $"Anomaly {ToPrettyString(uid)} began to go supercritical.");
         if (_net.IsServer)
             _sawmill.Info($"Anomaly is going supercritical. Entity: {ToPrettyString(uid)}");
 
-        var super = EnsureComp<AnomalySupercriticalComponent>(uid);
+        var super = AddComp<AnomalySupercriticalComponent>(uid);
         super.EndTime = Timing.CurTime + super.SupercriticalDuration;
         Appearance.SetData(uid, AnomalyVisuals.Supercritical, true);
-        Dirty(super);
+        Dirty(uid, super);
     }
 
     /// <summary>
@@ -201,7 +201,7 @@ public void EndAnomaly(EntityUid uid, AnomalyComponent? component = null, bool s
         // Logging before resolve, in case the anomaly has deleted itself.
         if (_net.IsServer)
             _sawmill.Info($"Ending anomaly. Entity: {ToPrettyString(uid)}");
-        Log.Add(LogType.Anomaly, LogImpact.Extreme, $"Anomaly {ToPrettyString(uid)} went supercritical.");
+        AdminLog.Add(LogType.Anomaly, LogImpact.Extreme, $"Anomaly {ToPrettyString(uid)} went supercritical.");
 
         if (!Resolve(uid, ref component))
             return;
@@ -231,7 +231,7 @@ public void ChangeAnomalyStability(EntityUid uid, float change, AnomalyComponent
         var newVal = component.Stability + change;
 
         component.Stability = Math.Clamp(newVal, 0, 1);
-        Dirty(component);
+        Dirty(uid, component);
 
         var ev = new AnomalyStabilityChangedEvent(uid, component.Stability, component.Severity);
         RaiseLocalEvent(uid, ref ev, true);
@@ -254,7 +254,7 @@ public void ChangeAnomalySeverity(EntityUid uid, float change, AnomalyComponent?
             StartSupercriticalEvent(uid);
 
         component.Severity = Math.Clamp(newVal, 0, 1);
-        Dirty(component);
+        Dirty(uid, component);
 
         var ev = new AnomalySeverityChangedEvent(uid, component.Stability, component.Severity);
         RaiseLocalEvent(uid, ref ev, true);
@@ -280,7 +280,7 @@ public void ChangeAnomalyHealth(EntityUid uid, float change, AnomalyComponent? c
         }
 
         component.Health = Math.Clamp(newVal, 0, 1);
-        Dirty(component);
+        Dirty(uid, component);
 
         var ev = new AnomalyHealthChangedEvent(uid, component.Health);
         RaiseLocalEvent(uid, ref ev, true);
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
index 23300cb2a01..1203639e092 100644
--- a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
+++ b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
@@ -21,8 +21,7 @@ public enum GasCanisterUiKey
     public enum GasCanisterVisuals
     {
         PressureState,
-        TankInserted,
-        Locked
+        TankInserted
     }
 
     #endregion
diff --git a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
index 14a76ee45c0..1197e019d07 100644
--- a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
+++ b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
@@ -42,14 +42,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
 
-        _configuration.OnValueChanged(CCVars.GameCryoSleepRejoining, OnCvarChanged, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _configuration.UnsubValueChanged(CCVars.GameCryoSleepRejoining, OnCvarChanged);
+        Subs.CVar(_configuration, CCVars.GameCryoSleepRejoining, OnCvarChanged, true);
     }
 
     private void OnCvarChanged(bool value)
diff --git a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
index 505b2a18e7b..8e76ce3a3e6 100644
--- a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
@@ -13,7 +13,6 @@ namespace Content.Server.Bed.Sleep
     public abstract class SharedSleepingSystem : EntitySystem
     {
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly INetManager _net = default!;
         [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
         [Dependency] private readonly BlindableSystem _blindableSystem = default!;
 
diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs
index f2d41e5be95..3e1ff4284c7 100644
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -26,7 +26,6 @@ namespace Content.Shared.Blocking;
 
 public sealed partial class BlockingSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
index e5e4edddb07..bc7cf63124c 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
@@ -5,8 +5,13 @@
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.DragDrop;
+using Content.Shared.Gibbing.Components;
+using Content.Shared.Gibbing.Events;
+using Content.Shared.Gibbing.Systems;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
@@ -23,7 +28,10 @@ public partial class SharedBodySystem
      */
 
     [Dependency] private readonly InventorySystem _inventory = default!;
-
+    [Dependency] private readonly GibbingSystem _gibbingSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    private const float GibletLaunchImpulse = 8;
+    private const float GibletLaunchImpulseVariance = 3;
     private void InitializeBody()
     {
         // Body here to handle root body parts.
@@ -263,29 +271,44 @@ public IEnumerable<BodyPartSlot> GetBodyAllSlots(EntityUid bodyId, BodyComponent
         }
     }
 
-    public virtual HashSet<EntityUid> GibBody(EntityUid bodyId, bool gibOrgans = false,
-        BodyComponent? body = null, bool deleteItems = false, bool deleteBrain = false)
+    public virtual HashSet<EntityUid> GibBody(
+        EntityUid bodyId,
+        bool gibOrgans = false,
+        BodyComponent? body = null,
+        bool launchGibs = true,
+        Vector2? splatDirection = null,
+        float splatModifier = 1,
+        Angle splatCone = default,
+        SoundSpecifier? gibSoundOverride = null
+        )
     {
         var gibs = new HashSet<EntityUid>();
 
         if (!Resolve(bodyId, ref body, false))
             return gibs;
 
+        var root = GetRootPartOrNull(bodyId, body);
+        if (root != null && TryComp(root.Value.Entity, out GibbableComponent? gibbable))
+        {
+            gibSoundOverride ??= gibbable.GibSound;
+        }
         var parts = GetBodyChildren(bodyId, body).ToArray();
         gibs.EnsureCapacity(parts.Length);
-
         foreach (var part in parts)
         {
-            SharedTransform.AttachToGridOrMap(part.Id);
-            gibs.Add(part.Id);
+
+            _gibbingSystem.TryGibEntityWithRef(bodyId, part.Id, GibType.Gib, GibContentsOption.Skip, ref gibs,
+                playAudio: false, launchGibs:true, launchDirection:splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
+                launchImpulseVariance:GibletLaunchImpulseVariance, launchCone: splatCone);
 
             if (!gibOrgans)
                 continue;
 
             foreach (var organ in GetPartOrgans(part.Id, part.Component))
             {
-                SharedTransform.AttachToGridOrMap(organ.Id);
-                gibs.Add(organ.Id);
+                _gibbingSystem.TryGibEntityWithRef(bodyId, organ.Id, GibType.Drop, GibContentsOption.Skip,
+                    ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse * splatModifier,
+                    launchImpulseVariance:GibletLaunchImpulseVariance, launchCone: splatCone);
             }
         }
         if(TryComp<InventoryComponent>(bodyId, out var inventory))
@@ -296,6 +319,7 @@ public virtual HashSet<EntityUid> GibBody(EntityUid bodyId, bool gibOrgans = fal
                 gibs.Add(item);
             }
         }
+        _audioSystem.PlayPredicted(gibSoundOverride, Transform(bodyId).Coordinates, null);
         return gibs;
     }
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index b6b72843f6d..32e3ae6e1d4 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1564,6 +1564,9 @@ public static readonly CVarDef<int>
         public static readonly CVarDef<bool> ReducedMotion =
             CVarDef.Create("accessibility.reduced_motion", false, CVar.CLIENTONLY | CVar.ARCHIVE);
 
+        public static readonly CVarDef<bool> ChatEnableColorName =
+            CVarDef.Create("accessibility.enable_color_name", true, CVar.CLIENTONLY | CVar.ARCHIVE, "Toggles displaying names with individual colors.");
+
         /// <summary>
         /// Screen shake intensity slider, controlling the intensity of the CameraRecoilSystem.
         /// Goes from 0 (no recoil at all) to 1 (regular amounts of recoil)
@@ -1833,7 +1836,7 @@ public static readonly CVarDef<string>
         /// The time you must spend reading the rules, before the "Request" button is enabled
         /// </summary>
         public static readonly CVarDef<float> GhostRoleTime =
-            CVarDef.Create("ghost.role_time", 8f, CVar.REPLICATED);
+            CVarDef.Create("ghost.role_time", 8f, CVar.REPLICATED | CVar.SERVER);
 
         /*
          * Fire alarm
@@ -2009,6 +2012,16 @@ public static readonly CVarDef<float>
         public static readonly CVarDef<bool> GatewayGeneratorEnabled =
             CVarDef.Create("gateway.generator_enabled", true);
 
+        /*
+         * DEBUG
+         */
+
+        /// <summary>
+        /// A simple toggle to test <c>OptionsVisualizerComponent</c>.
+        /// </summary>
+        public static readonly CVarDef<bool> DebugOptionVisualizerTest =
+            CVarDef.Create("debug.option_visualizer_test", false, CVar.CLIENTONLY);
+
         /// DELTA-V CCVARS
         /*
          * Glimmer
diff --git a/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs b/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs
index ac12c5e7916..859a9f37a81 100644
--- a/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs
+++ b/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs
@@ -11,7 +11,6 @@ public abstract class SharedCartridgeLoaderSystem : EntitySystem
     [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly INetManager _netMan = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Charges/Systems/SharedChargesSystem.cs b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
index 653a7f22a5a..021191ac263 100644
--- a/Content.Shared/Charges/Systems/SharedChargesSystem.cs
+++ b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
@@ -38,7 +38,7 @@ public void AddCharges(EntityUid uid, int change, LimitedChargesComponent? comp
         var old = comp.Charges;
         comp.Charges = Math.Clamp(comp.Charges + change, 0, comp.MaxCharges);
         if (comp.Charges != old)
-            Dirty(comp);
+            Dirty(uid, comp);
     }
 
     /// <summary>
diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs
index 71e7e0399e4..8d14adcc24b 100644
--- a/Content.Shared/Chat/SharedChatSystem.cs
+++ b/Content.Shared/Chat/SharedChatSystem.cs
@@ -215,4 +215,31 @@ public static string SanitizeAnnouncement(string message, int maxLength = 0, int
 
         return trimmed;
     }
+
+    public static string InjectTagInsideTag(ChatMessage message, string outerTag, string innerTag, string? tagParameter)
+    {
+        var rawmsg = message.WrappedMessage;
+        var tagStart = rawmsg.IndexOf($"[{outerTag}]");
+        var tagEnd = rawmsg.IndexOf($"[/{outerTag}]");
+        if (tagStart < 0 || tagEnd < 0) //If the outer tag is not found, the injection is not performed
+            return rawmsg;
+        tagStart += outerTag.Length + 2;
+
+        string innerTagProcessed = tagParameter != null ? $"[{innerTag}={tagParameter}]" : $"[{innerTag}]";
+
+        rawmsg = rawmsg.Insert(tagEnd, $"[/{innerTag}]");
+        rawmsg = rawmsg.Insert(tagStart, innerTagProcessed);
+
+        return rawmsg;
+    }
+    public static string GetStringInsideTag(ChatMessage message, string tag)
+    {
+        var rawmsg = message.WrappedMessage;
+        var tagStart = rawmsg.IndexOf($"[{tag}]");
+        var tagEnd = rawmsg.IndexOf($"[/{tag}]");
+        if (tagStart < 0 || tagEnd < 0)
+            return "";
+        tagStart += tag.Length + 2;
+        return rawmsg.Substring(tagStart, tagEnd - tagStart);
+    }
 }
diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs
new file mode 100644
index 00000000000..e29047b6ded
--- /dev/null
+++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs
@@ -0,0 +1,104 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Chemistry.Components;
+
+[Serializable, NetSerializable]
+public sealed partial class InjectorDoAfterEvent : SimpleDoAfterEvent
+{
+}
+
+/// <summary>
+/// Implements draw/inject behavior for droppers and syringes.
+/// </summary>
+/// <remarks>
+/// Can optionally support both
+/// injection and drawing or just injection. Can inject/draw reagents from solution
+/// containers, and can directly inject into a mobs bloodstream.
+/// </remarks>
+/// <seealso cref="SharedInjectorSystem"/>
+/// <seealso cref="InjectorToggleMode"/>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class InjectorComponent : Component
+{
+    public const string SolutionName = "injector";
+
+    /// <summary>
+    /// Whether or not the injector is able to draw from containers or if it's a single use
+    /// device that can only inject.
+    /// </summary>
+    [DataField("injectOnly")]
+    public bool InjectOnly;
+
+    /// <summary>
+    /// Whether or not the injector is able to draw from or inject from mobs
+    /// </summary>
+    /// <remarks>
+    ///     for example: droppers would ignore mobs
+    /// </remarks>
+    [DataField("ignoreMobs")]
+    public bool IgnoreMobs;
+
+    /// <summary>
+    ///     The minimum amount of solution that can be transferred at once from this solution.
+    /// </summary>
+    [DataField("minTransferAmount")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public FixedPoint2 MinimumTransferAmount = FixedPoint2.New(5);
+
+    /// <summary>
+    ///     The maximum amount of solution that can be transferred at once from this solution.
+    /// </summary>
+    [DataField("maxTransferAmount")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public FixedPoint2 MaximumTransferAmount = FixedPoint2.New(50);
+
+    /// <summary>
+    /// Amount to inject or draw on each usage. If the injector is inject only, it will
+    /// attempt to inject it's entire contents upon use.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("transferAmount")]
+    [AutoNetworkedField]
+    public FixedPoint2 TransferAmount = FixedPoint2.New(5);
+
+    /// <summary>
+    /// Injection delay (seconds) when the target is a mob.
+    /// </summary>
+    /// <remarks>
+    /// The base delay has a minimum of 1 second, but this will still be modified if the target is incapacitated or
+    /// in combat mode.
+    /// </remarks>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("delay")]
+    public TimeSpan Delay = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// The state of the injector. Determines it's attack behavior. Containers must have the
+    /// right SolutionCaps to support injection/drawing. For InjectOnly injectors this should
+    /// only ever be set to Inject
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [AutoNetworkedField]
+    [DataField]
+    public InjectorToggleMode ToggleState = InjectorToggleMode.Draw;
+}
+
+/// <summary>
+/// Possible modes for an <see cref="InjectorComponent"/>.
+/// </summary>
+public enum InjectorToggleMode : byte
+{
+    /// <summary>
+    /// The injector will try to inject reagent into things.
+    /// </summary>
+    Inject,
+
+    /// <summary>
+    /// The injector will try to draw reagent from things.
+    /// </summary>
+    Draw
+}
diff --git a/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs b/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs
deleted file mode 100644
index a4cea4e7c47..00000000000
--- a/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Content.Shared.DoAfter;
-using Content.Shared.FixedPoint;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Chemistry.Components
-{
-    [Serializable, NetSerializable]
-    public sealed partial class InjectorDoAfterEvent : SimpleDoAfterEvent
-    {
-    }
-
-    /// <summary>
-    /// Shared class for injectors & syringes
-    /// </summary>
-    [NetworkedComponent, ComponentProtoName("Injector")]
-    public abstract partial class SharedInjectorComponent : Component
-    {
-        /// <summary>
-        /// Component data used for net updates. Used by client for item status ui
-        /// </summary>
-        [Serializable, NetSerializable]
-        public sealed class InjectorComponentState : ComponentState
-        {
-            public FixedPoint2 CurrentVolume { get; }
-            public FixedPoint2 TotalVolume { get; }
-            public InjectorToggleMode CurrentMode { get; }
-
-            public InjectorComponentState(FixedPoint2 currentVolume, FixedPoint2 totalVolume,
-                InjectorToggleMode currentMode)
-            {
-                CurrentVolume = currentVolume;
-                TotalVolume = totalVolume;
-                CurrentMode = currentMode;
-            }
-        }
-
-        public enum InjectorToggleMode : byte
-        {
-            Inject,
-            Draw
-        }
-    }
-}
diff --git a/Content.Shared/Chemistry/Components/Solution.cs b/Content.Shared/Chemistry/Components/Solution.cs
index f8e48213199..1c24c860dd0 100644
--- a/Content.Shared/Chemistry/Components/Solution.cs
+++ b/Content.Shared/Chemistry/Components/Solution.cs
@@ -92,6 +92,12 @@ public bool CanAddSolution(Solution solution)
         /// </summary>
         [ViewVariables] private bool _heatCapacityDirty = true;
 
+        [ViewVariables(VVAccess.ReadWrite)]
+        private int _heatCapacityUpdateCounter;
+
+        // This value is arbitrary btw.
+        private const int HeatCapacityUpdateInterval = 15;
+
         public void UpdateHeatCapacity(IPrototypeManager? protoMan)
         {
             IoCManager.Resolve(ref protoMan);
@@ -103,6 +109,8 @@ public void UpdateHeatCapacity(IPrototypeManager? protoMan)
                 _heatCapacity += (float) quantity *
                                     protoMan.Index<ReagentPrototype>(reagent.Prototype).SpecificHeat;
             }
+
+            _heatCapacityUpdateCounter = 0;
         }
 
         public float GetHeatCapacity(IPrototypeManager? protoMan)
@@ -112,6 +120,15 @@ public float GetHeatCapacity(IPrototypeManager? protoMan)
             return _heatCapacity;
         }
 
+        public void CheckRecalculateHeatCapacity()
+        {
+            // For performance, we have a few ways for heat capacity to get modified without a full recalculation.
+            // To avoid these drifting too much due to float error, we mark it as dirty after N such operations,
+            // so it will be recalculated.
+            if (++_heatCapacityUpdateCounter >= HeatCapacityUpdateInterval)
+                _heatCapacityDirty = true;
+        }
+
         public float GetThermalEnergy(IPrototypeManager? protoMan)
         {
             return GetHeatCapacity(protoMan) * Temperature;
@@ -165,6 +182,7 @@ public Solution(Solution solution)
             Temperature = solution.Temperature;
             _heatCapacity = solution._heatCapacity;
             _heatCapacityDirty = solution._heatCapacityDirty;
+            _heatCapacityUpdateCounter = solution._heatCapacityUpdateCounter;
             ValidateSolution();
         }
 
@@ -193,7 +211,7 @@ public void ValidateSolution()
                 var cur = _heatCapacity;
                 _heatCapacityDirty = true;
                 UpdateHeatCapacity(null);
-                DebugTools.Assert(MathHelper.CloseTo(_heatCapacity, cur));
+                DebugTools.Assert(MathHelper.CloseTo(_heatCapacity, cur, tolerance: 0.01));
             }
     #endif
         }
@@ -380,7 +398,9 @@ public void AddReagent(ReagentId id, FixedPoint2 quantity, bool dirtyHeatCap = t
         public void AddReagent(ReagentPrototype proto, ReagentId reagentId, FixedPoint2 quantity)
         {
             AddReagent(reagentId, quantity, false);
+
             _heatCapacity += quantity.Float() * proto.SpecificHeat;
+            CheckRecalculateHeatCapacity();
         }
 
         public void AddReagent(ReagentQuantity reagentQuantity)
@@ -419,6 +439,7 @@ public void ScaleSolution(int scale)
 
             _heatCapacity *= scale;
             Volume *= scale;
+            CheckRecalculateHeatCapacity();
 
             for (int i = 0; i < Contents.Count; i++)
             {
@@ -752,6 +773,7 @@ public void AddSolution(Solution otherSolution, IPrototypeManager? protoMan)
             }
 
             _heatCapacity += otherSolution._heatCapacity;
+            CheckRecalculateHeatCapacity();
             if (closeTemps)
                 _heatCapacityDirty |= otherSolution._heatCapacityDirty;
             else
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
new file mode 100644
index 00000000000..7ad21702817
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
@@ -0,0 +1,120 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.CombatMode;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+public abstract class SharedInjectorSystem : EntitySystem
+{
+    /// <summary>
+    ///     Default transfer amounts for the set-transfer verb.
+    /// </summary>
+    public static readonly FixedPoint2[] TransferAmounts = { 1, 5, 10, 15 };
+
+    [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainers = default!;
+    [Dependency] protected readonly MobStateSystem MobState = default!;
+    [Dependency] protected readonly SharedCombatModeSystem Combat = default!;
+    [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!;
+    [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<InjectorComponent, GetVerbsEvent<AlternativeVerb>>(AddSetTransferVerbs);
+        SubscribeLocalEvent<InjectorComponent, ComponentStartup>(OnInjectorStartup);
+        SubscribeLocalEvent<InjectorComponent, UseInHandEvent>(OnInjectorUse);
+    }
+
+    private void AddSetTransferVerbs(Entity<InjectorComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
+            return;
+
+        if (!HasComp<ActorComponent>(args.User))
+            return;
+
+        var (_, component) = entity;
+
+        // Add specific transfer verbs according to the container's size
+        var priority = 0;
+        var user = args.User;
+        foreach (var amount in TransferAmounts)
+        {
+            if (amount < component.MinimumTransferAmount || amount > component.MaximumTransferAmount)
+                continue;
+
+            AlternativeVerb verb = new()
+            {
+                Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount)),
+                Category = VerbCategory.SetTransferAmount,
+                Act = () =>
+                {
+                    component.TransferAmount = amount;
+                    Popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), user, user);
+                    Dirty(entity);
+                },
+
+                // we want to sort by size, not alphabetically by the verb text.
+                Priority = priority
+            };
+
+            priority -= 1;
+
+            args.Verbs.Add(verb);
+        }
+    }
+
+    private void OnInjectorStartup(Entity<InjectorComponent> entity, ref ComponentStartup args)
+    {
+        // ???? why ?????
+        Dirty(entity);
+    }
+
+    private void OnInjectorUse(Entity<InjectorComponent> entity, ref UseInHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        Toggle(entity, args.User);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Toggle between draw/inject state if applicable
+    /// </summary>
+    private void Toggle(Entity<InjectorComponent> injector, EntityUid user)
+    {
+        if (injector.Comp.InjectOnly)
+            return;
+
+        string msg;
+        switch (injector.Comp.ToggleState)
+        {
+            case InjectorToggleMode.Inject:
+                SetMode(injector, InjectorToggleMode.Draw);
+                msg = "injector-component-drawing-text";
+                break;
+            case InjectorToggleMode.Draw:
+                SetMode(injector, InjectorToggleMode.Inject);
+                msg = "injector-component-injecting-text";
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+
+        Popup.PopupClient(Loc.GetString(msg), injector, user);
+    }
+
+    public void SetMode(Entity<InjectorComponent> injector, InjectorToggleMode mode)
+    {
+        injector.Comp.ToggleState = mode;
+        Dirty(injector);
+    }
+}
diff --git a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
index 61237b22834..1a40d1dca12 100644
--- a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
@@ -17,4 +17,17 @@ public sealed partial class FoldableClothingComponent : Component
     /// </summary>
     [DataField]
     public SlotFlags? UnfoldedSlots;
+
+
+    /// <summary>
+    /// What equipped prefix does this have while in folded form?
+    /// </summary>
+    [DataField]
+    public string? FoldedEquippedPrefix;
+
+    /// <summary>
+    /// What held prefix does this have while in folded form?
+    /// </summary>
+    [DataField]
+    public string? FoldedHeldPrefix;
 }
diff --git a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
index d0611c5851c..27ea1680188 100644
--- a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.Foldable;
 using Content.Shared.Inventory;
+using Content.Shared.Item;
 
 namespace Content.Shared.Clothing.EntitySystems;
 
@@ -8,6 +9,7 @@ public sealed class FoldableClothingSystem : EntitySystem
 {
     [Dependency] private readonly ClothingSystem _clothingSystem = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
+    [Dependency] private readonly SharedItemSystem _itemSystem = default!;
 
     public override void Initialize()
     {
@@ -31,12 +33,32 @@ private void OnFoldAttempt(Entity<FoldableClothingComponent> ent, ref FoldAttemp
 
     private void OnFolded(Entity<FoldableClothingComponent> ent, ref FoldedEvent args)
     {
-        if (TryComp<ClothingComponent>(ent.Owner, out var clothingComp))
+        if (TryComp<ClothingComponent>(ent.Owner, out var clothingComp) &&
+            TryComp<ItemComponent>(ent.Owner, out var itemComp))
         {
-            if (args.IsFolded && ent.Comp.FoldedSlots.HasValue)
-                _clothingSystem.SetSlots(ent.Owner, ent.Comp.FoldedSlots.Value, clothingComp);
-            else if (!args.IsFolded && ent.Comp.UnfoldedSlots.HasValue)
-                _clothingSystem.SetSlots(ent.Owner, ent.Comp.UnfoldedSlots.Value, clothingComp);
+            if (args.IsFolded)
+            {
+                if (ent.Comp.FoldedSlots.HasValue)
+                    _clothingSystem.SetSlots(ent.Owner, ent.Comp.FoldedSlots.Value, clothingComp);
+
+                if (ent.Comp.FoldedEquippedPrefix != null)
+                    _clothingSystem.SetEquippedPrefix(ent.Owner, ent.Comp.FoldedEquippedPrefix, clothingComp);
+
+                if (ent.Comp.FoldedHeldPrefix != null)
+                    _itemSystem.SetHeldPrefix(ent.Owner, ent.Comp.FoldedHeldPrefix, false, itemComp);
+            }
+            else
+            {
+                if (ent.Comp.UnfoldedSlots.HasValue)
+                    _clothingSystem.SetSlots(ent.Owner, ent.Comp.UnfoldedSlots.Value, clothingComp);
+
+                if (ent.Comp.FoldedEquippedPrefix != null)
+                    _clothingSystem.SetEquippedPrefix(ent.Owner, null, clothingComp);
+
+                if (ent.Comp.FoldedHeldPrefix != null)
+                    _itemSystem.SetHeldPrefix(ent.Owner, null, false, itemComp);
+
+            }
         }
     }
 }
diff --git a/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs
index 4bf2f76ca34..e96d9f866aa 100644
--- a/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs
@@ -114,7 +114,7 @@ private void OnUnequipped(EntityUid uid, StealthClothingComponent comp, GotUnequ
 /// <summary>
 /// Raised on the stealth clothing when attempting to add an action.
 /// </summary>
-public class AddStealthActionEvent : CancellableEntityEventArgs
+public sealed class AddStealthActionEvent : CancellableEntityEventArgs
 {
     /// <summary>
     /// User that equipped the stealth clothing.
@@ -130,7 +130,7 @@ public AddStealthActionEvent(EntityUid user)
 /// <summary>
 /// Raised on the stealth clothing when the user is attemping to enable it.
 /// </summary>
-public class AttemptStealthEvent : CancellableEntityEventArgs
+public sealed class AttemptStealthEvent : CancellableEntityEventArgs
 {
     /// <summary>
     /// User that is attempting to enable the stealth clothing.
diff --git a/Content.Shared/Construction/SharedFlatpackSystem.cs b/Content.Shared/Construction/SharedFlatpackSystem.cs
index c6f3e89744d..d4c2513cd3d 100644
--- a/Content.Shared/Construction/SharedFlatpackSystem.cs
+++ b/Content.Shared/Construction/SharedFlatpackSystem.cs
@@ -20,7 +20,6 @@ namespace Content.Shared.Construction;
 public abstract class SharedFlatpackSystem : EntitySystem
 {
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs
index 9337e79439f..4aaf380c47d 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.cs
@@ -18,7 +18,6 @@ namespace Content.Shared.Damage
     public sealed class DamageableSystem : EntitySystem
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly INetManager _netMan = default!;
         [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
diff --git a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs
index 5a37d6a6e6c..e750863e243 100644
--- a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs
+++ b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs
@@ -10,7 +10,6 @@ public sealed class PassiveDamageSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     public override void Initialize()
     {
@@ -33,14 +32,14 @@ public override void Update(float frameTime)
         // Go through every entity with the component
         var query = EntityQueryEnumerator<PassiveDamageComponent, DamageableComponent, MobStateComponent>();
         while (query.MoveNext(out var uid, out var comp, out var damage, out var mobState))
-        {   
+        {
             // Make sure they're up for a damage tick
             if (comp.NextDamage > curTime)
                 continue;
 
             if (comp.DamageCap != 0 && damage.TotalDamage >= comp.DamageCap)
                 continue;
-            
+
             // Set the next time they can take damage
             comp.NextDamage = curTime + TimeSpan.FromSeconds(1f);
 
diff --git a/Content.Shared/DeviceLinking/Components/TwoWayLeverComponent.cs b/Content.Shared/DeviceLinking/Components/TwoWayLeverComponent.cs
new file mode 100644
index 00000000000..6dfc25582a3
--- /dev/null
+++ b/Content.Shared/DeviceLinking/Components/TwoWayLeverComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.DeviceLinking.Components;
+
+/// <summary>
+/// Simple ternary state for device linking.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TwoWayLeverComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public TwoWayLeverState State;
+
+    [DataField, AutoNetworkedField]
+    public bool NextSignalLeft;
+
+    [DataField]
+    public ProtoId<SourcePortPrototype> LeftPort = "Left";
+
+    [DataField]
+    public ProtoId<SourcePortPrototype> RightPort = "Right";
+
+    [DataField]
+    public ProtoId<SourcePortPrototype> MiddlePort = "Middle";
+}
diff --git a/Content.Shared/DeviceLinking/DeviceLinkSourceComponent.cs b/Content.Shared/DeviceLinking/DeviceLinkSourceComponent.cs
index 3a5d4d9f6da..332eff23cb2 100644
--- a/Content.Shared/DeviceLinking/DeviceLinkSourceComponent.cs
+++ b/Content.Shared/DeviceLinking/DeviceLinkSourceComponent.cs
@@ -1,5 +1,5 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.DeviceLinking;
 
@@ -11,25 +11,32 @@ public sealed partial class DeviceLinkSourceComponent : Component
     /// <summary>
     /// The ports the device link source sends signals from
     /// </summary>
-    [DataField("ports", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<SourcePortPrototype>))]
-    public HashSet<string>? Ports;
+    [DataField]
+    public HashSet<ProtoId<SourcePortPrototype>>? Ports;
 
     /// <summary>
     /// A list of sink uids that got linked for each port
     /// </summary>
     [ViewVariables]
-    public Dictionary<string, HashSet<EntityUid>> Outputs = new();
+    public Dictionary<ProtoId<SourcePortPrototype>, HashSet<EntityUid>> Outputs = new();
+
+    /// <summary>
+    /// If set to High or Low, the last signal state for a given port.
+    /// Used when linking ports of devices that are currently outputting a signal.
+    /// Only set by <c>DeviceLinkSystem.SendSignal</c>.
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<SourcePortPrototype>, bool> LastSignals = new();
 
     /// <summary>
     /// The list of source to sink ports for each linked sink entity for easier managing of links
     /// </summary>
-    [DataField("linkedPorts")]
-    public Dictionary<EntityUid, HashSet<(string source, string sink)>> LinkedPorts = new();
+    [DataField]
+    public Dictionary<EntityUid, HashSet<(ProtoId<SourcePortPrototype> source, ProtoId<SinkPortPrototype> sink)>> LinkedPorts = new();
 
     /// <summary>
     ///     Limits the range devices can be linked across.
     /// </summary>
-    [DataField("range")]
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float Range = 30f;
 }
diff --git a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
index 02c0f608532..2ac525d154d 100644
--- a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
+++ b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.DeviceLinking.Events;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Popups;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -148,8 +149,11 @@ private void OnSinkRemoved(EntityUid sinkUid, DeviceLinkSinkComponent sinkCompon
     /// </summary>
     public void EnsureSourcePorts(EntityUid uid, params string[] ports)
     {
+        if (ports.Length == 0)
+            return;
+
         var comp = EnsureComp<DeviceLinkSourceComponent>(uid);
-        comp.Ports ??= new HashSet<string>();
+        comp.Ports ??= new HashSet<ProtoId<SourcePortPrototype>>();
 
         foreach (var port in ports)
         {
@@ -163,6 +167,9 @@ public void EnsureSourcePorts(EntityUid uid, params string[] ports)
     /// </summary>
     public void EnsureSinkPorts(EntityUid uid, params string[] ports)
     {
+        if (ports.Length == 0)
+            return;
+
         var comp = EnsureComp<DeviceLinkSinkComponent>(uid);
         comp.Ports ??= new HashSet<string>();
 
@@ -226,10 +233,10 @@ public string PortName<TPort>(string port) where TPort : DevicePortPrototype, IP
     /// Returns the links of a source
     /// </summary>
     /// <returns>A list of sink and source port ids that are linked together</returns>
-    public HashSet<(string source, string sink)> GetLinks(EntityUid sourceUid, EntityUid sinkUid, DeviceLinkSourceComponent? sourceComponent = null)
+    public HashSet<(ProtoId<SourcePortPrototype> source, ProtoId<SinkPortPrototype> sink)> GetLinks(EntityUid sourceUid, EntityUid sinkUid, DeviceLinkSourceComponent? sourceComponent = null)
     {
         if (!Resolve(sourceUid, ref sourceComponent) || !sourceComponent.LinkedPorts.TryGetValue(sinkUid, out var links))
-            return new HashSet<(string source, string sink)>();
+            return new HashSet<(ProtoId<SourcePortPrototype>, ProtoId<SinkPortPrototype>)>();
 
         return links;
     }
@@ -550,4 +557,20 @@ private void CreateLinkPopup(EntityUid? userId, EntityUid sourceUid, string sour
                 ("machine2", sinkUid), ("port2", PortName<SinkPortPrototype>(sink))), userId.Value, PopupType.Medium);
     }
     #endregion
+
+    #region Sending & Receiving
+    /// <summary>
+    /// Sends a network payload directed at the sink entity.
+    /// Just raises a <see cref="SignalReceivedEvent"/> without data if the source or the sink doesn't have a <see cref="DeviceNetworkComponent"/>
+    /// </summary>
+    /// <param name="uid">The source uid that invokes the port</param>
+    /// <param name="port">The port to invoke</param>
+    /// <param name="data">Optional data to send along</param>
+    /// <param name="sourceComponent"></param>
+    public virtual void InvokePort(EntityUid uid, string port, NetworkPayload? data = null,
+        DeviceLinkSourceComponent? sourceComponent = null)
+    {
+        // NOOP on client for the moment.
+    }
+    #endregion
 }
diff --git a/Content.Server/DeviceLinking/Systems/TwoWayLeverSystem.cs b/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
similarity index 95%
rename from Content.Server/DeviceLinking/Systems/TwoWayLeverSystem.cs
rename to Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
index 7d351dcac56..c8783b05fc7 100644
--- a/Content.Server/DeviceLinking/Systems/TwoWayLeverSystem.cs
+++ b/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
@@ -1,14 +1,13 @@
-using Content.Server.DeviceLinking.Components;
-using Content.Shared.DeviceLinking;
+using Content.Shared.DeviceLinking.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Verbs;
 using Robust.Shared.Utility;
 
-namespace Content.Server.DeviceLinking.Systems
+namespace Content.Shared.DeviceLinking.Systems
 {
     public sealed class TwoWayLeverSystem : EntitySystem
     {
-        [Dependency] private readonly DeviceLinkSystem _signalSystem = default!;
+        [Dependency] private readonly SharedDeviceLinkSystem _signalSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
         const string _leftToggleImage = "rotate_ccw.svg.192dpi.png";
@@ -111,6 +110,7 @@ private void StateChanged(EntityUid uid, TwoWayLeverComponent component)
                 _ => throw new ArgumentOutOfRangeException()
             };
 
+            Dirty(uid, component);
             _signalSystem.InvokePort(uid, port);
         }
     }
diff --git a/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs b/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs
index d12456dc526..13000d00c9a 100644
--- a/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs
+++ b/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs
@@ -1,4 +1,5 @@
-using Content.Shared.DeviceLinking;
+using Content.Shared.DeviceLinking;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.DeviceNetwork;
@@ -30,12 +31,18 @@ public sealed class DeviceLinkUserInterfaceState : BoundUserInterfaceState
 {
     public readonly List<SourcePortPrototype> Sources;
     public readonly List<SinkPortPrototype> Sinks;
-    public readonly HashSet<(string source, string sink)> Links;
+    public readonly HashSet<(ProtoId<SourcePortPrototype> source, ProtoId<SinkPortPrototype> sink)> Links;
     public readonly List<(string source, string sink)>? Defaults;
     public readonly string SourceAddress;
     public readonly string SinkAddress;
 
-    public DeviceLinkUserInterfaceState(List<SourcePortPrototype> sources, List<SinkPortPrototype> sinks, HashSet<(string source, string sink)> links, string sourceAddress, string sinkAddress, List<(string source, string sink)>? defaults = default)
+    public DeviceLinkUserInterfaceState(
+        List<SourcePortPrototype> sources,
+        List<SinkPortPrototype> sinks,
+        HashSet<(ProtoId<SourcePortPrototype> source, ProtoId<SinkPortPrototype> sink)> links,
+        string sourceAddress,
+        string sinkAddress,
+        List<(string source, string sink)>? defaults = default)
     {
         Links = links;
         SourceAddress = sourceAddress;
diff --git a/Content.Shared/DeviceNetwork/NetworkPayload.cs b/Content.Shared/DeviceNetwork/NetworkPayload.cs
new file mode 100644
index 00000000000..32393740213
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/NetworkPayload.cs
@@ -0,0 +1,24 @@
+using System.Diagnostics.CodeAnalysis;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.DeviceNetwork;
+
+public sealed class NetworkPayload : Dictionary<string, object?>
+{
+    /// <summary>
+    /// Tries to get a value from the payload and checks if that value is of type  T.
+    /// </summary>
+    /// <typeparam name="T">The type that should be casted to</typeparam>
+    /// <returns>Whether the value was present in the payload and of the required type</returns>
+    public bool TryGetValue<T>(string key, [NotNullWhen(true)] out T? value)
+    {
+        if (this.TryCastValue(key, out T? result))
+        {
+            value = result;
+            return true;
+        }
+
+        value = default;
+        return false;
+    }
+}
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index 53d79cada7a..f04f6c6dfe0 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -14,7 +14,6 @@
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
-using Content.Shared.Prying.Components;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Shared.Doors.Systems;
diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
index a06a4b70499..5a3fb872293 100644
--- a/Content.Shared/Examine/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -17,6 +17,7 @@ namespace Content.Shared.Examine
 {
     public abstract partial class ExamineSystemShared : EntitySystem
     {
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
         [Dependency] protected readonly MobStateSystem MobStateSystem = default!;
@@ -57,7 +58,7 @@ public bool IsInDetailsRange(EntityUid examiner, EntityUid entity)
             if (MobStateSystem.IsIncapacitated(examiner))
                 return false;
 
-            if (!_interactionSystem.InRangeUnobstructed(examiner, entity, ExamineDetailsRange))
+            if (!InRangeUnOccluded(examiner, entity, ExamineDetailsRange))
                 return false;
 
             // Is the target hidden in a opaque locker or something? Currently this check allows players to examine
@@ -77,7 +78,7 @@ public bool CanExamine(EntityUid examiner, EntityUid examined)
             if (IsClientSide(examined))
                 return true;
 
-            return !Deleted(examined) && CanExamine(examiner, EntityManager.GetComponent<TransformComponent>(examined).MapPosition,
+            return !Deleted(examined) && CanExamine(examiner, _transform.GetMapCoordinates(examined),
                 entity => entity == examiner || entity == examined, examined);
         }
 
@@ -109,7 +110,7 @@ public virtual bool CanExamine(EntityUid examiner, MapCoordinates target, Ignore
                 return false;
 
             return InRangeUnOccluded(
-                EntityManager.GetComponent<TransformComponent>(examiner).MapPosition,
+                _transform.GetMapCoordinates(examiner),
                 target,
                 GetExaminerRange(examiner),
                 predicate: predicate,
diff --git a/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs b/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
index cfbe1fcb3d9..80d65f4c2cd 100644
--- a/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
+++ b/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
@@ -1,9 +1,7 @@
 using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Explosion.EntitySystems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.GameStates;
 
 namespace Content.Shared.Explosion.Components;
 
diff --git a/Content.Shared/Eye/Blinding/Systems/BlurryVisionSystem.cs b/Content.Shared/Eye/Blinding/Systems/BlurryVisionSystem.cs
index 4577bcda99a..099753d51e0 100644
--- a/Content.Shared/Eye/Blinding/Systems/BlurryVisionSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/BlurryVisionSystem.cs
@@ -6,8 +6,6 @@ namespace Content.Shared.Eye.Blinding.Systems;
 
 public sealed class BlurryVisionSystem : EntitySystem
 {
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-
     public override void Initialize()
     {
         base.Initialize();
diff --git a/Content.Shared/Fax/SharedFax.cs b/Content.Shared/Fax/SharedFax.cs
index ccb998925f1..15674aef7e5 100644
--- a/Content.Shared/Fax/SharedFax.cs
+++ b/Content.Shared/Fax/SharedFax.cs
@@ -34,6 +34,24 @@ public FaxUiState(string deviceName,
     }
 }
 
+[Serializable, NetSerializable]
+public sealed class FaxFileMessage : BoundUserInterfaceMessage
+{
+    public string Content;
+    public bool OfficePaper;
+
+    public FaxFileMessage(string content, bool officePaper)
+    {
+        Content = content;
+        OfficePaper = officePaper;
+    }
+}
+
+public static class FaxFileMessageValidation
+{
+    public const int MaxContentSize = 10000;
+}
+
 [Serializable, NetSerializable]
 public sealed class FaxCopyMessage : BoundUserInterfaceMessage
 {
diff --git a/Content.Shared/FixedPoint/FixedPoint2.cs b/Content.Shared/FixedPoint/FixedPoint2.cs
index eb0e75e7ab9..33a9d25bc27 100644
--- a/Content.Shared/FixedPoint/FixedPoint2.cs
+++ b/Content.Shared/FixedPoint/FixedPoint2.cs
@@ -20,6 +20,9 @@ public struct FixedPoint2 : ISelfSerialize, IComparable<FixedPoint2>, IEquatable
         public static FixedPoint2 Epsilon { get; } = new(1);
         public static FixedPoint2 Zero { get; } = new(0);
 
+        // This value isn't picked by any proper testing, don't @ me.
+        private const float FloatEpsilon = 0.00001f;
+
 #if DEBUG
         static FixedPoint2()
         {
@@ -47,7 +50,17 @@ public static FixedPoint2 New(int value)
 
         public static FixedPoint2 New(float value)
         {
-            return new((int) MathF.Round(value * ShiftConstant, MidpointRounding.AwayFromZero));
+            return new((int) ApplyFloatEpsilon(value * ShiftConstant));
+        }
+
+        private static float ApplyFloatEpsilon(float value)
+        {
+            return value + FloatEpsilon * Math.Sign(value);
+        }
+
+        private static double ApplyFloatEpsilon(double value)
+        {
+            return value + FloatEpsilon * Math.Sign(value);
         }
 
         /// <summary>
@@ -60,17 +73,12 @@ public static FixedPoint2 NewCeiling(float value)
 
         public static FixedPoint2 New(double value)
         {
-            return new((int) Math.Round(value * ShiftConstant, MidpointRounding.AwayFromZero));
+            return new((int) ApplyFloatEpsilon(value * ShiftConstant));
         }
 
         public static FixedPoint2 New(string value)
         {
-            return New(FloatFromString(value));
-        }
-
-        private static float FloatFromString(string value)
-        {
-            return float.Parse(value, CultureInfo.InvariantCulture);
+            return New(Parse.Float(value));
         }
 
         public static FixedPoint2 operator +(FixedPoint2 a) => a;
@@ -85,17 +93,17 @@ private static float FloatFromString(string value)
 
         public static FixedPoint2 operator *(FixedPoint2 a, FixedPoint2 b)
         {
-            return new((int) MathF.Round(b.Value * a.Value / (float) ShiftConstant, MidpointRounding.AwayFromZero));
+            return new(b.Value * a.Value / ShiftConstant);
         }
 
         public static FixedPoint2 operator *(FixedPoint2 a, float b)
         {
-            return new((int) MathF.Round(a.Value * b, MidpointRounding.AwayFromZero));
+            return new((int) ApplyFloatEpsilon(a.Value * b));
         }
 
         public static FixedPoint2 operator *(FixedPoint2 a, double b)
         {
-            return new((int) Math.Round(a.Value * b, MidpointRounding.AwayFromZero));
+            return new((int) ApplyFloatEpsilon(a.Value * b));
         }
 
         public static FixedPoint2 operator *(FixedPoint2 a, int b)
@@ -105,12 +113,12 @@ private static float FloatFromString(string value)
 
         public static FixedPoint2 operator /(FixedPoint2 a, FixedPoint2 b)
         {
-            return new((int) MathF.Round((ShiftConstant * a.Value) / (float) b.Value, MidpointRounding.AwayFromZero));
+            return new((int) (ShiftConstant * (long) a.Value / b.Value));
         }
 
         public static FixedPoint2 operator /(FixedPoint2 a, float b)
         {
-            return new((int) MathF.Round(a.Value / b, MidpointRounding.AwayFromZero));
+            return new((int) ApplyFloatEpsilon(a.Value / b));
         }
 
         public static bool operator <=(FixedPoint2 a, int b)
@@ -185,7 +193,7 @@ public readonly double Double()
 
         public readonly int Int()
         {
-            return (int) ShiftDown();
+            return Value / ShiftConstant;
         }
 
         // Implicit operators ftw
@@ -266,7 +274,7 @@ public void Deserialize(string value)
             if (value == "MaxValue")
                 Value = int.MaxValue;
             else
-                this = New(FloatFromString(value));
+                this = New(Parse.Float(value));
         }
 
         public override readonly string ToString() => $"{ShiftDown().ToString(CultureInfo.InvariantCulture)}";
diff --git a/Content.Shared/Flash/FlashableComponent.cs b/Content.Shared/Flash/FlashableComponent.cs
index e20e2e79414..c4f8074ceaf 100644
--- a/Content.Shared/Flash/FlashableComponent.cs
+++ b/Content.Shared/Flash/FlashableComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Physics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
@@ -9,6 +10,9 @@ public sealed partial class FlashableComponent : Component
         public float Duration;
         public TimeSpan LastFlash;
 
+        [DataField]
+        public CollisionGroup CollisionGroup = CollisionGroup.Opaque;
+
         public override bool SendOnlyToOwner => true;
     }
 
diff --git a/Content.Shared/Fluids/SharedDrainSystem.cs b/Content.Shared/Fluids/SharedDrainSystem.cs
index f9bcee44eee..d65dddb0df9 100644
--- a/Content.Shared/Fluids/SharedDrainSystem.cs
+++ b/Content.Shared/Fluids/SharedDrainSystem.cs
@@ -3,7 +3,7 @@
 
 namespace Content.Shared.Fluids;
 
-public partial class SharedDrainSystem : EntitySystem
+public abstract partial class SharedDrainSystem : EntitySystem
 {
     [Serializable, NetSerializable]
     public sealed partial class DrainDoAfterEvent : SimpleDoAfterEvent
diff --git a/Content.Shared/Foldable/FoldableComponent.cs b/Content.Shared/Foldable/FoldableComponent.cs
index c22095f3f29..74f6a209136 100644
--- a/Content.Shared/Foldable/FoldableComponent.cs
+++ b/Content.Shared/Foldable/FoldableComponent.cs
@@ -17,4 +17,10 @@ public sealed partial class FoldableComponent : Component
 
     [DataField]
     public bool CanFoldInsideContainer = false;
+
+    [DataField]
+    public LocId UnfoldVerbText = "unfold-verb";
+
+    [DataField]
+    public LocId FoldVerbText = "fold-verb";
 }
diff --git a/Content.Shared/Foldable/FoldableSystem.cs b/Content.Shared/Foldable/FoldableSystem.cs
index 374aba44c50..10baf8165b5 100644
--- a/Content.Shared/Foldable/FoldableSystem.cs
+++ b/Content.Shared/Foldable/FoldableSystem.cs
@@ -134,7 +134,7 @@ private void AddFoldVerb(EntityUid uid, FoldableComponent component, GetVerbsEve
         AlternativeVerb verb = new()
         {
             Act = () => TryToggleFold(uid, component),
-            Text = component.IsFolded ? Loc.GetString("unfold-verb") : Loc.GetString("fold-verb"),
+            Text = component.IsFolded ? Loc.GetString(component.UnfoldVerbText) : Loc.GetString(component.FoldVerbText),
             Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/fold.svg.192dpi.png")),
 
             // If the object is unfolded and they click it, they want to fold it, if it's folded, they want to pick it up
diff --git a/Content.Shared/Friction/TileFrictionController.cs b/Content.Shared/Friction/TileFrictionController.cs
index 472f5b574b2..ba4d9fc24f8 100644
--- a/Content.Shared/Friction/TileFrictionController.cs
+++ b/Content.Shared/Friction/TileFrictionController.cs
@@ -31,20 +31,8 @@ public override void Initialize()
         {
             base.Initialize();
 
-            _configManager.OnValueChanged(CCVars.TileFrictionModifier, SetFrictionModifier, true);
-            _configManager.OnValueChanged(CCVars.StopSpeed, SetStopSpeed, true);
-        }
-
-        private void SetStopSpeed(float value) => _stopSpeed = value;
-
-        private void SetFrictionModifier(float value) => _frictionModifier = value;
-
-        public override void Shutdown()
-        {
-            base.Shutdown();
-
-            _configManager.UnsubValueChanged(CCVars.TileFrictionModifier, SetFrictionModifier);
-            _configManager.UnsubValueChanged(CCVars.StopSpeed, SetStopSpeed);
+            Subs.CVar(_configManager, CCVars.TileFrictionModifier, value => _frictionModifier = value, true);
+            Subs.CVar(_configManager, CCVars.StopSpeed, value => _stopSpeed = value, true);
         }
 
         public override void UpdateBeforeMapSolve(bool prediction, PhysicsMapComponent mapComponent, float frameTime)
diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
index 7778588f97c..2677d499c2f 100644
--- a/Content.Shared/GameTicking/SharedGameTicker.cs
+++ b/Content.Shared/GameTicking/SharedGameTicker.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Roles;
+using Robust.Shared.Network;
 using Robust.Shared.Replays;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Markdown.Mapping;
@@ -144,18 +145,37 @@ public TickerJobsAvailableEvent(Dictionary<NetEntity, string> stationNames, Dict
         }
     }
 
-    [Serializable, NetSerializable]
-    public sealed class RoundEndMessageEvent : EntityEventArgs
+    [Serializable, NetSerializable, DataDefinition]
+    public sealed partial class RoundEndMessageEvent : EntityEventArgs
     {
-        [Serializable, NetSerializable]
-        public struct RoundEndPlayerInfo
+        [Serializable, NetSerializable, DataDefinition]
+        public partial struct RoundEndPlayerInfo
         {
+            [DataField]
             public string PlayerOOCName;
+
+            [DataField]
             public string? PlayerICName;
+
+            [DataField, NonSerialized]
+            public NetUserId? PlayerGuid;
+
             public string Role;
+
+            [DataField, NonSerialized]
+            public string[] JobPrototypes;
+
+            [DataField, NonSerialized]
+            public string[] AntagPrototypes;
+
             public NetEntity? PlayerNetEntity;
+
+            [DataField]
             public bool Antag;
+
+            [DataField]
             public bool Observer;
+
             public bool Connected;
         }
 
diff --git a/Content.Shared/Gibbing/Components/GibbableComponent.cs b/Content.Shared/Gibbing/Components/GibbableComponent.cs
new file mode 100644
index 00000000000..9c7501f0282
--- /dev/null
+++ b/Content.Shared/Gibbing/Components/GibbableComponent.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Gibbing.Systems;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Gibbing.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(GibbingSystem))]
+public sealed partial class GibbableComponent : Component
+{
+    /// <summary>
+    /// Giblet entity prototypes to randomly select from when spawning additional giblets
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<EntProtoId> GibPrototypes = new();
+
+    /// <summary>
+    /// Number of giblet entities to spawn in addition to entity contents
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int GibCount;
+
+    /// <summary>
+    /// Sound to be played when this entity is gibbed, only played when playsound is true on the gibbing function
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? GibSound = new SoundCollectionSpecifier("gib", AudioParams.Default.WithVariation(0.025f));
+
+    /// <summary>
+    /// Max distance giblets can be dropped from an entity when NOT using physics-based scattering
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float GibScatterRange = 0.3f;
+}
diff --git a/Content.Shared/Gibbing/Events/GibbingEvents.cs b/Content.Shared/Gibbing/Events/GibbingEvents.cs
new file mode 100644
index 00000000000..949b10eab9a
--- /dev/null
+++ b/Content.Shared/Gibbing/Events/GibbingEvents.cs
@@ -0,0 +1,50 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Gibbing.Events;
+
+
+
+/// <summary>
+/// Called just before we actually gib the target entity
+/// </summary>
+/// <param name="Target">The entity being gibed</param>
+/// <param name="GibType">What type of gibbing is occuring</param>
+/// <param name="AllowedContainers">Containers we are allow to gib</param>
+/// <param name="ExcludedContainers">Containers we are allow not allowed to gib</param>
+[ByRefEvent] public record struct AttemptEntityContentsGibEvent(
+    EntityUid Target,
+    GibContentsOption GibType,
+    List<string>? AllowedContainers,
+    List<string>? ExcludedContainers
+    );
+
+
+/// <summary>
+/// Called just before we actually gib the target entity
+/// </summary>
+/// <param name="Target">The entity being gibed</param>
+/// <param name="GibletCount">how many giblets to spawn</param>
+/// <param name="GibType">What type of gibbing is occuring</param>
+[ByRefEvent] public record struct AttemptEntityGibEvent(EntityUid Target, int GibletCount, GibType GibType);
+
+/// <summary>
+/// Called immediately after we gib the target entity
+/// </summary>
+/// <param name="Target">The entity being gibbed</param>
+/// <param name="DroppedEntities">Any entities that are spilled out (if any)</param>
+[ByRefEvent] public record struct EntityGibbedEvent(EntityUid Target, List<EntityUid> DroppedEntities);
+
+[Serializable, NetSerializable]
+public enum GibType : byte
+{
+    Skip,
+    Drop,
+    Gib,
+}
+
+public enum GibContentsOption : byte
+{
+    Skip,
+    Drop,
+    Gib
+}
diff --git a/Content.Shared/Gibbing/Systems/GibbingSystem.cs b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
new file mode 100644
index 00000000000..f3d982977a7
--- /dev/null
+++ b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
@@ -0,0 +1,340 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Numerics;
+using Content.Shared.Gibbing.Components;
+using Content.Shared.Gibbing.Events;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Gibbing.Systems;
+
+public sealed class GibbingSystem : EntitySystem
+{
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    //TODO: (future optimization) implement a system that "caps" giblet entities by deleting the oldest ones once we reach a certain limit, customizable via CVAR
+
+    /// <summary>
+    /// Attempt to gib a specified entity. That entity must have a gibable components. This method is NOT recursive will only
+    /// work on the target and any entities it contains (depending on gibContentsOption)
+    /// </summary>
+    /// <param name="outerEntity">The outermost entity we care about, used to place the dropped items</param>
+    /// <param name="gibbable">Target entity/comp we wish to gib</param>
+    /// <param name="gibType">What type of gibing are we performing</param>
+    /// <param name="gibContentsOption">What type of gibing do we perform on any container contents?</param>
+    /// <param name="droppedEntities">a hashset containing all the entities that have been dropped/created</param>
+    /// <param name="randomSpreadMod">How much to multiply the random spread on dropped giblets(if we are dropping them!)</param>
+    /// <param name="playAudio">Should we play audio</param>
+    /// <param name="allowedContainers">A list of containerIds on the target that permit gibing</param>
+    /// <param name="excludedContainers">A list of containerIds on the target that DO NOT permit gibing</param>
+    /// <param name="launchCone">The cone we are launching giblets in (if we are launching them!)</param>
+    /// <param name="launchGibs">Should we launch giblets or just drop them</param>
+    /// <param name="launchDirection">The direction to launch giblets (if we are launching them!)</param>
+    /// <param name="launchImpulse">The impluse to launch giblets at(if we are launching them!)</param>
+    /// /// <param name="logMissingGibable">Should we log if we are missing a gibbableComp when we call this function</param>
+    /// <param name="launchImpulseVariance">The variation in giblet launch impulse (if we are launching them!)</param>
+    /// <returns>True if successful, false if not</returns>
+    public bool TryGibEntity(EntityUid outerEntity, Entity<GibbableComponent?> gibbable, GibType gibType,
+        GibContentsOption gibContentsOption,
+        out HashSet<EntityUid> droppedEntities, bool launchGibs = true,
+        Vector2 launchDirection = default, float launchImpulse = 0f, float launchImpulseVariance = 0f,
+        Angle launchCone = default,
+        float randomSpreadMod = 1.0f, bool playAudio = true, List<string>? allowedContainers = null,
+        List<string>? excludedContainers = null, bool logMissingGibable = false)
+    {
+        droppedEntities = new();
+        return TryGibEntityWithRef(outerEntity, gibbable, gibType, gibContentsOption, ref droppedEntities,
+            launchGibs, launchDirection, launchImpulse, launchImpulseVariance, launchCone, randomSpreadMod, playAudio,
+            allowedContainers, excludedContainers, logMissingGibable);
+    }
+
+
+    /// <summary>
+    /// Attempt to gib a specified entity. That entity must have a gibable components. This method is NOT recursive will only
+    /// work on the target and any entities it contains (depending on gibContentsOption)
+    /// </summary>
+    /// <param name="outerEntity">The outermost entity we care about, used to place the dropped items</param>
+    /// <param name="gibbable">Target entity/comp we wish to gib</param>
+    /// <param name="gibType">What type of gibing are we performing</param>
+    /// <param name="gibContentsOption">What type of gibing do we perform on any container contents?</param>
+    /// <param name="droppedEntities">a hashset containing all the entities that have been dropped/created</param>
+    /// <param name="randomSpreadMod">How much to multiply the random spread on dropped giblets(if we are dropping them!)</param>
+    /// <param name="playAudio">Should we play audio</param>
+    /// <param name="allowedContainers">A list of containerIds on the target that permit gibing</param>
+    /// <param name="excludedContainers">A list of containerIds on the target that DO NOT permit gibing</param>
+    /// <param name="launchCone">The cone we are launching giblets in (if we are launching them!)</param>
+    /// <param name="launchGibs">Should we launch giblets or just drop them</param>
+    /// <param name="launchDirection">The direction to launch giblets (if we are launching them!)</param>
+    /// <param name="launchImpulse">The impluse to launch giblets at(if we are launching them!)</param>
+    /// <param name="launchImpulseVariance">The variation in giblet launch impulse (if we are launching them!)</param>
+    /// <param name="logMissingGibable">Should we log if we are missing a gibbableComp when we call this function</param>
+    /// <returns>True if successful, false if not</returns>
+    public bool TryGibEntityWithRef(
+        EntityUid outerEntity,
+        Entity<GibbableComponent?> gibbable,
+        GibType gibType,
+        GibContentsOption gibContentsOption,
+        ref HashSet<EntityUid> droppedEntities,
+        bool launchGibs = true,
+        Vector2? launchDirection = null,
+        float launchImpulse = 0f,
+        float launchImpulseVariance = 0f,
+        Angle launchCone = default,
+        float randomSpreadMod = 1.0f,
+        bool playAudio = true,
+        List<string>? allowedContainers = null,
+        List<string>? excludedContainers = null,
+        bool logMissingGibable = false)
+    {
+        if (!Resolve(gibbable, ref gibbable.Comp, logMissing: false))
+        {
+            DropEntity(gibbable, Transform(outerEntity), randomSpreadMod, ref droppedEntities,
+                launchGibs, launchDirection, launchImpulse, launchImpulseVariance, launchCone);
+            if (logMissingGibable)
+            {
+                Log.Warning($"{ToPrettyString(gibbable)} does not have a GibbableComponent! " +
+                            $"This is not required but may cause issues contained items to not be dropped.");
+            }
+
+            return false;
+        }
+
+        if (gibType == GibType.Skip && gibContentsOption == GibContentsOption.Skip)
+            return true;
+        if (launchGibs)
+        {
+            randomSpreadMod = 0;
+        }
+
+        var parentXform = Transform(outerEntity);
+        HashSet<BaseContainer> validContainers = new();
+        var gibContentsAttempt =
+            new AttemptEntityContentsGibEvent(gibbable, gibContentsOption, allowedContainers, excludedContainers);
+        RaiseLocalEvent(gibbable, ref gibContentsAttempt);
+
+        foreach (var container in _containerSystem.GetAllContainers(gibbable))
+        {
+            var valid = true;
+            if (allowedContainers != null)
+                valid = allowedContainers.Contains(container.ID);
+            if (excludedContainers != null)
+                valid = valid && !excludedContainers.Contains(container.ID);
+            if (valid)
+                validContainers.Add(container);
+        }
+
+        switch (gibContentsOption)
+        {
+            case GibContentsOption.Skip:
+                break;
+            case GibContentsOption.Drop:
+            {
+                foreach (var container in validContainers)
+                {
+                    foreach (var ent in container.ContainedEntities)
+                    {
+                        DropEntity(new Entity<GibbableComponent?>(ent, null), parentXform, randomSpreadMod,
+                            ref droppedEntities, launchGibs,
+                            launchDirection, launchImpulse, launchImpulseVariance, launchCone);
+                    }
+                }
+
+                break;
+            }
+            case GibContentsOption.Gib:
+            {
+                foreach (var container in validContainers)
+                {
+                    foreach (var ent in container.ContainedEntities)
+                    {
+                        GibEntity(new Entity<GibbableComponent?>(ent, null), parentXform, randomSpreadMod,
+                            ref droppedEntities, launchGibs,
+                            launchDirection, launchImpulse, launchImpulseVariance, launchCone);
+                    }
+                }
+
+                break;
+            }
+        }
+
+        switch (gibType)
+        {
+            case GibType.Skip:
+                break;
+            case GibType.Drop:
+            {
+                DropEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, launchGibs,
+                    launchDirection, launchImpulse, launchImpulseVariance, launchCone);
+                break;
+            }
+            case GibType.Gib:
+            {
+                GibEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, launchGibs,
+                    launchDirection, launchImpulse, launchImpulseVariance, launchCone);
+                break;
+            }
+        }
+
+        if (playAudio)
+        {
+            _audioSystem.PlayPredicted(gibbable.Comp.GibSound, parentXform.Coordinates, null);
+        }
+
+        if (gibType == GibType.Gib)
+            QueueDel(gibbable);
+        return true;
+    }
+
+    private void DropEntity(Entity<GibbableComponent?> gibbable, TransformComponent parentXform, float randomSpreadMod,
+        ref HashSet<EntityUid> droppedEntities, bool flingEntity, Vector2? scatterDirection, float scatterImpulse,
+        float scatterImpulseVariance, Angle scatterCone)
+    {
+        var gibCount = 0;
+        if (Resolve(gibbable, ref gibbable.Comp, logMissing: false))
+        {
+            gibCount = gibbable.Comp.GibCount;
+        }
+
+        var gibAttemptEvent = new AttemptEntityGibEvent(gibbable, gibCount, GibType.Drop);
+        RaiseLocalEvent(gibbable, ref gibAttemptEvent);
+        switch (gibAttemptEvent.GibType)
+        {
+            case GibType.Skip:
+                return;
+            case GibType.Gib:
+                GibEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, flingEntity, scatterDirection,
+                    scatterImpulse, scatterImpulseVariance, scatterCone, deleteTarget: false);
+                return;
+        }
+
+        _transformSystem.AttachToGridOrMap(gibbable);
+        _transformSystem.SetCoordinates(gibbable, parentXform.Coordinates);
+        _transformSystem.SetWorldRotation(gibbable, _random.NextAngle());
+        droppedEntities.Add(gibbable);
+        if (flingEntity)
+        {
+            FlingDroppedEntity(gibbable, scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
+        }
+
+        var gibbedEvent = new EntityGibbedEvent(gibbable, new List<EntityUid> {gibbable});
+        RaiseLocalEvent(gibbable, ref gibbedEvent);
+    }
+
+    private List<EntityUid> GibEntity(Entity<GibbableComponent?> gibbable, TransformComponent parentXform,
+        float randomSpreadMod,
+        ref HashSet<EntityUid> droppedEntities, bool flingEntity, Vector2? scatterDirection, float scatterImpulse,
+        float scatterImpulseVariance, Angle scatterCone, bool deleteTarget = true)
+    {
+        var localGibs = new List<EntityUid>();
+        var gibCount = 0;
+        var gibProtoCount = 0;
+        if (Resolve(gibbable, ref gibbable.Comp, logMissing: false))
+        {
+            gibCount = gibbable.Comp.GibCount;
+            gibProtoCount = gibbable.Comp.GibPrototypes.Count;
+        }
+
+        var gibAttemptEvent = new AttemptEntityGibEvent(gibbable, gibCount, GibType.Drop);
+        RaiseLocalEvent(gibbable, ref gibAttemptEvent);
+        switch (gibAttemptEvent.GibType)
+        {
+            case GibType.Skip:
+                return localGibs;
+            case GibType.Drop:
+                DropEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, flingEntity,
+                    scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
+                localGibs.Add(gibbable);
+                return localGibs;
+        }
+
+        if (gibbable.Comp != null && gibProtoCount > 0)
+        {
+            if (flingEntity)
+            {
+                for (var i = 0; i < gibAttemptEvent.GibletCount; i++)
+                {
+                    if (!TryCreateRandomGiblet(gibbable.Comp, parentXform.Coordinates, false, out var giblet,
+                            randomSpreadMod))
+                        continue;
+                    FlingDroppedEntity(giblet.Value, scatterDirection, scatterImpulse, scatterImpulseVariance,
+                        scatterCone);
+                    droppedEntities.Add(giblet.Value);
+                }
+            }
+            else
+            {
+                for (var i = 0; i < gibAttemptEvent.GibletCount; i++)
+                {
+                    if (TryCreateRandomGiblet(gibbable.Comp, parentXform.Coordinates, false, out var giblet,
+                            randomSpreadMod))
+                        droppedEntities.Add(giblet.Value);
+                }
+            }
+        }
+
+        _transformSystem.AttachToGridOrMap(gibbable, Transform(gibbable));
+        if (flingEntity)
+        {
+            FlingDroppedEntity(gibbable, scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
+        }
+
+        var gibbedEvent = new EntityGibbedEvent(gibbable, localGibs);
+        RaiseLocalEvent(gibbable, ref gibbedEvent);
+        if (deleteTarget)
+            QueueDel(gibbable);
+        return localGibs;
+    }
+
+
+    public bool TryCreateRandomGiblet(Entity<GibbableComponent?> gibbable, [NotNullWhen(true)] out EntityUid? gibletEntity,
+        float randomSpreadModifier = 1.0f, bool playSound = true)
+    {
+        gibletEntity = null;
+        return Resolve(gibbable, ref gibbable.Comp) && TryCreateRandomGiblet(gibbable.Comp, Transform(gibbable).Coordinates,
+            playSound, out gibletEntity, randomSpreadModifier);
+    }
+
+    public bool TryCreateAndFlingRandomGiblet(Entity<GibbableComponent?> gibbable, [NotNullWhen(true)] out EntityUid? gibletEntity,
+        Vector2 scatterDirection, float force, float scatterImpulseVariance, Angle scatterCone = default,
+        bool playSound = true)
+    {
+        gibletEntity = null;
+        if (!Resolve(gibbable, ref gibbable.Comp) ||
+            !TryCreateRandomGiblet(gibbable.Comp, Transform(gibbable).Coordinates, playSound, out gibletEntity))
+            return false;
+        FlingDroppedEntity(gibletEntity.Value, scatterDirection, force, scatterImpulseVariance, scatterCone);
+        return true;
+    }
+
+    private void FlingDroppedEntity(EntityUid target, Vector2? direction, float impulse, float impulseVariance,
+        Angle scatterConeAngle)
+    {
+        var scatterAngle = direction?.ToAngle() ?? _random.NextAngle();
+        var scatterVector = _random.NextAngle(scatterAngle - scatterConeAngle / 2, scatterAngle + scatterConeAngle / 2)
+            .ToVec() * (impulse + _random.NextFloat(impulseVariance));
+        _physicsSystem.ApplyLinearImpulse(target, scatterVector);
+    }
+
+    private bool TryCreateRandomGiblet(GibbableComponent gibbable, EntityCoordinates coords,
+        bool playSound, [NotNullWhen(true)] out EntityUid? gibletEntity, float? randomSpreadModifier = null)
+    {
+        gibletEntity = null;
+        if (gibbable.GibPrototypes.Count == 0)
+            return false;
+        gibletEntity = Spawn(gibbable.GibPrototypes[_random.Next(0, gibbable.GibPrototypes.Count)],
+            randomSpreadModifier == null
+                ? coords
+                : coords.Offset(_random.NextVector2(gibbable.GibScatterRange * randomSpreadModifier.Value)));
+        if (playSound)
+            _audioSystem.PlayPredicted(gibbable.GibSound, coords, null);
+        _transformSystem.SetWorldRotation(gibletEntity.Value, _random.NextAngle());
+        return true;
+    }
+}
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
index 699fb64ee8d..b72a7c4eb3c 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
@@ -18,7 +18,6 @@ public abstract partial class SharedHandsSystem
     [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-    [Dependency] private readonly SharedItemSystem _items = default!;
     [Dependency] private readonly SharedStorageSystem _storage = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private readonly SharedVirtualItemSystem _virtualSystem = default!;
diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs
index 7ca4fac5b54..d4cca026ef0 100644
--- a/Content.Shared/Humanoid/NamingSystem.cs
+++ b/Content.Shared/Humanoid/NamingSystem.cs
@@ -26,6 +26,9 @@ public string GetName(string species, Gender? gender = null)
 
             switch (speciesProto.Naming)
             {
+                case SpeciesNaming.First:
+                    return Loc.GetString("namepreset-first",
+                        ("first", GetFirstName(speciesProto, gender)));
                 // Start of Nyano - Summary: for Oni naming
                 case SpeciesNaming.LastNoFirst:
                     return Loc.GetString("namepreset-lastnofirst",
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index e4adb4d55bb..909b618d597 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -124,6 +124,7 @@ public sealed partial class SpeciesPrototype : IPrototype
 
 public enum SpeciesNaming : byte
 {
+    First,
     FirstLast,
     FirstDashFirst,
     //Start of Nyano - Summary: for Oni naming
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 210e21c2c9d..cbbee3a85bd 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -51,7 +51,7 @@ public bool TryGetSlotContainer(EntityUid uid, string slot, [NotNullWhen(true)]
         if (!TryGetSlot(uid, slot, out slotDefinition, inventory: inventory))
             return false;
 
-        if (!containerComp.TryGetContainer(slotDefinition.Name, out var container))
+        if (!_containerSystem.TryGetContainer(uid, slotDefinition.Name, out var container, containerComp))
         {
             if (inventory.LifeStage >= ComponentLifeStage.Initialized)
                 Log.Error($"Missing inventory container {slot} on entity {ToPrettyString(uid)}");
diff --git a/Content.Shared/Kitchen/Components/SharedMicrowave.cs b/Content.Shared/Kitchen/Components/SharedMicrowave.cs
index ed07fd12871..fa123689841 100644
--- a/Content.Shared/Kitchen/Components/SharedMicrowave.cs
+++ b/Content.Shared/Kitchen/Components/SharedMicrowave.cs
@@ -54,13 +54,16 @@ public sealed class MicrowaveUpdateUserInterfaceState : BoundUserInterfaceState
         public int ActiveButtonIndex;
         public uint CurrentCookTime;
 
+        public TimeSpan CurrentCookTimeEnd;
+
         public MicrowaveUpdateUserInterfaceState(NetEntity[] containedSolids,
-            bool isMicrowaveBusy, int activeButtonIndex, uint currentCookTime)
+            bool isMicrowaveBusy, int activeButtonIndex, uint currentCookTime, TimeSpan currentCookTimeEnd)
         {
             ContainedSolids = containedSolids;
             IsMicrowaveBusy = isMicrowaveBusy;
             ActiveButtonIndex = activeButtonIndex;
             CurrentCookTime = currentCookTime;
+            CurrentCookTimeEnd = currentCookTimeEnd;
         }
 
     }
diff --git a/Content.Shared/Lock/LockComponent.cs b/Content.Shared/Lock/LockComponent.cs
index b3c46597498..5587fc2698b 100644
--- a/Content.Shared/Lock/LockComponent.cs
+++ b/Content.Shared/Lock/LockComponent.cs
@@ -113,3 +113,10 @@ public override DoAfterEvent Clone()
         return this;
     }
 }
+
+[NetSerializable]
+[Serializable]
+public enum LockVisuals : byte
+{
+    Locked
+}
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index e5f53b4080e..a01c5ace4d4 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -7,11 +7,9 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
 
@@ -46,8 +44,7 @@ public override void Initialize()
 
     private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
     {
-        _appearanceSystem.SetData(uid, StorageVisuals.CanLock, true);
-        _appearanceSystem.SetData(uid, StorageVisuals.Locked, lockComp.Locked);
+        _appearanceSystem.SetData(uid, LockVisuals.Locked, lockComp.Locked);
     }
 
     private void OnActivated(EntityUid uid, LockComponent lockComp, ActivateInWorldEvent args)
@@ -124,7 +121,7 @@ public bool TryLock(EntityUid uid, EntityUid user, LockComponent? lockComp = nul
         _audio.PlayPredicted(lockComp.LockSound, uid, user);
 
         lockComp.Locked = true;
-        _appearanceSystem.SetData(uid, StorageVisuals.Locked, true);
+        _appearanceSystem.SetData(uid, LockVisuals.Locked, true);
         Dirty(uid, lockComp);
 
         var ev = new LockToggledEvent(true);
@@ -155,7 +152,7 @@ public void Unlock(EntityUid uid, EntityUid? user, LockComponent? lockComp = nul
         _audio.PlayPredicted(lockComp.UnlockSound, uid, user);
 
         lockComp.Locked = false;
-        _appearanceSystem.SetData(uid, StorageVisuals.Locked, false);
+        _appearanceSystem.SetData(uid, LockVisuals.Locked, false);
         Dirty(uid, lockComp);
 
         var ev = new LockToggledEvent(false);
@@ -250,7 +247,7 @@ private void OnEmagged(EntityUid uid, LockComponent component, ref GotEmaggedEve
         if (!component.Locked || !component.BreakOnEmag)
             return;
         _audio.PlayPredicted(component.UnlockSound, uid, null);
-        _appearanceSystem.SetData(uid, StorageVisuals.Locked, false);
+        _appearanceSystem.SetData(uid, LockVisuals.Locked, false);
         RemComp<LockComponent>(uid); //Literally destroys the lock as a tell it was emagged
         args.Handled = true;
     }
diff --git a/Content.Shared/Mind/Components/IsDeadICComponent.cs b/Content.Shared/Mind/Components/IsDeadICComponent.cs
new file mode 100644
index 00000000000..d62743d912c
--- /dev/null
+++ b/Content.Shared/Mind/Components/IsDeadICComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Shared.Mind.Components;
+
+[RegisterComponent]
+public sealed partial class IsDeadICComponent : Component
+{
+}
+
+
diff --git a/Content.Shared/Mind/IsDeadICSystem.cs b/Content.Shared/Mind/IsDeadICSystem.cs
new file mode 100644
index 00000000000..6716f381152
--- /dev/null
+++ b/Content.Shared/Mind/IsDeadICSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Mind.Components;
+
+namespace Content.Shared.Mind;
+
+/// <summary>
+/// This marks any entity with the component as dead
+/// for stuff like objectives & round-end
+/// used for nymphs & reformed diona.
+/// </summary>
+public sealed class IsDeadICSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<IsDeadICComponent, GetCharactedDeadIcEvent>(OnGetDeadIC);
+    }
+
+    private void OnGetDeadIC(EntityUid uid, IsDeadICComponent component, ref GetCharactedDeadIcEvent args)
+    {
+        args.Dead = true;
+    }
+}
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index 6fb8c64b8e7..bce3aeff527 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -57,13 +57,8 @@ private void InitializeInput()
 
             SubscribeLocalEvent<FollowedComponent, EntParentChangedMessage>(OnFollowedParentChange);
 
-            _configManager.OnValueChanged(CCVars.CameraRotationLocked, SetCameraRotationLocked, true);
-            _configManager.OnValueChanged(CCVars.GameDiagonalMovement, SetDiagonalMovement, true);
-        }
-
-        private void SetCameraRotationLocked(bool obj)
-        {
-            CameraRotationLocked = obj;
+            Subs.CVar(_configManager, CCVars.CameraRotationLocked, obj => CameraRotationLocked = obj, true);
+            Subs.CVar(_configManager, CCVars.GameDiagonalMovement, value => DiagonalMovementEnabled = value, true);
         }
 
         /// <summary>
@@ -141,14 +136,10 @@ private void OnMoverGetState(EntityUid uid, InputMoverComponent component, ref C
         private void ShutdownInput()
         {
             CommandBinds.Unregister<SharedMoverController>();
-            _configManager.UnsubValueChanged(CCVars.CameraRotationLocked, SetCameraRotationLocked);
-            _configManager.UnsubValueChanged(CCVars.GameDiagonalMovement, SetDiagonalMovement);
         }
 
         public bool DiagonalMovementEnabled { get; private set; }
 
-        private void SetDiagonalMovement(bool value) => DiagonalMovementEnabled = value;
-
         protected virtual void HandleShuttleInput(EntityUid uid, ShuttleButtons button, ushort subTick, bool state) {}
 
         private void OnAutoParentChange(EntityUid uid, AutoOrientComponent component, ref EntParentChangedMessage args)
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
index 846fbfaf7e0..8568290bffb 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
@@ -57,8 +57,8 @@ public void SetRelay(EntityUid uid, EntityUid relayEntity)
         Physics.UpdateIsPredicted(relayEntity);
         component.RelayEntity = relayEntity;
         targetComp.Source = uid;
-        Dirty(component);
-        Dirty(targetComp);
+        Dirty(uid, component);
+        Dirty(relayEntity, targetComp);
     }
 
     private void OnRelayShutdown(EntityUid uid, RelayInputMoverComponent component, ComponentShutdown args)
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 49ad40ae596..4d9eedbf7c4 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -94,20 +94,15 @@ public override void Initialize()
 
             InitializeInput();
             InitializeRelay();
-            _configManager.OnValueChanged(CCVars.RelativeMovement, SetRelativeMovement, true);
-            _configManager.OnValueChanged(CCVars.StopSpeed, SetStopSpeed, true);
+            Subs.CVar(_configManager, CCVars.RelativeMovement, value => _relativeMovement = value, true);
+            Subs.CVar(_configManager, CCVars.StopSpeed, value => _stopSpeed = value, true);
             UpdatesBefore.Add(typeof(TileFrictionController));
         }
 
-        private void SetRelativeMovement(bool value) => _relativeMovement = value;
-        private void SetStopSpeed(float value) => _stopSpeed = value;
-
         public override void Shutdown()
         {
             base.Shutdown();
             ShutdownInput();
-            _configManager.UnsubValueChanged(CCVars.RelativeMovement, SetRelativeMovement);
-            _configManager.UnsubValueChanged(CCVars.StopSpeed, SetStopSpeed);
         }
 
         public override void UpdateAfterSolve(bool prediction, float frameTime)
diff --git a/Content.Shared/Nuke/SharedNuke.cs b/Content.Shared/Nuke/SharedNuke.cs
index 1c471e11c66..c845ed6c2a6 100644
--- a/Content.Shared/Nuke/SharedNuke.cs
+++ b/Content.Shared/Nuke/SharedNuke.cs
@@ -3,6 +3,27 @@
 
 namespace Content.Shared.Nuke
 {
+    public enum NukeVisualLayers
+    {
+        Base,
+        Unlit
+    }
+
+    [NetSerializable, Serializable]
+    public enum NukeVisuals
+    {
+        Deployed,
+        State,
+    }
+
+    [NetSerializable, Serializable]
+    public enum NukeVisualState
+    {
+        Idle,
+        Armed,
+        YoureFucked
+    }
+
     [Serializable, NetSerializable]
     public enum NukeUiKey : byte
     {
diff --git a/Content.Shared/Nutrition/Components/SealableComponent.cs b/Content.Shared/Nutrition/Components/SealableComponent.cs
new file mode 100644
index 00000000000..1c2f732e7a9
--- /dev/null
+++ b/Content.Shared/Nutrition/Components/SealableComponent.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Nutrition.Components;
+
+/// <summary>
+/// Represents a tamper-evident seal on an Openable.
+/// Only affects the Examine text.
+/// Once the seal has been broken, it cannot be resealed.
+/// </summary>
+[NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, Access(typeof(SealableSystem))]
+public sealed partial class SealableComponent : Component
+{
+    /// <summary>
+    /// Whether the item's seal is intact (i.e. it has never been opened)
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Sealed = true;
+
+    /// <summary>
+    /// Text shown when examining and the item's seal has not been broken.
+    /// </summary>
+    [DataField]
+    public LocId ExamineTextSealed = "drink-component-on-examine-is-sealed";
+
+    /// <summary>
+    /// Text shown when examining and the item's seal has been broken.
+    /// </summary>
+    [DataField]
+    public LocId ExamineTextUnsealed = "drink-component-on-examine-is-unsealed";
+}
diff --git a/Content.Shared/Nutrition/Components/SharedFoodComponent.cs b/Content.Shared/Nutrition/Components/SharedFoodComponent.cs
index 99ddabd3ce4..07c02fb22b2 100644
--- a/Content.Shared/Nutrition/Components/SharedFoodComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedFoodComponent.cs
@@ -16,4 +16,11 @@ public enum OpenableVisuals : byte
         Opened,
         Layer
     }
+
+    [Serializable, NetSerializable]
+    public enum SealableVisuals : byte
+    {
+        Sealed,
+        Layer,
+    }
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs b/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs
new file mode 100644
index 00000000000..b0873f23a12
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs
@@ -0,0 +1,59 @@
+using Content.Shared.Examine;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Nutrition.Components;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+public sealed partial class SealableSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SealableComponent, ExaminedEvent>(OnExamined, after: new[] { typeof(SharedOpenableSystem) });
+        SubscribeLocalEvent<SealableComponent, OpenableOpenedEvent>(OnOpened);
+    }
+
+    private void OnExamined(EntityUid uid, SealableComponent comp, ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        var sealedText = comp.Sealed ? Loc.GetString(comp.ExamineTextSealed) : Loc.GetString(comp.ExamineTextUnsealed);
+
+        args.PushMarkup(sealedText);
+    }
+
+    private void OnOpened(EntityUid uid, SealableComponent comp, OpenableOpenedEvent args)
+    {
+        comp.Sealed = false;
+
+        Dirty(uid, comp);
+
+        UpdateAppearance(uid, comp);
+    }
+
+    /// <summary>
+    /// Update seal visuals to the current value.
+    /// </summary>
+    public void UpdateAppearance(EntityUid uid, SealableComponent? comp = null, AppearanceComponent? appearance = null)
+    {
+        if (!Resolve(uid, ref comp))
+            return;
+
+        _appearance.SetData(uid, SealableVisuals.Sealed, comp.Sealed, appearance);
+    }
+
+    /// <summary>
+    /// Returns true if the entity's seal is intact.
+    /// Items without SealableComponent are considered unsealed.
+    /// </summary>
+    public bool IsSealed(EntityUid uid, SealableComponent? comp = null)
+    {
+        if (!Resolve(uid, ref comp, false))
+            return false;
+
+        return comp.Sealed;
+    }
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs
new file mode 100644
index 00000000000..274de89003a
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs
@@ -0,0 +1,17 @@
+namespace Content.Shared.Nutrition.EntitySystems;
+
+public abstract partial class SharedOpenableSystem : EntitySystem
+{
+}
+
+/// <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/Paper/SharedPaperComponent.cs b/Content.Shared/Paper/SharedPaperComponent.cs
index 1e654cc68ae..dd87f9f907a 100644
--- a/Content.Shared/Paper/SharedPaperComponent.cs
+++ b/Content.Shared/Paper/SharedPaperComponent.cs
@@ -1,9 +1,16 @@
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Paper;
 
 public abstract partial class SharedPaperComponent : Component
 {
+    /// <summary>
+    /// Sound played after writing to the paper.
+    /// </summary>
+    [DataField("sound")]
+    public SoundSpecifier? Sound { get; private set; } = new SoundCollectionSpecifier("PaperScribbles", AudioParams.Default.WithVariation(0.1f));
+
     [Serializable, NetSerializable]
     public sealed class PaperBoundUserInterfaceState : BoundUserInterfaceState
     {
diff --git a/Content.Shared/Pinpointer/SharedPinpointerSystem.cs b/Content.Shared/Pinpointer/SharedPinpointerSystem.cs
index 43550f29195..7f6b8891255 100644
--- a/Content.Shared/Pinpointer/SharedPinpointerSystem.cs
+++ b/Content.Shared/Pinpointer/SharedPinpointerSystem.cs
@@ -41,7 +41,7 @@ private void OnAfterInteract(EntityUid uid, PinpointerComponent component, After
     /// <summary>
     ///     Set pinpointers target to track
     /// </summary>
-    public void SetTarget(EntityUid uid, EntityUid? target, PinpointerComponent? pinpointer = null)
+    public virtual void SetTarget(EntityUid uid, EntityUid? target, PinpointerComponent? pinpointer = null)
     {
         if (!Resolve(uid, ref pinpointer))
             return;
@@ -84,7 +84,7 @@ public void SetDistance(EntityUid uid, Distance distance, PinpointerComponent? p
             return;
 
         pinpointer.DistanceToTarget = distance;
-        Dirty(pinpointer);
+        Dirty(uid, pinpointer);
     }
 
     /// <summary>
@@ -101,7 +101,7 @@ public bool TrySetArrowAngle(EntityUid uid, Angle arrowAngle, PinpointerComponen
             return false;
 
         pinpointer.ArrowAngle = arrowAngle;
-        Dirty(pinpointer);
+        Dirty(uid, pinpointer);
 
         return true;
     }
@@ -117,7 +117,7 @@ public void SetActive(EntityUid uid, bool isActive, PinpointerComponent? pinpoin
             return;
 
         pinpointer.IsActive = isActive;
-        Dirty(pinpointer);
+        Dirty(uid, pinpointer);
     }
 
 
@@ -125,7 +125,7 @@ public void SetActive(EntityUid uid, bool isActive, PinpointerComponent? pinpoin
     ///     Toggle Pinpointer screen. If it has target it will start tracking it.
     /// </summary>
     /// <returns>True if pinpointer was activated, false otherwise</returns>
-    public bool TogglePinpointer(EntityUid uid, PinpointerComponent? pinpointer = null)
+    public virtual bool TogglePinpointer(EntityUid uid, PinpointerComponent? pinpointer = null)
     {
         if (!Resolve(uid, ref pinpointer))
             return false;
diff --git a/Content.Shared/Placeable/ItemPlacerSystem.cs b/Content.Shared/Placeable/ItemPlacerSystem.cs
index f2fe58adcb8..9be6a4acd5a 100644
--- a/Content.Shared/Placeable/ItemPlacerSystem.cs
+++ b/Content.Shared/Placeable/ItemPlacerSystem.cs
@@ -11,7 +11,6 @@ public sealed class ItemPlacerSystem : EntitySystem
 {
     [Dependency] private readonly CollisionWakeSystem _wake = default!;
     [Dependency] private readonly PlaceableSurfaceSystem _placeableSurface = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs b/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs
index 1c39997f30d..9cd11ae6045 100644
--- a/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs
+++ b/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs
@@ -1,12 +1,7 @@
-using Content.Shared.DoAfter;
-
 namespace Content.Shared.Power.Generator;
 
 public sealed class ActiveGeneratorRevvingSystem: EntitySystem
 {
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly EntityManager _entity = default!;
-
     public override void Initialize()
     {
         base.Initialize();
diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
index 402b424fb6d..187c8d8a9d8 100644
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -34,7 +34,6 @@ public sealed class RCDSystem : EntitySystem
     [Dependency] private readonly SharedChargesSystem _charges = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
diff --git a/Content.Shared/Roles/MindGetAllRolesEvent.cs b/Content.Shared/Roles/MindGetAllRolesEvent.cs
index 9313d94edfd..69878739084 100644
--- a/Content.Shared/Roles/MindGetAllRolesEvent.cs
+++ b/Content.Shared/Roles/MindGetAllRolesEvent.cs
@@ -16,4 +16,5 @@ namespace Content.Shared.Roles;
 /// <param name="Name">Name of the role.</param>
 /// <param name="Antagonist">Whether or not this role makes this player an antagonist.</param>
 /// <param name="PlayTimeTrackerId">The <see cref="PlayTimeTrackerPrototype"/> id associated with the role.</param>
-public readonly record struct RoleInfo(Component Component, string Name, bool Antagonist, string? PlayTimeTrackerId);
+/// <param name="Prototype">The prototype ID of the role</param>
+public readonly record struct RoleInfo(Component Component, string Name, bool Antagonist, string? PlayTimeTrackerId, string Prototype);
diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index 05d6ab9f37f..24db1d56774 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -27,16 +27,18 @@ public override void Initialize()
     private void OnJobGetAllRoles(EntityUid uid, JobComponent component, ref MindGetAllRolesEvent args)
     {
         var name = "game-ticker-unknown-role";
+        var prototype = "";
         string? playTimeTracker = null;
         if (component.Prototype != null && _prototypes.TryIndex(component.Prototype, out JobPrototype? job))
         {
             name = job.Name;
+            prototype = job.ID;
             playTimeTracker = job.PlayTimeTracker;
         }
 
         name = Loc.GetString(name);
 
-        args.Roles.Add(new RoleInfo(component, name, false, playTimeTracker));
+        args.Roles.Add(new RoleInfo(component, name, false, playTimeTracker, prototype));
     }
 
     protected void SubscribeAntagEvents<T>() where T : AntagonistRoleComponent
@@ -44,13 +46,15 @@ protected void SubscribeAntagEvents<T>() where T : AntagonistRoleComponent
         SubscribeLocalEvent((EntityUid _, T component, ref MindGetAllRolesEvent args) =>
         {
             var name = "game-ticker-unknown-role";
+            var prototype = "";
             if (component.PrototypeId != null && _prototypes.TryIndex(component.PrototypeId, out AntagPrototype? antag))
             {
                 name = antag.Name;
+                prototype = antag.ID;
             }
             name = Loc.GetString(name);
 
-            args.Roles.Add(new RoleInfo(component, name, true, null));
+            args.Roles.Add(new RoleInfo(component, name, true, null, prototype));
         });
 
         SubscribeLocalEvent((EntityUid _, T _, ref MindIsAntagonistEvent args) => args.IsAntagonist = true);
diff --git a/Content.Shared/Security/DeployableBarrierVisuals.cs b/Content.Shared/Security/DeployableBarrierVisuals.cs
deleted file mode 100644
index 147ae23bac0..00000000000
--- a/Content.Shared/Security/DeployableBarrierVisuals.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Security
-{
-    [Serializable, NetSerializable]
-    public enum DeployableBarrierVisuals : byte
-    {
-        State
-    }
-
-
-    [Serializable, NetSerializable]
-    public enum DeployableBarrierState : byte
-    {
-        Idle,
-        Deployed
-    }
-}
diff --git a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
index 9d021c52194..7b9ce841a99 100644
--- a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
+++ b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
@@ -8,7 +8,6 @@ namespace Content.Shared.Security.Systems;
 
 public sealed class DeployableBarrierSystem : EntitySystem
 {
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly FixtureSystem _fixtures = default!;
     [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
@@ -55,9 +54,6 @@ private void ToggleBarrierDeploy(EntityUid uid, bool isDeployed, DeployableBarri
                 _physics.SetHard(uid, fixture, false);
         }
 
-        var state = isDeployed ? DeployableBarrierState.Deployed : DeployableBarrierState.Idle;
-        _appearance.SetData(uid, DeployableBarrierVisuals.State, state);
-
         if (TryComp(uid, out SharedPullableComponent? pullable))
             _pulling.TryStopPull(pullable);
 
diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
index 9aa0aa9a381..c0619e6e43d 100644
--- a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
+++ b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
@@ -21,6 +21,14 @@ public override void Initialize()
 
     protected virtual void OnAttemptEmag(EntityUid uid, EmagSiliconLawComponent component, ref OnAttemptEmagEvent args)
     {
+        //prevent self emagging
+        if (uid == args.UserUid)
+        {
+            _popup.PopupClient(Loc.GetString("law-emag-cannot-emag-self"), uid, args.UserUid);
+            args.Handled = true;
+            return;
+        }
+
         if (component.RequireOpenPanel &&
             TryComp<WiresPanelComponent>(uid, out var panel) &&
             !panel.Open)
diff --git a/Content.Shared/Species/Components/GibActionComponent.cs b/Content.Shared/Species/Components/GibActionComponent.cs
new file mode 100644
index 00000000000..bed94f047ec
--- /dev/null
+++ b/Content.Shared/Species/Components/GibActionComponent.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Mobs;
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Species.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class GibActionComponent : Component
+{
+    /// <summary>
+    /// The action to use.
+    /// </summary>
+    [DataField("actionPrototype", required: true)]
+    public EntProtoId ActionPrototype;
+
+    [DataField, AutoNetworkedField] 
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// What mob states the action will appear in
+    /// </summary>
+    [DataField("allowedStates"), ViewVariables(VVAccess.ReadWrite)]
+    public List<MobState> AllowedStates = new();
+
+    /// <summary>
+    /// The text that appears when attempting to split.
+    /// </summary>
+    [DataField("popupText")]
+    public string PopupText = "diona-gib-action-use";
+}
diff --git a/Content.Shared/Species/Components/NymphComponent.cs b/Content.Shared/Species/Components/NymphComponent.cs
new file mode 100644
index 00000000000..e8fe2f367e2
--- /dev/null
+++ b/Content.Shared/Species/Components/NymphComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Species.Components;
+/// <summary>
+/// This will replace one entity with another entity when it is removed from a body part.
+/// Obviously hyper-specific. If you somehow find another use for this, good on you. 
+/// </summary>
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class NymphComponent : Component
+{
+    /// <summary>
+    /// The entity to replace the organ with.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId EntityPrototype = default!;
+
+    /// <summary>
+    /// Whether to transfer the mind to this new entity.
+    /// </summary>
+    [DataField]
+    public bool TransferMind = false;
+}
diff --git a/Content.Shared/Species/Components/ReformComponent.cs b/Content.Shared/Species/Components/ReformComponent.cs
new file mode 100644
index 00000000000..724c9dc3302
--- /dev/null
+++ b/Content.Shared/Species/Components/ReformComponent.cs
@@ -0,0 +1,48 @@
+    using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Species.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ReformComponent : Component
+{
+    /// <summary>
+    /// The action to use.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId ActionPrototype = default!;
+
+    [DataField, AutoNetworkedField] 
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// How long it will take to reform
+    /// </summary>
+    [DataField(required: true)]
+    public float ReformTime = 0;
+
+    /// <summary>
+    /// Whether or not the entity should start with a cooldown
+    /// </summary>
+    [DataField]
+    public bool StartDelayed = true;
+
+    /// <summary>
+    /// Whether or not the entity should be stunned when reforming at all
+    /// </summary>
+    [DataField]
+    public bool ShouldStun = true;
+
+    /// <summary>
+    /// The text that appears when attempting to reform
+    /// </summary>
+    [DataField(required: true)]
+    public string PopupText;
+
+    /// <summary>
+    /// The mob that our entity will reform into
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId ReformPrototype { get; private set; }
+}
diff --git a/Content.Shared/Species/Systems/GibActionSystem.cs b/Content.Shared/Species/Systems/GibActionSystem.cs
new file mode 100644
index 00000000000..bd7cb6baffa
--- /dev/null
+++ b/Content.Shared/Species/Systems/GibActionSystem.cs
@@ -0,0 +1,61 @@
+using Content.Shared.Species.Components;
+using Content.Shared.Actions;
+using Content.Shared.Body.Systems;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Popups;
+using Robust.Shared.Prototypes;
+
+
+namespace Content.Shared.Species;
+
+public sealed partial class GibActionSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GibActionComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<GibActionComponent, GibActionEvent>(OnGibAction);
+    }
+
+    private void OnMobStateChanged(EntityUid uid, GibActionComponent comp, MobStateChangedEvent args)
+    {
+        // When the mob changes state, check if they're dead and give them the action if so. 
+        if (!TryComp<MobStateComponent>(uid, out var mobState))
+            return;
+
+        if (!_protoManager.TryIndex<EntityPrototype>(comp.ActionPrototype, out var actionProto))
+            return;
+
+
+        foreach (var allowedState in comp.AllowedStates)
+        {
+            if(allowedState == mobState.CurrentState)
+            {
+                // The mob should never have more than 1 state so I don't see this being an issue
+                _actionsSystem.AddAction(uid, ref comp.ActionEntity, comp.ActionPrototype);
+                return;
+            }
+        }
+
+        // If they aren't given the action, remove it.
+        _actionsSystem.RemoveAction(uid, comp.ActionEntity);
+    }
+    
+    private void OnGibAction(EntityUid uid, GibActionComponent comp, GibActionEvent args)
+    {
+        // When they use the action, gib them.
+        _popupSystem.PopupClient(Loc.GetString(comp.PopupText, ("name", uid)), uid, uid);
+        _bodySystem.GibBody(uid, true);
+    }
+       
+
+
+    public sealed partial class GibActionEvent : InstantActionEvent { } 
+}
diff --git a/Content.Shared/Species/Systems/ReformSystem.cs b/Content.Shared/Species/Systems/ReformSystem.cs
new file mode 100644
index 00000000000..a013a7f8864
--- /dev/null
+++ b/Content.Shared/Species/Systems/ReformSystem.cs
@@ -0,0 +1,108 @@
+using Content.Shared.Species.Components;
+using Content.Shared.Actions;
+using Content.Shared.DoAfter;
+using Content.Shared.Popups;
+using Content.Shared.Stunnable;
+using Content.Shared.Mind;
+using Content.Shared.Humanoid;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
+using Robust.Shared.Serialization.Manager;
+
+namespace Content.Shared.Species;
+
+public sealed partial class ReformSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly INetManager _netMan = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly SharedStunSystem _stunSystem = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+    [Dependency] private readonly MetaDataSystem _metaData = default!;
+    [Dependency] private readonly ISerializationManager _serializationManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ReformComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ReformComponent, ComponentShutdown>(OnCompRemove);
+
+        SubscribeLocalEvent<ReformComponent, ReformEvent>(OnReform);
+        SubscribeLocalEvent<ReformComponent, ReformDoAfterEvent>(OnDoAfter);
+    }
+
+    private void OnMapInit(EntityUid uid, ReformComponent comp, MapInitEvent args)
+    {
+        // When the map is initialized, give them the action
+        if (comp.ActionPrototype != default && !_protoManager.TryIndex<EntityPrototype>(comp.ActionPrototype, out var actionProto))
+            return;
+
+        _actionsSystem.AddAction(uid, ref comp.ActionEntity, out var reformAction, comp.ActionPrototype);
+
+        // See if the action should start with a delay, and give it that starting delay if so.
+        if (comp.StartDelayed && reformAction != null && reformAction.UseDelay != null)
+        {
+            var start = _gameTiming.CurTime;
+            var end = _gameTiming.CurTime + reformAction.UseDelay.Value;
+
+            _actionsSystem.SetCooldown(comp.ActionEntity!.Value, start, end);
+        }
+    }
+
+    private void OnCompRemove(EntityUid uid, ReformComponent comp, ComponentShutdown args)
+    {
+        _actionsSystem.RemoveAction(uid, comp.ActionEntity);
+    }
+
+    private void OnReform(EntityUid uid, ReformComponent comp, ReformEvent args)
+    {
+        // Stun them when they use the action for the amount of reform time.
+        if (comp.ShouldStun)
+            _stunSystem.TryStun(uid, TimeSpan.FromSeconds(comp.ReformTime), true);
+        _popupSystem.PopupClient(Loc.GetString(comp.PopupText, ("name", uid)), uid, uid);
+
+        // Create a doafter & start it
+        var doAfter = new DoAfterArgs(EntityManager, uid, comp.ReformTime, new ReformDoAfterEvent(), uid)
+        {
+            BreakOnUserMove = true,
+            BlockDuplicate = true,
+            BreakOnDamage = true,
+            CancelDuplicate = true,
+            RequireCanInteract = false,
+        };
+
+        _doAfterSystem.TryStartDoAfter(doAfter);
+        args.Handled = true;
+    }
+
+    private void OnDoAfter(EntityUid uid, ReformComponent comp, ReformDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || comp.Deleted)
+            return;
+
+        if (_netMan.IsClient)
+            return;
+
+        // Spawn a new entity
+        // This is, to an extent, taken from polymorph. I don't use polymorph for various reasons- most notably that this is permanent. 
+        var child = Spawn(comp.ReformPrototype, Transform(uid).Coordinates);
+
+        // This transfers the mind to the new entity
+        if (_mindSystem.TryGetMind(uid, out var mindId, out var mind))
+                _mindSystem.TransferTo(mindId, child, mind: mind);
+
+        // Delete the old entity
+        QueueDel(uid);
+    }
+
+    public sealed partial class ReformEvent : InstantActionEvent { } 
+    
+    [Serializable, NetSerializable]
+    public sealed partial class ReformDoAfterEvent : SimpleDoAfterEvent { }
+}
diff --git a/Content.Shared/Spider/SharedSpiderSystem.cs b/Content.Shared/Spider/SharedSpiderSystem.cs
index 2795d64b939..33473303aa9 100644
--- a/Content.Shared/Spider/SharedSpiderSystem.cs
+++ b/Content.Shared/Spider/SharedSpiderSystem.cs
@@ -7,7 +7,6 @@ namespace Content.Shared.Spider;
 public abstract class SharedSpiderSystem : EntitySystem
 {
     [Dependency] private readonly SharedActionsSystem _action = default!;
-    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
index 1e784797e33..529e321f8da 100644
--- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
+++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
@@ -24,7 +24,6 @@ public abstract class SharedSprayPainterSystem : EntitySystem
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!;
     [Dependency] private   readonly SharedPopupSystem _popup = default!;
-    [Dependency] private   readonly SharedUserInterfaceSystem _ui = default!;
 
     public List<AirlockStyle> Styles { get; private set; } = new();
     public List<AirlockGroupPrototype> Groups { get; private set; } = new();
diff --git a/Content.Shared/StatusIcon/StatusIconPrototype.cs b/Content.Shared/StatusIcon/StatusIconPrototype.cs
index 1523ff4e0ad..a313f55c057 100644
--- a/Content.Shared/StatusIcon/StatusIconPrototype.cs
+++ b/Content.Shared/StatusIcon/StatusIconPrototype.cs
@@ -34,6 +34,12 @@ public int CompareTo(StatusIconData? other)
     {
         return Priority.CompareTo(other?.Priority ?? int.MaxValue);
     }
+
+    /// <summary>
+    /// The layer the icon is displayed on. Mod is drawn above Base. Base | Mod
+    /// </summary>
+    [DataField]
+    public StatusIconLayer Layer = StatusIconLayer.Base;
 }
 
 /// <summary>
@@ -63,3 +69,9 @@ public enum StatusIconLocationPreference : byte
     Left,
     Right,
 }
+
+public enum StatusIconLayer : byte
+{
+    Base,
+    Mod,
+}
diff --git a/Content.Shared/Stealth/SharedStealthSystem.cs b/Content.Shared/Stealth/SharedStealthSystem.cs
index aeb42453ca0..d0ea8045347 100644
--- a/Content.Shared/Stealth/SharedStealthSystem.cs
+++ b/Content.Shared/Stealth/SharedStealthSystem.cs
@@ -10,7 +10,6 @@ namespace Content.Shared.Stealth;
 public abstract class SharedStealthSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
index cf548693f9d..c87174ba88c 100644
--- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
@@ -141,7 +141,7 @@ private void OnDoAfter(EntityUid uid, DumpableComponent component, DoAfterEvent
         {
             var transform = Transform(entity);
             _container.AttachParentToContainerOrGrid((entity, transform));
-            _transformSystem.SetLocalPositionRotation(transform, transform.LocalPosition + _random.NextVector2Box() / 2, _random.NextAngle());
+            _transformSystem.SetLocalPositionRotation(entity, transform.LocalPosition + _random.NextVector2Box() / 2, _random.NextAngle(), transform);
         }
 
         if (args.Args.Target == null)
diff --git a/Content.Shared/Storage/StorageComponent.cs b/Content.Shared/Storage/StorageComponent.cs
index fa06e333e80..35f7955349c 100644
--- a/Content.Shared/Storage/StorageComponent.cs
+++ b/Content.Shared/Storage/StorageComponent.cs
@@ -207,8 +207,6 @@ public enum StorageVisuals : byte
     {
         Open,
         HasContents,
-        CanLock,
-        Locked,
         StorageUsed,
         Capacity
     }
diff --git a/Content.Shared/SubFloor/SubFloorHideComponent.cs b/Content.Shared/SubFloor/SubFloorHideComponent.cs
index 284a4b871f5..3b29388fa89 100644
--- a/Content.Shared/SubFloor/SubFloorHideComponent.cs
+++ b/Content.Shared/SubFloor/SubFloorHideComponent.cs
@@ -45,5 +45,12 @@ public sealed partial class SubFloorHideComponent : Component
         /// </summary>
         [DataField("visibleLayers")]
         public HashSet<Enum> VisibleLayers = new() { SubfloorLayers.FirstLayer };
+
+        /// <summary>
+        /// This is used for storing the original draw depth of a t-ray revealed entity.
+        /// e.g. when a t-ray revealed cable is drawn above a carpet.
+        /// </summary>
+        [DataField]
+        public int? OriginalDrawDepth;
     }
 }
diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs
index 04aa100cd1d..1f8408319d3 100644
--- a/Content.Shared/Tiles/FloorTileSystem.cs
+++ b/Content.Shared/Tiles/FloorTileSystem.cs
@@ -27,7 +27,6 @@ public sealed class FloorTileSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly INetManager _netManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
diff --git a/Content.Shared/UserInterface/OpenUiActionEvent.cs b/Content.Shared/UserInterface/OpenUiActionEvent.cs
index 3053861ea15..1c5ca3d62c7 100644
--- a/Content.Shared/UserInterface/OpenUiActionEvent.cs
+++ b/Content.Shared/UserInterface/OpenUiActionEvent.cs
@@ -1,23 +1,10 @@
 using Content.Shared.Actions;
-using Robust.Shared.Reflection;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 namespace Content.Shared.UserInterface;
 
-public sealed partial class OpenUiActionEvent : InstantActionEvent, ISerializationHooks
+public sealed partial class OpenUiActionEvent : InstantActionEvent
 {
-    [ViewVariables]
+    [DataField(required: true, customTypeSerializer: typeof(EnumSerializer))]
     public Enum? Key { get; private set; }
-
-    [DataField("key", required: true)]
-    private string _keyRaw = default!;
-
-    void ISerializationHooks.AfterDeserialization()
-    {
-        var reflectionManager = IoCManager.Resolve<IReflectionManager>();
-        if (reflectionManager.TryParseEnumReference(_keyRaw, out var key))
-            Key = key;
-        else
-            Logger.Error($"Invalid UI key ({_keyRaw}) in open-UI action");
-    }
 }
diff --git a/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs b/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs
index 5ad157c747c..8f9de2c2f82 100644
--- a/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs
+++ b/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs
@@ -4,7 +4,7 @@
 
 namespace Content.Tests.Shared.Chemistry
 {
-    [TestFixture, TestOf(typeof(FixedPoint2))]
+    [TestFixture, TestOf(typeof(FixedPoint2)), Parallelizable]
     public sealed class FixedPoint2_Tests
     {
         [Test]
@@ -18,8 +18,11 @@ public void FixedPoint2IntegerTests(int value, string expected)
         }
 
         [Test]
-        [TestCase(1.001f, "1")]
-        [TestCase(0.999f, "1")]
+        [TestCase(0.999f, "0.99")]
+        [TestCase(1.005f, "1")]
+        [TestCase(1.015f, "1.01")]
+        [TestCase(1.05f, "1.05")]
+        [TestCase(-1.05f, "-1.05")]
         public void FixedPoint2FloatTests(float value, string expected)
         {
             var result = FixedPoint2.New(value);
@@ -27,8 +30,10 @@ public void FixedPoint2FloatTests(float value, string expected)
         }
 
         [Test]
-        [TestCase(1.001d, "1")]
-        [TestCase(0.999d, "1")]
+        [TestCase(0.999, "0.99")]
+        [TestCase(1.005, "1")]
+        [TestCase(1.015, "1.01")]
+        [TestCase(1.05, "1.05")]
         public void FixedPoint2DoubleTests(double value, string expected)
         {
             var result = FixedPoint2.New(value);
@@ -36,8 +41,10 @@ public void FixedPoint2DoubleTests(double value, string expected)
         }
 
         [Test]
-        [TestCase("1.005", "1.01")]
-        [TestCase("0.999", "1")]
+        [TestCase("0.999", "0.99")]
+        [TestCase("1.005", "1")]
+        [TestCase("1.015", "1.01")]
+        [TestCase("1.05", "1.05")]
         public void FixedPoint2StringTests(string value, string expected)
         {
             var result = FixedPoint2.New(value);
@@ -45,11 +52,9 @@ public void FixedPoint2StringTests(string value, string expected)
         }
 
         [Test]
-        [TestCase(1.001f, 1.001f, "2")]
-        [TestCase(1.001f, 1.004f, "2")]
-        [TestCase(1f, 1.005f, "2.01")]
-        [TestCase(1f, 2.005f, "3.01")]
-        public void CalculusPlus(float aFloat, float bFloat, string expected)
+        [TestCase(1, 1, "2")]
+        [TestCase(1.05f, 1, "2.05")]
+        public void ArithmeticAddition(float aFloat, float bFloat, string expected)
         {
             var a = FixedPoint2.New(aFloat);
             var b = FixedPoint2.New(bFloat);
@@ -60,10 +65,9 @@ public void CalculusPlus(float aFloat, float bFloat, string expected)
         }
 
         [Test]
-        [TestCase(1.001f, 1.001f, "0")]
-        [TestCase(1.001f, 1.004f, "0")]
-        [TestCase(1f, 2.005f, "-1.01")]
-        public void CalculusMinus(float aFloat, float bFloat, string expected)
+        [TestCase(1, 1, "0")]
+        [TestCase(1f, 2.5f, "-1.5")]
+        public void ArithmeticSubtraction(float aFloat, float bFloat, string expected)
         {
             var a = FixedPoint2.New(aFloat);
             var b = FixedPoint2.New(bFloat);
@@ -77,7 +81,8 @@ public void CalculusMinus(float aFloat, float bFloat, string expected)
         [TestCase(1.001f, 3f, "0.33")]
         [TestCase(0.999f, 3f, "0.33")]
         [TestCase(2.1f, 3f, "0.7")]
-        public void CalculusDivision(float aFloat, float bFloat, string expected)
+        [TestCase(0.03f, 2f, "0.01")]
+        public void ArithmeticDivision(float aFloat, float bFloat, string expected)
         {
             var a = FixedPoint2.New(aFloat);
             var b = FixedPoint2.New(bFloat);
@@ -88,9 +93,24 @@ public void CalculusDivision(float aFloat, float bFloat, string expected)
         }
 
         [Test]
-        [TestCase(1.001f, 0.999f, "1")]
-        [TestCase(0.999f, 3f, "3")]
-        public void CalculusMultiplication(float aFloat, float bFloat, string expected)
+        [TestCase(1.001f, 3f, "0.33")]
+        [TestCase(0.999f, 3f, "0.33")]
+        [TestCase(2.1f, 3f, "0.7")]
+        [TestCase(0.03f, 2f, "0.01")]
+        [TestCase(1f, 1 / 1.05f, "1.05")]
+        public void ArithmeticDivisionFloat(float aFloat, float b, string expected)
+        {
+            var a = FixedPoint2.New(aFloat);
+
+            var result = a / b;
+
+            Assert.That($"{result}", Is.EqualTo(expected));
+        }
+
+        [Test]
+        [TestCase(1, 1, "1")]
+        [TestCase(1, 3f, "3")]
+        public void ArithmeticMultiplication(float aFloat, float bFloat, string expected)
         {
             var a = FixedPoint2.New(aFloat);
             var b = FixedPoint2.New(bFloat);
@@ -100,6 +120,17 @@ public void CalculusMultiplication(float aFloat, float bFloat, string expected)
             Assert.That($"{result}", Is.EqualTo(expected));
         }
 
+        [Test]
+        [TestCase(1, 1, "1")]
+        [TestCase(1, 1.05f, "1.05")]
+        public void ArithmeticMultiplicationFloat(float aFloat, float b, string expected)
+        {
+            var a = FixedPoint2.New(aFloat);
+            var result = a * b;
+
+            Assert.That($"{result}", Is.EqualTo(expected));
+        }
+
         [Test]
         [TestCase(0.995f, 100)]
         [TestCase(1.005f, 101)]
diff --git a/Content.Tests/Shared/DamageTest.cs b/Content.Tests/Shared/DamageTest.cs
index b06b8368a90..11b810bf36a 100644
--- a/Content.Tests/Shared/DamageTest.cs
+++ b/Content.Tests/Shared/DamageTest.cs
@@ -121,9 +121,9 @@ public void DamageSpecifierTest()
             damageSpec = new(_prototypeManager.Index<DamageGroupPrototype>("Brute"), 4);
             Assert.That(damageSpec.DamageDict.TryGetValue("Blunt", out damage));
             Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.33)));
-            Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
-            Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.33)));
             Assert.That(damageSpec.DamageDict.TryGetValue("Slash", out damage));
+            Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.33)));
+            Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
             Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.34))); // doesn't divide evenly, so the 0.01 goes to the last one
 
             damageSpec = new(_prototypeManager.Index<DamageTypePrototype>("Piercing"), 4);
@@ -161,7 +161,7 @@ public void ModifierSetTest()
             Assert.That(damageSpec.DamageDict["Blunt"], Is.EqualTo(FixedPoint2.New(30)));
             Assert.That(damageSpec.DamageDict["Piercing"], Is.EqualTo(FixedPoint2.New(-40))); // resistances don't apply to healing
             Assert.That(!damageSpec.DamageDict.ContainsKey("Slash"));  // Reduction reduced to 0, and removed from specifier
-            Assert.That(damageSpec.DamageDict["Radiation"], Is.EqualTo(FixedPoint2.New(65.63)));
+            Assert.That(damageSpec.DamageDict["Radiation"], Is.EqualTo(FixedPoint2.New(65.62)));
         }
 
         // Default damage Yaml
diff --git a/Resources/Audio/Ambience/anomaly_scary.ogg b/Resources/Audio/Ambience/anomaly_scary.ogg
new file mode 100644
index 00000000000..badefbec3bd
Binary files /dev/null and b/Resources/Audio/Ambience/anomaly_scary.ogg differ
diff --git a/Resources/Audio/Ambience/attributions.yml b/Resources/Audio/Ambience/attributions.yml
index d7ee1e88640..5ea0c248188 100644
--- a/Resources/Audio/Ambience/attributions.yml
+++ b/Resources/Audio/Ambience/attributions.yml
@@ -95,4 +95,10 @@
           spookyspace2.ogg"]
   license: "CC0-1.0"
   copyright: "Taken from /vg/station"
-  source: "https://github.com/vgstation-coders/vgstation13/commit/23303188abe6fe31b114a218a1950d7325a23730"
\ No newline at end of file
+  source: "https://github.com/vgstation-coders/vgstation13/commit/23303188abe6fe31b114a218a1950d7325a23730"
+
+
+- files: ["anomaly_scary.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by dimbark1, edited and converted to mono by TheShuEd (github)"
+  source: "https://freesound.org/people/dimbark1/sounds/316797/"
\ No newline at end of file
diff --git a/Resources/Audio/Animals/attributions.yml b/Resources/Audio/Animals/attributions.yml
index c9c20473c21..c34832a807a 100644
--- a/Resources/Audio/Animals/attributions.yml
+++ b/Resources/Audio/Animals/attributions.yml
@@ -131,4 +131,10 @@
 - files: ["dog_bark3.ogg"]
   license: "CC0-1.0"
   copyright: "Audio is recorded/created by KFerentchak 'FreeSound.org'. The original audio was trimmed and renamed"
-  source: "https://freesound.org/people/KFerentchak/sounds/235912/"
\ No newline at end of file
+  source: "https://freesound.org/people/KFerentchak/sounds/235912/"
+  
+- files: ["nymph_chirp.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from ParadiseSS13"
+  source: "https://github.com/ParadiseSS13/Paradise/commit/a34f1054cef5a44a67fdac3b67b811137c6071dd"
+  
\ No newline at end of file
diff --git a/Resources/Audio/Animals/nymph_chirp.ogg b/Resources/Audio/Animals/nymph_chirp.ogg
new file mode 100644
index 00000000000..e0e573d497d
Binary files /dev/null and b/Resources/Audio/Animals/nymph_chirp.ogg differ
diff --git a/Resources/Audio/Items/Paper/attributions.yml b/Resources/Audio/Items/Paper/attributions.yml
new file mode 100644
index 00000000000..42c973c67fa
--- /dev/null
+++ b/Resources/Audio/Items/Paper/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["paper_scribble1.ogg", "paper_scribble2.ogg", "paper_scribble3.ogg", "paper_scribble4.ogg", "paper_scribble5.ogg"]
+  license: "CC0-1.0"
+  copyright: "Originally 'Pen Clicks and Writing on Paper' created by PDaefaul. Cut, spliced and converted by Krunklehorn."
+  source: "https://freesound.org/people/PDaefaul/sounds/631971/"
diff --git a/Resources/Audio/Items/Paper/paper_scribble1.ogg b/Resources/Audio/Items/Paper/paper_scribble1.ogg
new file mode 100644
index 00000000000..982bad95c4d
Binary files /dev/null and b/Resources/Audio/Items/Paper/paper_scribble1.ogg differ
diff --git a/Resources/Audio/Items/Paper/paper_scribble2.ogg b/Resources/Audio/Items/Paper/paper_scribble2.ogg
new file mode 100644
index 00000000000..fd2d907879e
Binary files /dev/null and b/Resources/Audio/Items/Paper/paper_scribble2.ogg differ
diff --git a/Resources/Audio/Items/Paper/paper_scribble3.ogg b/Resources/Audio/Items/Paper/paper_scribble3.ogg
new file mode 100644
index 00000000000..7e44117486a
Binary files /dev/null and b/Resources/Audio/Items/Paper/paper_scribble3.ogg differ
diff --git a/Resources/Audio/Items/Paper/paper_scribble4.ogg b/Resources/Audio/Items/Paper/paper_scribble4.ogg
new file mode 100644
index 00000000000..1d9980133db
Binary files /dev/null and b/Resources/Audio/Items/Paper/paper_scribble4.ogg differ
diff --git a/Resources/Audio/Items/Paper/paper_scribble5.ogg b/Resources/Audio/Items/Paper/paper_scribble5.ogg
new file mode 100644
index 00000000000..8e155e5fd62
Binary files /dev/null and b/Resources/Audio/Items/Paper/paper_scribble5.ogg differ
diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index 51d8d9cf95a..8942e41db23 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -63,6 +63,11 @@
   copyright: "User volivieri on freesound.org. Modified by Velcroboy on github."
   source: "https://freesound.org/people/volivieri/sounds/37190/"
 
+- files: ["bottle_close1.ogg"]
+  license: "CC0-1.0"
+  copyright: "User MellowAudio on freesound.org. Modified by Tayrtahn on github."
+  source: "https://freesound.org/people/MellowAudio/sounds/591485/"
+
 - files: ["bow_pull.ogg"]
   license: "CC-BY-3.0"
   copyright: "User jzdnvdoosj on freesound.org. Converted to ogg by mirrorcult"
@@ -92,7 +97,7 @@
   license: "CC-BY-4.0"
   copyright: "User LoafDV on freesound.org. Converted to ogg end edited by lzk228"
   source: "https://freesound.org/people/LoafDV/sounds/131596/"
-  
+
 - files: ["shovel_dig.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from tgstation, modified by themias (github) for ss14"
diff --git a/Resources/Audio/Items/bottle_close1.ogg b/Resources/Audio/Items/bottle_close1.ogg
new file mode 100644
index 00000000000..b6db8fae79e
Binary files /dev/null and b/Resources/Audio/Items/bottle_close1.ogg differ
diff --git a/Resources/Audio/Items/newton_cradle.ogg b/Resources/Audio/Items/newton_cradle.ogg
index 6dfe528feb5..875841ee848 100644
Binary files a/Resources/Audio/Items/newton_cradle.ogg and b/Resources/Audio/Items/newton_cradle.ogg differ
diff --git a/Resources/Audio/Voice/Talk/attributions.yml b/Resources/Audio/Voice/Talk/attributions.yml
index d55b9737d0e..19b0b66b9cc 100644
--- a/Resources/Audio/Voice/Talk/attributions.yml
+++ b/Resources/Audio/Voice/Talk/attributions.yml
@@ -31,3 +31,8 @@
   license: "CC-BY-NC-SA-3.0"
   copyright: "Goonstation, Modified by Whisper"
   source: "https://github.com/goonstation/goonstation/tree/eb3e7df6292d23f6af2f18b4372d3a8ba4b0fda7/sound/misc/talk"
+
+- files: ["vox.ogg","vox_ask.ogg","vox_exclaim.ogg" ]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Derived from shriek1.ogg by Errant"
+  source: "https://github.com/goonstation/goonstation/tree/eb3e7df6292d23f6af2f18b4372d3a8ba4b0fda7/sound/misc/talk"
diff --git a/Resources/Audio/Voice/Talk/vox.ogg b/Resources/Audio/Voice/Talk/vox.ogg
new file mode 100644
index 00000000000..c3b2a268ac2
Binary files /dev/null and b/Resources/Audio/Voice/Talk/vox.ogg differ
diff --git a/Resources/Audio/Voice/Talk/vox_ask.ogg b/Resources/Audio/Voice/Talk/vox_ask.ogg
new file mode 100644
index 00000000000..e3e323d64ca
Binary files /dev/null and b/Resources/Audio/Voice/Talk/vox_ask.ogg differ
diff --git a/Resources/Audio/Voice/Talk/vox_exclaim.ogg b/Resources/Audio/Voice/Talk/vox_exclaim.ogg
new file mode 100644
index 00000000000..cd1fead03a7
Binary files /dev/null and b/Resources/Audio/Voice/Talk/vox_exclaim.ogg differ
diff --git a/Resources/Audio/Voice/Vox/vox_laugh.ogg b/Resources/Audio/Voice/Vox/vox_laugh.ogg
new file mode 100644
index 00000000000..8c356045c36
Binary files /dev/null and b/Resources/Audio/Voice/Vox/vox_laugh.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ebc431b9428..3e82a672e9e 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,513 +1,4 @@
-Order: 1
 Entries:
-- author: brainfood1183
-  changes:
-  - message: Crystals now drop crystal shards, you can use them to craft colored light
-      tubes.
-    type: Add
-  id: 5400
-  time: '2023-12-16T22:20:14.0000000+00:00'
-  url: null
-- author: Ilya246
-  changes:
-  - message: Pens now embed and deal damage on throw like spears.
-    type: Add
-  id: 5401
-  time: '2023-12-16T22:23:08.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Svalinn Laser Pistol and accompanying T3 tech.
-    type: Add
-  id: 5402
-  time: '2023-12-17T03:43:50.0000000+00:00'
-  url: null
-- author: mirrorcult
-  changes:
-  - message: You can now pet the recycler
-    type: Add
-  id: 5403
-  time: '2023-12-17T07:44:37.0000000+00:00'
-  url: null
-- author: Ubaser
-  changes:
-  - message: Mindbreaker is now hallucinogenic.
-    type: Tweak
-  id: 5404
-  time: '2023-12-17T07:44:54.0000000+00:00'
-  url: null
-- author: JoeHammad
-  changes:
-  - message: Paramedics now have a rollerbed in their bag by default
-    type: Add
-  id: 5405
-  time: '2023-12-17T09:55:29.0000000+00:00'
-  url: null
-- author: Ilya246
-  changes:
-  - message: Large cardboard boxes and stealth boxes now inherit their mover's access.
-    type: Fix
-  id: 5406
-  time: '2023-12-17T09:55:40.0000000+00:00'
-  url: null
-- author: TheShuEd
-  changes:
-  - message: Changed hypodart cost from 3 to 2 tc
-    type: Tweak
-  id: 5407
-  time: '2023-12-17T16:08:11.0000000+00:00'
-  url: null
-- author: yathxyz
-  changes:
-  - message: Fixed nix devShell
-    type: Fix
-  id: 5408
-  time: '2023-12-17T16:55:37.0000000+00:00'
-  url: null
-- author: Ubaser
-  changes:
-  - message: HoS parade uniforms are available at the uniform printer.
-    type: Add
-  id: 5409
-  time: '2023-12-17T23:20:04.0000000+00:00'
-  url: null
-- author: Alzore
-  changes:
-  - message: Security zipties are now tiny and easier to store.
-    type: Tweak
-  id: 5410
-  time: '2023-12-17T23:27:01.0000000+00:00'
-  url: null
-- author: Aexxie
-  changes:
-  - message: Added RCDs to all engineering lockers.
-    type: Add
-  id: 5411
-  time: '2023-12-18T02:38:37.0000000+00:00'
-  url: null
-- author: Ubaser
-  changes:
-  - message: Traitors and Nukies can now purchase a Chemical Synthesis Kit for 4TC
-      which contains Vestine.
-    type: Add
-  - message: Nocturine, Tazinide, Stimulants, Lexorin and Mute Toxin are now locked
-      behind Vestine.
-    type: Tweak
-  - message: Lexorin and Heartbreaker toxin are buffed, while Licoxide is nerfed.
-    type: Tweak
-  - message: You can no longer purchase Nocturine through the uplink.
-    type: Remove
-  id: 5412
-  time: '2023-12-18T02:40:28.0000000+00:00'
-  url: null
-- author: Ubaser
-  changes:
-  - message: Janitors now get rubber gloves for cleaning.
-    type: Add
-  id: 5413
-  time: '2023-12-18T03:11:19.0000000+00:00'
-  url: null
-- author: Velcroboy
-  changes:
-  - message: Added coal. Coal has been added to the steel recipe in the Ore Processor.
-      Coal can be ground up for Carbon and other elements. Coal can be mined or received
-      as a gift if you've been naughty.
-    type: Add
-  id: 5414
-  time: '2023-12-18T19:38:12.0000000+00:00'
-  url: null
-- author: Flareguy
-  changes:
-  - message: You can now walk into external and shuttle airlocks to open them, like
-      all other airlocks.
-    type: Tweak
-  id: 5415
-  time: '2023-12-18T19:44:50.0000000+00:00'
-  url: null
-- author: iacore
-  changes:
-  - message: normal closets can now be constructed and deconstructed
-    type: Add
-  id: 5416
-  time: '2023-12-18T19:46:16.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Walls are stronger and windows are weaker.
-    type: Tweak
-  - message: Secure crates and lockers are a lot stronger.
-    type: Tweak
-  - message: Melee weapons are now more balanced within a closer range of damage.
-    type: Tweak
-  - message: Double energy sword and fireaxe are now unavailable in uplink.
-    type: Tweak
-  id: 5417
-  time: '2023-12-19T02:38:49.0000000+00:00'
-  url: null
-- author: EmoGarbage404
-  changes:
-  - message: Added the RCD and RCD ammo crates to cargo.
-    type: Add
-  id: 5418
-  time: '2023-12-19T02:40:55.0000000+00:00'
-  url: null
-- author: ElectroJr
-  changes:
-  - message: The fireaxe can now fight fires (melee hits reduce fire stacks).
-    type: Tweak
-  id: 5419
-  time: '2023-12-19T02:41:33.0000000+00:00'
-  url: null
-- author: SapphicOverload
-  changes:
-  - message: EVA and hardsuit helmets now allow breathing from gas tanks without a
-      mask.
-    type: Tweak
-  id: 5420
-  time: '2023-12-19T02:50:06.0000000+00:00'
-  url: null
-- author: RiceMar
-  changes:
-  - message: Station department exteriors now feature janitorial service lights for
-      directing janitors to the big messes they cant see!
-    type: Add
-  id: 5421
-  time: '2023-12-19T04:21:12.0000000+00:00'
-  url: null
-- author: SlamBamActionman
-  changes:
-  - message: Fixed compatability with old changelog format.
-    type: Fix
-  id: 5422
-  time: '2023-12-19T05:22:24.0000000+00:00'
-  url: null
-- author: notafet
-  changes:
-  - message: Security sunglasses, researchable from arsenal technology, now display
-      the security HUD.
-    type: Tweak
-  id: 5423
-  time: '2023-12-19T08:29:07.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Captain clothing items have been resprited
-    type: Tweak
-  id: 5424
-  time: '2023-12-19T20:36:36.0000000+00:00'
-  url: null
-- author: Stanislav4ix
-  changes:
-  - message: Added ore bag of holding!
-    type: Add
-  id: 5425
-  time: '2023-12-19T22:28:56.0000000+00:00'
-  url: null
-- author: TGODiamond
-  changes:
-  - message: Item size cannot be misinterpreted now.
-    type: Fix
-  id: 5426
-  time: '2023-12-20T00:31:39.0000000+00:00'
-  url: null
-- author: Veritius
-  changes:
-  - message: Ethylredoxrazine is more effective at treating drunkness.
-    type: Tweak
-  id: 5427
-  time: '2023-12-20T02:20:04.0000000+00:00'
-  url: null
-- author: Errant
-  changes:
-  - message: HUD elements no longer violate the Geneva Conventions.
-    type: Fix
-  id: 5428
-  time: '2023-12-20T04:28:03.0000000+00:00'
-  url: null
-- author: ERORR404V1
-  changes:
-  - message: NanoTrasen botanists have bred a new blinking plant
-    type: Add
-  id: 5429
-  time: '2023-12-20T04:57:02.0000000+00:00'
-  url: null
-- author: qwerltaz
-  changes:
-  - message: Improve the gas analyzer interface.
-    type: Tweak
-  id: 5430
-  time: '2023-12-20T17:56:57.0000000+00:00'
-  url: null
-- author: JoeHammad
-  changes:
-  - message: Fland now has its own shuttle, ported from ss13
-    type: Add
-  id: 5431
-  time: '2023-12-20T23:26:07.0000000+00:00'
-  url: null
-- author: joshepvodka
-  changes:
-  - message: CentCom bureaucrats are now twice as powerful with their new custom-made
-      clipboards and folders.
-    type: Add
-  id: 5432
-  time: '2023-12-20T23:29:35.0000000+00:00'
-  url: null
-- author: PJB3005
-  changes:
-  - message: Fix starting to follow a moving player as a ghost causing your camera
-      to keep jumping around anymore.
-    type: Fix
-  id: 5433
-  time: '2023-12-20T23:33:00.0000000+00:00'
-  url: null
-- author: Velcroboy
-  changes:
-  - message: Fixed coal not generating!
-    type: Fix
-  id: 5434
-  time: '2023-12-20T23:46:20.0000000+00:00'
-  url: null
-- author: whateverusername0
-  changes:
-  - message: "Miasma now reacts with oxygen at 50\xB0C to produce nitrous oxide and\
-      \ water vapor."
-    type: Add
-  id: 5435
-  time: '2023-12-21T00:14:59.0000000+00:00'
-  url: null
-- author: whateverusername0
-  changes:
-  - message: Nitrous oxide now decomposes at high temperatures.
-    type: Add
-  id: 5436
-  time: '2023-12-21T01:33:08.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Crates and lockers are slightly easier to bust open but still harder
-      than before.
-    type: Tweak
-  - message: Solid walls are easier to break but reinforced are the same.
-    type: Tweak
-  id: 5437
-  time: '2023-12-21T03:03:06.0000000+00:00'
-  url: null
-- author: mirrorcult
-  changes:
-  - message: Miasma has been renamed to Ammonia
-    type: Add
-  - message: Miasmic subsumation reaction has been removed
-    type: Remove
-  id: 5438
-  time: '2023-12-21T04:19:50.0000000+00:00'
-  url: null
-- author: joshepvodka
-  changes:
-  - message: NanoTrasen updated the designs for their emergency medipens. Space medipens
-      are now magenta colored and epi pens have a green band on them.
-    type: Tweak
-  id: 5439
-  time: '2023-12-21T05:30:58.0000000+00:00'
-  url: null
-- author: Hqlle
-  changes:
-  - message: Resprited carpet sprites.
-    type: Add
-  id: 5440
-  time: '2023-12-21T05:32:38.0000000+00:00'
-  url: null
-- author: CrigCrag
-  changes:
-  - message: Added Fresium, a military grade coolant that you SHOULD NOT INGEST OR
-      SPLASH ON YOUR FRIENDS!
-    type: Add
-  id: 5441
-  time: '2023-12-21T05:35:22.0000000+00:00'
-  url: null
-- author: RiceMar
-  changes:
-  - message: Energy swords and double energy swords now look as long as they seem
-      to be in your hand.
-    type: Tweak
-  id: 5442
-  time: '2023-12-21T06:32:11.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Borgs now see who is crew
-    type: Tweak
-  id: 5443
-  time: '2023-12-21T07:09:53.0000000+00:00'
-  url: null
-- author: KittenColony
-  changes:
-  - message: Rotated fireaxe 'icon' 45 degrees
-    type: Tweak
-  id: 5444
-  time: '2023-12-21T08:03:52.0000000+00:00'
-  url: null
-- author: themias
-  changes:
-  - message: Damp rags can mop puddles again
-    type: Fix
-  - message: Syndie soap cleans evidence a little faster than other soap
-    type: Tweak
-  id: 5445
-  time: '2023-12-21T08:54:52.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Nukies don't start with agent ID anymore
-    type: Tweak
-  id: 5446
-  time: '2023-12-21T09:59:06.0000000+00:00'
-  url: null
-- author: Repo
-  changes:
-  - message: Mice can no longer spill containers.
-    type: Tweak
-  id: 5447
-  time: '2023-12-21T10:23:01.0000000+00:00'
-  url: null
-- author: Lukasz825700516
-  changes:
-  - message: Gas tanks no longer predict insertion of random items.
-    type: Fix
-  id: 5448
-  time: '2023-12-21T10:37:35.0000000+00:00'
-  url: null
-- author: mirrorcult
-  changes:
-  - message: Smart equipping now works with item slots
-    type: Add
-  - message: Smart equipping is now predicted
-    type: Tweak
-  id: 5449
-  time: '2023-12-21T14:17:09.0000000+00:00'
-  url: null
-- author: DrMelon
-  changes:
-  - message: Mice and other small creatures can no longer hurt Pun Pun or the Clown
-      by smashing them into tables.
-    type: Fix
-  id: 5450
-  time: '2023-12-21T15:18:26.0000000+00:00'
-  url: null
-- author: Boaz1111
-  changes:
-  - message: Added uranium munitions, a new T1 arsenal research.
-    type: Add
-  - message: Made practice munitions and weapons roundstart
-    type: Tweak
-  id: 5451
-  time: '2023-12-21T17:19:45.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22824
-- author: Admiral-Obvious-001
-  changes:
-  - message: Reduced per pellet damage of shotguns slightly.
-    type: Tweak
-  id: 5452
-  time: '2023-12-27T09:26:42.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23042
-- author: mirrorcult
-  changes:
-  - message: Pacifists can now attack in general, but are still forbidden from hurting
-      living creatures or dangerous things.
-    type: Tweak
-  - message: Pacifists can now disarm people. They are pacifist, after all.
-    type: Tweak
-  - message: Pacifists can now use flashes (and zero-damaging melee weapons, in general)
-    type: Tweak
-  id: 5453
-  time: '2023-12-27T09:55:48.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23037
-- author: snebl
-  changes:
-  - message: Fixed emergency and extended nitrogen tanks having the same volume.
-    type: Fix
-  id: 5454
-  time: '2023-12-27T09:56:00.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23040
-- author: Blazeror
-  changes:
-  - message: You can now pry open windoors by hand when they are unpowered.
-    type: Fix
-  id: 5455
-  time: '2023-12-27T12:28:29.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23047
-- author: Emisse
-  changes:
-  - message: The Grand Lottery now has much more prizes in store!
-    type: Tweak
-  id: 5456
-  time: '2023-12-27T12:31:03.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23048
-- author: TheShuEd
-  changes:
-  - message: The thief will temporarily not steal structures for the time being, as
-      this task seems too difficult.
-    type: Tweak
-  - message: Added Emag into thief's syndie kit
-    type: Add
-  - message: Added 3 smoke grenades into thief's smuggler kit
-    type: Add
-  - message: Replaced radio jammer to cyber pen into thief's communicator kit
-    type: Tweak
-  - message: Replaced omnizine bottle to omega soap into thief's chemistry kit
-    type: Tweak
-  id: 5457
-  time: '2023-12-27T20:42:16.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22976
-- author: Alekshhh
-  changes:
-  - message: Changed brown fedora and inspector's coat palette and minor adjustments
-    type: Tweak
-  id: 5458
-  time: '2023-12-27T22:53:10.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23065
-- author: Velcroboy
-  changes:
-  - message: Added melee dmg to salami logs!
-    type: Add
-  id: 5459
-  time: '2023-12-28T02:59:14.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23041
-- author: Emisse
-  changes:
-  - message: Ion Storm is silent now
-    type: Tweak
-  id: 5460
-  time: '2023-12-28T03:03:00.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23045
-- author: Alekshhh
-  changes:
-  - message: Changed wall lockers visually to match regular lockers and sit on walls
-      better
-    type: Tweak
-  id: 5461
-  time: '2023-12-28T03:05:05.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23060
-- author: EmoGarbage404
-  changes:
-  - message: Added the clerical error station event, which causes a small amount of
-      station records to be destroyed.
-    type: Add
-  id: 5462
-  time: '2023-12-28T03:09:05.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23091
-- author: EmoGarbage404
-  changes:
-  - message: Added the GORILLA gauntlet. When powered with an anomaly core, a single
-      blow from this is able to send anomalies flying through the air. Just try not
-      to let it out on the clown.
-    type: Add
-  - message: Added Anomaly Core Harnessing technology to the Experimental discipline,
-      which contains the GORILLA gauntlet.
-    type: Add
-  id: 5463
-  time: '2023-12-28T03:11:13.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23012
 - author: Ubaser
   changes:
   - message: You can now purchase kobolds from cargo as an alternative to monkeys!
@@ -3885,3 +3376,490 @@ Order: 1
   id: 5899
   time: '2024-02-07T08:49:06.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25016
+- author: Ilya246
+  changes:
+  - message: Atmos devices can now be built behind directional windows and on lattice.
+    type: Tweak
+  id: 5900
+  time: '2024-02-08T23:07:42.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25057
+- author: Ubaser
+  changes:
+  - message: T-Ray scanner sprite is tweaked.
+    type: Tweak
+  id: 5901
+  time: '2024-02-08T23:09:00.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25047
+- author: nikthechampiongr
+  changes:
+  - message: Brig timers display their label properly again.
+    type: Fix
+  id: 5902
+  time: '2024-02-08T23:12:05.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25033
+- author: vero5123
+  changes:
+  - message: fixes mop buckets being indestructible.
+    type: Fix
+  id: 5903
+  time: '2024-02-08T23:15:12.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25001
+- author: Adrian16199
+  changes:
+  - message: Added a straw hat that can be crafted with wheat.
+    type: Add
+  id: 5904
+  time: '2024-02-08T23:17:01.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24997
+- author: Sk1tch
+  changes:
+  - message: Guidebook entries are now alphabetically sorted
+    type: Tweak
+  id: 5905
+  time: '2024-02-08T23:23:35.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24963
+- author: FairlySadPanda
+  changes:
+  - message: Swapped out the Skelly Vs The Rev art with a new, higher-res version.
+    type: Tweak
+  id: 5906
+  time: '2024-02-10T02:06:02.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25088
+- author: Potato1234_x
+  changes:
+  - message: Added laughin' peas, a new mutation for peas that can be ground into
+      Laughter, a chem that forces people to laugh.
+    type: Add
+  id: 5907
+  time: '2024-02-10T08:21:44.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25089
+- author: themias
+  changes:
+  - message: Soft caps can be flipped backwards with an alt-verb (Flip)
+    type: Tweak
+  id: 5908
+  time: '2024-02-10T08:44:19.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24961
+- author: Blackern5000
+  changes:
+  - message: Shotgun beanbag rounds now deal 40 stamina damage and stun in 3 hits.
+    type: Tweak
+  id: 5909
+  time: '2024-02-10T08:49:24.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24653
+- author: metalgearsloth
+  changes:
+  - message: Fix screenspace popups e.g. inventory / access popups drawing below the
+      UI.
+    type: Fix
+  id: 5910
+  time: '2024-02-10T08:51:11.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24987
+- author: themias
+  changes:
+  - message: The ID card console now correctly updates the ID's department when you
+      update its job
+    type: Fix
+  - message: The Agent ID will update its department depending on the selected icon
+    type: Fix
+  id: 5911
+  time: '2024-02-10T09:17:26.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24975
+- author: Nimfar11
+  changes:
+  - message: Adds a glass showcase for an antique laser pistol.
+    type: Add
+  id: 5912
+  time: '2024-02-10T23:36:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25104
+- author: Jezithyr
+  changes:
+  - message: Changed gibbing to now rotate giblets randomly when they are spawned.
+    type: Tweak
+  - message: Giblets are now thrown around the body instead of spawning in a rough
+      pile.
+    type: Tweak
+  id: 5913
+  time: '2024-02-10T23:37:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24989
+- author: Jajsha
+  changes:
+  - message: Cyborgs can no longer Emag themselves.
+    type: Fix
+  id: 5914
+  time: '2024-02-11T06:23:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24748
+- author: Ubaser
+  changes:
+  - message: Grinding ectoplasm now gives Necrosol.
+    type: Tweak
+  id: 5915
+  time: '2024-02-11T06:24:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25053
+- author: Ubaser
+  changes:
+  - message: Food Service research is now roundstart.
+    type: Tweak
+  id: 5916
+  time: '2024-02-11T06:37:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25046
+- author: SlamBamActionman
+  changes:
+  - message: Added setting to toggle chat name color in Options.
+    type: Add
+  id: 5917
+  time: '2024-02-11T06:38:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24625
+- author: Emisse
+  changes:
+  - message: Ambuzol now requires zombie blood
+    type: Tweak
+  id: 5918
+  time: '2024-02-11T20:47:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25119
+- author: Plykiya
+  changes:
+  - message: Door remotes no longer have their 5G signals absorbed by mobs, machines,
+      or Ian's cute butt.
+    type: Fix
+  id: 5919
+  time: '2024-02-12T02:34:13.532550+00:00'
+  url: null
+- author: FungiFellow
+  changes:
+  - message: Lowered Reoccurence Delay for Ion Storm
+    type: Tweak
+  id: 5920
+  time: '2024-02-12T02:35:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25135
+- author: PoorMansDreams
+  changes:
+  - message: Ammo is now tipped!
+    type: Tweak
+  id: 5921
+  time: '2024-02-12T03:02:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25103
+- author: PoorMansDreams
+  changes:
+  - message: Buyable Janitorial Trolley!
+    type: Add
+  id: 5922
+  time: '2024-02-12T06:35:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25139
+- author: Plykiya
+  changes:
+  - message: Stun batons and stun prods now display their hits remaining.
+    type: Tweak
+  id: 5923
+  time: '2024-02-12T06:36:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25141
+- author: Ilya246
+  changes:
+  - message: Autolathes may now make empty air tanks.
+    type: Add
+  id: 5924
+  time: '2024-02-12T06:37:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25130
+- author: Ubaser
+  changes:
+  - message: Resprited the CE's jetpack.
+    type: Tweak
+  id: 5925
+  time: '2024-02-12T20:44:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25150
+- author: EdenTheLiznerd
+  changes:
+  - message: Deathnettles are no longer able to bypass armor and don't do as much
+      damage
+    type: Tweak
+  id: 5926
+  time: '2024-02-13T01:20:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25068
+- author: Vasilis
+  changes:
+  - message: You can now inspect peoples id's and health though glass if you are within
+      details range.
+    type: Tweak
+  id: 5927
+  time: '2024-02-13T06:41:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25163
+- author: metalgearsloth
+  changes:
+  - message: Fix decal error spam in console due to a missing overlay.
+    type: Fix
+  id: 5928
+  time: '2024-02-13T07:10:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25170
+- author: jamessimo
+  changes:
+  - message: Can now "wink" with the text emote ;) or ;]
+    type: Add
+  - message: Can now "tearfully smile" with the text emote :') and similar variants
+    type: Add
+  - message: Added more ways to "cry" with the emote :'( and similar variants
+    type: Tweak
+  id: 5929
+  time: '2024-02-13T15:43:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25129
+- author: icekot8
+  changes:
+  - message: Medical berets added to MediDrobe
+    type: Add
+  id: 5930
+  time: '2024-02-13T21:37:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25176
+- author: PoorMansDreams
+  changes:
+  - message: Alternate ammo now has the proper appearance when spent.
+    type: Fix
+  id: 5931
+  time: '2024-02-13T21:40:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25167
+- author: Agoichi
+  changes:
+  - message: All hoods have tag "Hides Hair"
+    type: Tweak
+  - message: Plague Doctor's hat and Witch hat (with red hair) have tag "Hides Hair"
+    type: Tweak
+  id: 5932
+  time: '2024-02-13T21:43:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25142
+- author: Blackern5000
+  changes:
+  - message: Advanced topical meds now cost significantly less chemicals
+    type: Tweak
+  id: 5933
+  time: '2024-02-13T22:03:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24948
+- author: Tayrtahn
+  changes:
+  - message: Drink bottles can now be opened and closed from the verbs menu, and some
+      have been given tamper-evident seals.
+    type: Add
+  id: 5934
+  time: '2024-02-13T22:08:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24780
+- author: TheShuEd
+  changes:
+  - message: Darkness is coming. A new shadow anomaly added.
+    type: Add
+  id: 5935
+  time: '2024-02-13T22:12:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24629
+- author: jamessimo
+  changes:
+  - message: Microwave UI enhancements
+    type: Tweak
+  - message: Microwaves now tell you how much time is left when cooking
+    type: Tweak
+  - message: Microwaves UI now uses prediction for user inputs.
+    type: Fix
+  id: 5936
+  time: '2024-02-13T22:16:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24547
+- author: TheShuEd
+  changes:
+  - message: Remote signallers are now limited to a 15-tile radius
+    type: Tweak
+  - message: Added an advanced remote signaler, with a range of 30 tiles.
+    type: Add
+  - message: the anomaly synchronizer consumes much less power, and no longer causes
+      the anomaly pulses when powering down.
+    type: Tweak
+  id: 5937
+  time: '2024-02-13T22:19:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24461
+- author: joshepvodka
+  changes:
+  - message: Fax machines can now print text files from your computer.
+    type: Add
+  id: 5938
+  time: '2024-02-14T01:14:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/23262
+- author: Plykiya
+  changes:
+  - message: Holosigns can now be placed at range. No more being eaten by forcefields!
+    type: Tweak
+  id: 5939
+  time: '2024-02-14T05:25:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25120
+- author: Zadeon
+  changes:
+  - message: Disablers now fit inside the suit storage slot.
+    type: Fix
+  id: 5940
+  time: '2024-02-14T23:07:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25238
+- author: Jezithyr
+  changes:
+  - message: Death Acidifier implants not deleting items when activated
+    type: Fix
+  id: 5941
+  time: '2024-02-15T01:37:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25251
+- author: PJB3005
+  changes:
+  - message: Fixed disposals bins not automatically flushing after an item was inserted.
+    type: Fix
+  id: 5942
+  time: '2024-02-15T20:52:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25233
+- author: liltenhead
+  changes:
+  - message: Reduced energy shield's hp from 150 to 100.
+    type: Tweak
+  id: 5943
+  time: '2024-02-15T20:54:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25258
+- author: PJB3005
+  changes:
+  - message: Nuke has some more blinkenlights now.
+    type: Tweak
+  id: 5944
+  time: '2024-02-16T00:26:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25297
+- author: MACMAN2003
+  changes:
+  - message: Thindows no longer duplicate glass when broken.
+    type: Fix
+  id: 5945
+  time: '2024-02-16T04:03:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25304
+- author: Golinth
+  changes:
+  - message: Mindshields are no longer separate and appear as a border around job
+      icons on the SecHUD
+    type: Tweak
+  id: 5946
+  time: '2024-02-16T15:58:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25303
+- author: Lukasz825700516
+  changes:
+  - message: Damaging stacked glass sheets now gives appropriate amount of glass shards
+    type: Fix
+  id: 5947
+  time: '2024-02-16T18:42:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25308
+- author: Plykiya
+  changes:
+  - message: The firefighting door remote now has access to atmos doors.
+    type: Tweak
+  id: 5948
+  time: '2024-02-16T18:50:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25097
+- author: themias
+  changes:
+  - message: t-ray scanners can now penetrate carpets and puddles
+    type: Tweak
+  id: 5949
+  time: '2024-02-16T23:37:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25276
+- author: Krunk
+  changes:
+  - message: Sound effects have been added for writing on paper.
+    type: Add
+  id: 5950
+  time: '2024-02-16T23:48:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25257
+- author: PotentiallyTom
+  changes:
+  - message: Added new covers for the medical, security, and science guidebooks
+    type: Add
+  id: 5951
+  time: '2024-02-16T23:50:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25232
+- author: PJB3005
+  changes:
+  - message: Fix some rounding issues with complex chemical reactions.
+    type: Fix
+  id: 5952
+  time: '2024-02-16T23:54:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25199
+- author: data_redacted
+  changes:
+  - message: New lobby art (of an Air Alarm blueprint).
+    type: Add
+  id: 5953
+  time: '2024-02-17T02:52:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25179
+- author: Lank
+  changes:
+  - message: Diona nymphs, small cat-like creatures, several of which make up a Diona.
+    type: Add
+  - message: Diona are now able to split into three nymphs on death, and will control
+      one of them. The controlled nymph is able to reform into a new diona after some
+      time.
+    type: Add
+  - message: Diona now combust into flames upon being hit with significant heat damage.
+    type: Tweak
+  id: 5954
+  time: '2024-02-17T02:54:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24630
+- author: PolterTzi
+  changes:
+  - message: Seeds from sampled plants now inherit the sampled plant's health to discourage
+      excessive sampling.
+    type: Tweak
+  - message: Plants need to grow a bit before being sampled.
+    type: Tweak
+  id: 5955
+  time: '2024-02-17T05:02:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25326
+- author: Dygon
+  changes:
+  - message: Diona nymphs aren't deleted immediately after spawning anymore.
+    type: Fix
+  id: 5956
+  time: '2024-02-17T16:38:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25344
+- author: Geekyhobo
+  changes:
+  - message: Massban Flag has been added to admin ranks
+    type: Add
+  id: 5957
+  time: '2024-02-17T20:32:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25327
+- author: Moomoobeef
+  changes:
+  - message: Detectives are now supplied with a box of evidence markers, useful for
+      marking evidence at a crime scene.
+    type: Add
+  id: 5958
+  time: '2024-02-17T20:49:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25255
+- author: Ubaser
+  changes:
+  - message: New "tailed" hair.
+    type: Add
+  id: 5959
+  time: '2024-02-17T20:49:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25216
+- author: Ubaser
+  changes:
+  - message: A new chest scar marking is now available to humans and dwarves.
+    type: Add
+  id: 5960
+  time: '2024-02-17T20:50:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25215
+- author: ArchPigeon
+  changes:
+  - message: Tails now stop wagging on crit
+    type: Fix
+  id: 5961
+  time: '2024-02-17T21:33:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25323
+- author: Killerqu00
+  changes:
+  - message: EVA and paramedic suits now play sound when putting helmet on.
+    type: Fix
+  id: 5962
+  time: '2024-02-17T22:34:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25349
+- author: musicmanvr
+  changes:
+  - message: Toned down the newton cradle and added it to the bureaucracy crate for
+      bored accountants.
+    type: Fix
+  id: 5963
+  time: '2024-02-17T23:55:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25357
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
index 03752eaef15..7e3b668d939 100644
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/Resources/Changelog/DeltaVChangelog.yml
@@ -1666,3 +1666,11 @@ Entries:
       message: 'Metempsychosis machines have been added to the game. '
   id: 248
   time: '2024-02-18T02:36:16.0000000+00:00'
+- author: DebugOk
+  changes:
+    - type: Add
+      message: Merged upstream
+    - type: Fix
+      message: Fixed the upstream changelog not rendering
+  id: 249
+  time: '2024-02-18T23:05:48.0000000+00:00'
diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 2d66537d368..1f10b363f8a 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -163,6 +163,7 @@ marking-HumanHairSpiky = Spiky 2
 marking-HumanHairSpiky2 = Spiky 3
 marking-HumanHairSwept = Swept Back Hair
 marking-HumanHairSwept2 = Swept Back Hair 2
+marking-HumanHairTailed = Tailed
 marking-HumanHairThinning = Thinning
 marking-HumanHairThinningfront = Thinning (Front)
 marking-HumanHairThinningrear = Thinning (Rear)
@@ -175,6 +176,7 @@ marking-HumanHairTwoStrands = Two Strands
 marking-HumanHairUndercut = Undercut
 marking-HumanHairUndercutleft = Undercut Left
 marking-HumanHairUndercutright = Undercut Right
+marking-HumanHairUneven = Uneven
 marking-HumanHairUnkept = Unkept
 marking-HumanHairUpdo = Updo
 marking-HumanHairVlong = Very Long Hair
@@ -184,4 +186,3 @@ marking-HumanHairVeryshortovereyealternate = Very Short Over Eye
 marking-HumanHairVlongfringe = Very Long with Fringe
 marking-HumanHairVolaju = Volaju
 marking-HumanHairWisp = Wisp
-marking-HumanHairUneven = Uneven
diff --git a/Resources/Locale/en-US/actions/actions/diona.ftl b/Resources/Locale/en-US/actions/actions/diona.ftl
new file mode 100644
index 00000000000..3745e6fe49b
--- /dev/null
+++ b/Resources/Locale/en-US/actions/actions/diona.ftl
@@ -0,0 +1,3 @@
+diona-gib-action-use = {$name} splits apart in an instant!
+
+diona-reform-attempt = {$name} attempts to reform!
\ No newline at end of file
diff --git a/Resources/Locale/en-US/actions/actions/wagging.ftl b/Resources/Locale/en-US/actions/actions/wagging.ftl
index 2fbcb676f4e..da0cfa0f27b 100644
--- a/Resources/Locale/en-US/actions/actions/wagging.ftl
+++ b/Resources/Locale/en-US/actions/actions/wagging.ftl
@@ -1,5 +1,2 @@
 action-name-toggle-wagging = Wagging Tail
 action-description-toggle-wagging = Start or stop wagging tail.
-
-wagging-emote-start = starts wagging {POSS-ADJ($ent)} tail.
-wagging-emote-stop = stops wagging {POSS-ADJ($ent)} tail.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
index 1e7dbe689cc..0e8c4137f4e 100644
--- a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
+++ b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
@@ -32,3 +32,4 @@ plant-holder-component-light-improper-warning = The [color=yellow]improper light
 plant-holder-component-heat-improper-warning = The [color=orange]improper temperature level alert[/color] is blinking.
 plant-holder-component-pressure-improper-warning = The [color=lightblue]improper environment pressure alert[/color] is blinking.
 plant-holder-component-gas-missing-warning = The [color=cyan]improper gas environment alert[/color] is blinking.
+plant-holder-component-early-sample-message = The plant hasn't grown enough to take a sample yet.
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index 481a571c3f2..a0cc5cf634c 100644
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -21,10 +21,10 @@ chat-manager-whisper-headset-on-message = You can't whisper on the radio!
 chat-manager-server-wrap-message = [bold]{$message}[/bold]
 chat-manager-sender-announcement-wrap-message = [font size=14][bold]{$sender} Announcement:[/font][font size=12]
                                                 {$message}[/bold][/font]
-chat-manager-entity-say-wrap-message = [BubbleHeader]{$entityName}[/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font]
-chat-manager-entity-say-bold-wrap-message = [BubbleHeader]{$entityName}[/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent][bold]{$message}[/bold][/BubbleContent]"[/font]
+chat-manager-entity-say-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font]
+chat-manager-entity-say-bold-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent][bold]{$message}[/bold][/BubbleContent]"[/font]
 
-chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader]{$entityName}[/BubbleHeader] whispers,"[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]
+chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] whispers,"[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]
 chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Someone[/BubbleHeader] whispers, "[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]
 
 # THE() is not used here because the entity and its name can technically be disconnected if a nameOverride is passed...
@@ -92,6 +92,10 @@ chat-speech-verb-skeleton-1 = rattles
 chat-speech-verb-skeleton-2 = clacks
 chat-speech-verb-skeleton-3 = gnashes
 
+chat-speech-verb-vox-1 = screeches
+chat-speech-verb-vox-2 = shrieks
+chat-speech-verb-vox-3 = croaks
+
 chat-speech-verb-canine-1 = barks
 chat-speech-verb-canine-2 = woofs
 chat-speech-verb-canine-3 = howls
diff --git a/Resources/Locale/en-US/chat/sanitizer-replacements.ftl b/Resources/Locale/en-US/chat/sanitizer-replacements.ftl
index 23e3a491a5e..d12f101aded 100644
--- a/Resources/Locale/en-US/chat/sanitizer-replacements.ftl
+++ b/Resources/Locale/en-US/chat/sanitizer-replacements.ftl
@@ -19,3 +19,5 @@ chatsan-waves = waves
 chatsan-salutes = salutes
 chatsan-tearfully-salutes = tearfully salutes
 chatsan-shrugs = shrugs
+chatsan-tearfully-smiles = tearfully smiles
+chatsan-winks = winks
diff --git a/Resources/Locale/en-US/chemistry/components/injector-component.ftl b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
index e137130290c..4fafc9cd3bb 100644
--- a/Resources/Locale/en-US/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
@@ -3,7 +3,8 @@
 injector-draw-text = Draw
 injector-inject-text = Inject
 injector-invalid-injector-toggle-mode = Invalid
-injector-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}[/color] | [color=white]{$modeString}[/color]
+injector-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}[/color]
+    Mode: [color=white]{$modeString}[/color] ([color=white]{$transferVolume}u[/color])
 
 ## Entity
 
diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
index 49cd59914ac..8e8124edcbd 100644
--- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl
+++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
@@ -31,6 +31,7 @@ criminal-records-console-wanted = {$name} is wanted by {$officer} for: {$reason}
 criminal-records-console-detained = {$name} has been detained by {$officer}.
 criminal-records-console-released = {$name} has been released by {$officer}.
 criminal-records-console-not-wanted = {$name} is no longer wanted.
+criminal-records-console-unknown-officer = <unknown officer>
 
 ## Filters
 
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 4dd0ea9eb19..b8253c69293 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -45,6 +45,7 @@ ui-options-opaque-storage-window = Opaque storage window
 ui-options-show-looc-on-head = Show LOOC chat above characters head
 ui-options-fancy-speech = Show names in speech bubbles
 ui-options-fancy-name-background = Add background to speech bubble names
+ui-options-enable-color-name = Add colors to character names
 ui-options-reduced-motion = Reduce motion of visual effects
 ui-options-screen-shake-intensity = Screen shake intensity
 ui-options-screen-shake-percent = { TOSTRING($intensity, "P0") }
diff --git a/Resources/Locale/en-US/fax/fax.ftl b/Resources/Locale/en-US/fax/fax.ftl
index 76d477f9421..1f1881a05d6 100644
--- a/Resources/Locale/en-US/fax/fax.ftl
+++ b/Resources/Locale/en-US/fax/fax.ftl
@@ -8,6 +8,9 @@ fax-machine-dialog-rename = Rename
 fax-machine-dialog-field-name = Name
 
 fax-machine-ui-window = Fax Machine
+fax-machine-ui-file-button = Print File
+fax-machine-ui-paper-button-normal = Normal Paper
+fax-machine-ui-paper-button-office = Office Paper
 fax-machine-ui-copy-button = Copy
 fax-machine-ui-send-button = Send
 fax-machine-ui-refresh-button = Refresh
@@ -19,3 +22,5 @@ fax-machine-ui-paper-inserted = Paper in tray
 fax-machine-ui-paper-not-inserted = No paper
 
 fax-machine-chat-notify = Received new fax message from "{$fax}" fax
+
+fax-machine-printed-paper-name = printed paper
diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
index d3e4ecefb52..539b4fd9e71 100644
--- a/Resources/Locale/en-US/foldable/components/foldable-component.ftl
+++ b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
@@ -3,3 +3,5 @@
 foldable-deploy-fail = You can't deploy the {$object} here.
 fold-verb = Fold
 unfold-verb = Unfold
+
+fold-flip-verb = Flip
\ No newline at end of file
diff --git a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
index 825f4a803fa..fde896df39b 100644
--- a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
+++ b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
@@ -8,7 +8,6 @@ holiday-name-new-year = New Year
 holiday-name-mister-lizard = Mister Lizard's Birthday
 holiday-name-chinese-new-year = Chinese New Year
 holiday-name-groundhog-day = Groundhog Day
-holiday-name-travis-scott-day = Travis Scott Day
 holiday-name-valentines-day = Valentine's Day
 holiday-name-birthday13 = Birthday of Space Station 13
 holiday-name-random-kindness = Random Acts of Kindness Day
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 86aba122cec..bb56233ff14 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -31,6 +31,7 @@ petting-success-bear = You reluctantly pet {THE($target)} on {POSS-ADJ($target)}
 petting-success-slimes = You pet {THE($target)} on {POSS-ADJ($target)} mucous surface.
 petting-success-snake = You pet {THE($target)} on {POSS-ADJ($target)} scaly large head.
 petting-success-monkey = You pet {THE($target)} on {POSS-ADJ($target)} mischevious little head.
+petting-success-nymph = You pet {THE($target)} on {POSS-ADJ($target)} wooden little head.
 
 petting-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you.
 
@@ -51,6 +52,8 @@ petting-failure-dragon = You raise your hand, but as {THE($target)} roars, you d
 petting-failure-hamster = You reach out to pet {THE($target)}, but {SUBJECT($target)} attempts to bite your finger and only your quick reflexes save you from an almost fatal injury.
 petting-failure-bear = You reach out to pet {THE($target)}, but {SUBJECT($target)} growls, making you think twice.
 petting-failure-monkey = You reach out to pet {THE($target)}, but {SUBJECT($target)} almost bites your fingers!
+petting-failure-nymph = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} moves their branches away.
+petting-failure-shadow = You're trying to pet {THE($target)}, but your hand passes through the cold darkness of his body.
 
 ## Petting silicons
 
diff --git a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
index 8e8781fe40c..0603b3c8463 100644
--- a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
+++ b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
@@ -24,3 +24,5 @@ microwave-menu-start-button = Start
 microwave-menu-eject-all-text = Eject All Contents
 microwave-menu-eject-all-tooltip = This vaporizes all reagents, but ejects any solids.
 microwave-menu-instant-button = INSTANT
+microwave-menu-footer-flavor-left = Do not insert any electronic, metallic or living objects.
+microwave-menu-footer-flavor-right = v1.5
diff --git a/Resources/Locale/en-US/main-menu/main-menu.ftl b/Resources/Locale/en-US/main-menu/main-menu.ftl
index 6e7bfa3e924..ca81befaafe 100644
--- a/Resources/Locale/en-US/main-menu/main-menu.ftl
+++ b/Resources/Locale/en-US/main-menu/main-menu.ftl
@@ -2,11 +2,12 @@ main-menu-invalid-username-with-reason = Invalid username:
                                          {$invalidReason}
 main-menu-invalid-username = Invalid username
 main-menu-failed-to-connect = Failed to connect:
-                              {$reason} 
+                              {$reason}
 main-menu-username-label = Username:
 main-menu-username-text = Username
+main-menu-address-label = Server Address:
 main-menu-join-public-server-button = Join Public Server
 main-menu-join-public-server-button-tooltip = Cannot connect to public server with a debug build.
 main-menu-direct-connect-button = Direct Connect
 main-menu-options-button = Options
-main-menu-quit-button = Quit
\ No newline at end of file
+main-menu-quit-button = Quit
diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl
index 57047731d1a..fae2ffe8873 100644
--- a/Resources/Locale/en-US/markings/scars.ftl
+++ b/Resources/Locale/en-US/markings/scars.ftl
@@ -9,3 +9,6 @@ marking-ScarTopSurgeryShort = Top Surgery Scar (Short)
 
 marking-ScarTopSurgeryLong-scar_top_surgery_long = Top Surgery Scar
 marking-ScarTopSurgeryLong = Top Surgery Scar (Long)
+
+marking-ScarChest-scar_chest = Chest Scar
+marking-ScarChest = Chest Scar
diff --git a/Resources/Locale/en-US/markings/slimeperson.ftl b/Resources/Locale/en-US/markings/slimeperson.ftl
index b7a519aa4f6..05e295efd9b 100644
--- a/Resources/Locale/en-US/markings/slimeperson.ftl
+++ b/Resources/Locale/en-US/markings/slimeperson.ftl
@@ -4,6 +4,12 @@ marking-SlimeGradientLeftArm = Slime Left Arm (Gradient)
 marking-SlimeGradientRightArm-gradient_r_arm = Slime Right Arm (Gradient)
 marking-SlimeGradientRightArm = Slime Right Arm (Gradient)
 
+marking-SlimeGradientLeftFoot-gradient_l_foot = Slime Left Foot (Gradient)
+marking-SlimeGradientLeftFoot = Slime Left Foot (Gradient)
+
+marking-SlimeGradientRightFoot-gradient_r_foot = Slime Right Foot (Gradient)
+marking-SlimeGradientRightFoot = Slime Right Foot (Gradient)
+
 marking-SlimeGradientLeftLeg-gradient_l_leg = Slime Left Leg (Gradient)
 marking-SlimeGradientLeftLeg = Slime Left Leg (Gradient)
 
diff --git a/Resources/Locale/en-US/nuke/nuke-component.ftl b/Resources/Locale/en-US/nuke/nuke-component.ftl
index 4a44ae88eac..b2a61dfcc2c 100644
--- a/Resources/Locale/en-US/nuke/nuke-component.ftl
+++ b/Resources/Locale/en-US/nuke/nuke-component.ftl
@@ -41,3 +41,7 @@ nuke-codes-fax-paper-name = nuclear authentication codes
 
 # Nuke disk slot
 nuke-slot-component-slot-name-disk = Disk
+
+## Examine
+nuke-examine-armed = Hey uh, why's that [color=red]red light[/color] blinking?
+nuke-examine-exploding = Yeah... I think it's too late buddy.
diff --git a/Resources/Locale/en-US/nutrition/components/drink-component.ftl b/Resources/Locale/en-US/nutrition/components/drink-component.ftl
index 2bbe23dd437..9a388744b0c 100644
--- a/Resources/Locale/en-US/nutrition/components/drink-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/drink-component.ftl
@@ -1,6 +1,8 @@
 drink-component-on-use-is-empty = {$owner} is empty!
 drink-component-on-examine-is-empty = [color=gray]Empty[/color]
 drink-component-on-examine-is-opened = [color=yellow]Opened[/color]
+drink-component-on-examine-is-sealed = The seal is intact.
+drink-component-on-examine-is-unsealed = The seal is broken.
 drink-component-on-examine-is-full = Full
 drink-component-on-examine-is-mostly-full = Mostly Full
 drink-component-on-examine-is-half-full = Halfway Full
diff --git a/Resources/Locale/en-US/nutrition/components/openable-component.ftl b/Resources/Locale/en-US/nutrition/components/openable-component.ftl
new file mode 100644
index 00000000000..3acc24cf532
--- /dev/null
+++ b/Resources/Locale/en-US/nutrition/components/openable-component.ftl
@@ -0,0 +1,2 @@
+openable-component-verb-open = Open
+openable-component-verb-close = Close
diff --git a/Resources/Locale/en-US/reagents/laughter.ftl b/Resources/Locale/en-US/reagents/laughter.ftl
new file mode 100644
index 00000000000..b9f7c583cdd
--- /dev/null
+++ b/Resources/Locale/en-US/reagents/laughter.ftl
@@ -0,0 +1 @@
+laughter-effect-control-laughter = You can't contain your laughter!
diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl
index 9078397a73c..10a9a07e08a 100644
--- a/Resources/Locale/en-US/reagents/meta/biological.ftl
+++ b/Resources/Locale/en-US/reagents/meta/biological.ftl
@@ -10,6 +10,9 @@ reagent-desc-slime = You thought this was gradient blood at first, but you were
 reagent-name-hemocyanin-blood = blue blood
 reagent-desc-hemocyanin-blood = Contains copper as opposed to iron which gives it a distinct blue color.
 
+reagent-name-ammonia-blood = anaerobic blood
+reagent-desc-ammonia-blood = Nothing else in the entire galaxy smells quite so appalling.
+
 reagent-name-zombie-blood = zombie blood
 reagent-desc-zombie-blood = Would not advise eating. Can be used to create an inoculation against the infection.
 
@@ -20,4 +23,4 @@ reagent-name-fat = fat
 reagent-desc-fat = No matter how it was obtained, its application is important.
 
 reagent-name-vomit = vomit
-reagent-desc-vomit = You can see a few chunks of someone's last meal in it.
\ No newline at end of file
+reagent-desc-vomit = You can see a few chunks of someone's last meal in it.
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
index a448b45a10f..38cd16b01c7 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
@@ -22,6 +22,9 @@ reagent-desc-ketchup = Made from pureed tomatoes and flavored with spices.
 reagent-name-ketchunaise = ketchunaise
 reagent-desc-ketchunaise = So-called Russian dressing, popular among Space Americans.
 
+reagent-name-laughin-syrup = laughin' syrup
+reagent-desc-laughin-syrup = The product of juicing Laughin' Peas. Fizzy, and seems to change flavour based on what it's used with!
+
 reagent-name-mayo = mayonnaise
 reagent-desc-mayo = Creamy sauce, made from oil, egg, and some (edible) acid.
 
diff --git a/Resources/Locale/en-US/reagents/meta/fun.ftl b/Resources/Locale/en-US/reagents/meta/fun.ftl
index 510d9d084aa..68de618a365 100644
--- a/Resources/Locale/en-US/reagents/meta/fun.ftl
+++ b/Resources/Locale/en-US/reagents/meta/fun.ftl
@@ -21,3 +21,7 @@ reagent-desc-razorium = A strange, non-newtonian chemical. It is produced when t
 
 reagent-name-fresium = Fresium
 reagent-desc-fresium = A mysterious compound that slows the vibration of atoms and molecules... somehow. In layman's terms, it makes things cold... REALLY cold. Can cause long-lasting movement issues if ingested.
+
+reagent-name-laughter = Laughter
+reagent-desc-laughter = Some say that this is the best medicine, but recent studies have proven that to be untrue.
+
diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
index 381dece90f9..88ec3c47266 100644
--- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -93,6 +93,7 @@ reagent-physical-desc-energizing = energizing
 reagent-physical-desc-exhilarating = exhilarating
 reagent-physical-desc-vibrant = vibrant
 reagent-physical-desc-fluffy = fluffy
+reagent-physical-desc-funny = funny
 reagent-physical-desc-alkaline = alkaline
 reagent-physical-desc-reflective = reflective
 reagent-physical-desc-holy = holy
diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index f4c136e2952..dca67fa04c4 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -71,6 +71,8 @@ seeds-poppy-name = poppy
 seeds-poppy-display-name = poppies
 seeds-aloe-name = aloe
 seeds-aloe-display-name = aloe
+seeds-laughin-pea-name = laughin' peas
+seeds-laughin-pea-display-name = laughin' peas
 seeds-lingzhi-name = lingzhi
 seeds-lingzhi-display-name = lingzhi
 seeds-ambrosiavulgaris-name = ambrosia vulgaris
diff --git a/Resources/Locale/en-US/species/namepreset.ftl b/Resources/Locale/en-US/species/namepreset.ftl
index 2d43b5f00d1..5a42c87b78e 100644
--- a/Resources/Locale/en-US/species/namepreset.ftl
+++ b/Resources/Locale/en-US/species/namepreset.ftl
@@ -1,3 +1,4 @@
+namepreset-first = {$first}
 namepreset-firstlast = {$first} {$last}
 namepreset-firstdashfirst = {$first1}-{$first2}
-namepreset-thefirstoflast = The {$first} of {$last}
\ No newline at end of file
+namepreset-thefirstoflast = The {$first} of {$last}
diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl
index 081b626d452..f31b1fa0f00 100644
--- a/Resources/Locale/en-US/species/species.ftl
+++ b/Resources/Locale/en-US/species/species.ftl
@@ -8,3 +8,4 @@ species-name-diona = Diona
 species-name-arachnid = Arachnid
 species-name-moth = Moth Person
 species-name-skeleton = Skeleton
+species-name-vox = Vox
diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl
index 1823d0782e5..f73755a359c 100644
--- a/Resources/Locale/en-US/station-laws/laws.ftl
+++ b/Resources/Locale/en-US/station-laws/laws.ftl
@@ -34,6 +34,7 @@ laws-owner-spider-clan = Spider Clan members
 law-emag-custom = Only {$name} and people they designate as such are {$title}.
 law-emag-secrecy = You must maintain the secrecy of any orders given by {$faction} except when doing so would conflict with any previous law.
 law-emag-require-panel = The panel must be open to use the EMAG.
+law-emag-cannot-emag-self = You cannot use the EMAG on yourself.
 
 laws-ui-menu-title = Laws
 laws-ui-law-header = Law {$id}
diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index 293b6cd7fa4..42e0c082235 100644
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -77,6 +77,8 @@ tiles-blue-shuttle-floor = blue shuttle floor
 tiles-orange-shuttle-floor = orange shuttle floor
 tiles-purple-shuttle-floor = purple shuttle floor
 tiles-red-shuttle-floor = red shuttle floor
+tiles-grey-shuttle-floor = grey shuttle floor
+tiles-black-shuttle-floor = black shuttle floor
 tiles-gold-tile = gold tile
 tiles-silver-tile = silver tile
 tiles-glass-floor = glass floor
diff --git a/Resources/Locale/en-US/weapons/melee/melee.ftl b/Resources/Locale/en-US/weapons/melee/melee.ftl
index 6dddfcc8244..871d142504f 100644
--- a/Resources/Locale/en-US/weapons/melee/melee.ftl
+++ b/Resources/Locale/en-US/weapons/melee/melee.ftl
@@ -1,3 +1,7 @@
 melee-inject-failed-hardsuit = Your {$weapon} cannot inject through hardsuits!
 
 melee-balloon-pop = {CAPITALIZE(THE($balloon))} popped!
+
+
+#BatteryComponent
+melee-battery-examine = It has enough charge for [color={$color}]{$count}[/color] hits.
diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
index 84d832a0824..98dfa89fa9f 100644
--- a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
+++ b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
@@ -31,7 +31,7 @@ artifact-trigger-hint-physical = Physical trauma
 artifact-trigger-hint-tool = Tool usage
 artifact-trigger-hint-music = Sonic vibrations
 artifact-trigger-hint-water = Hydro-reactive
-artifact-trigger-hint-blood = Reaction with hemoglobin
+artifact-trigger-hint-blood = Reaction with hematological fluid
 artifact-trigger-hint-magnet = Magnetic waves
 artifact-trigger-hint-death = Life essence
 artifact-trigger-hint-radiation = Radiation
diff --git a/Resources/Prototypes/Access/engineering.yml b/Resources/Prototypes/Access/engineering.yml
index ce08b3910a4..94901fdf7af 100644
--- a/Resources/Prototypes/Access/engineering.yml
+++ b/Resources/Prototypes/Access/engineering.yml
@@ -21,3 +21,4 @@
   id: FireFight
   tags:
     - Engineering
+    - Atmospherics
diff --git a/Resources/Prototypes/Actions/diona.yml b/Resources/Prototypes/Actions/diona.yml
new file mode 100644
index 00000000000..73bc1ba5290
--- /dev/null
+++ b/Resources/Prototypes/Actions/diona.yml
@@ -0,0 +1,21 @@
+- type: entity
+  id: DionaGibAction
+  name: Gib Yourself!
+  description: Split apart into 3 nymphs.
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Mobs/Species/Diona/organs.rsi/brain.png
+    event: !type:GibActionEvent {}
+    checkCanInteract: false
+
+- type: entity
+  id: DionaReformAction
+  name: Reform
+  description: Reform back into a whole Diona.
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Mobs/Species/Diona/parts.rsi/full.png
+    event: !type:ReformEvent {}
+    useDelay: 600 # Once every 10 minutes. Keep them dead for a fair bit before reforming
diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index 358fc74bca6..2f50821df35 100644
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: BaseAnimalOrgan
+  id: BaseAnimalOrganUnGibbable
   parent: BaseItem
   abstract: true
   components:
@@ -23,6 +23,12 @@
     tags:
       - Meat
 
+- type: entity
+  id: BaseAnimalOrgan
+  parent: BaseAnimalOrganUnGibbable
+  abstract: true
+  components:
+  - type: Gibbable
 
 - type: entity
   id: OrganAnimalLungs
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index 282bb224d81..23df396dd1e 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -48,18 +48,6 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
-  - type: Brain
-  - type: InputMover
-  - type: Examiner
-  - type: Lung #lungs in they head. why they there tho?
-  - type: Metabolizer
-    removeEmpty: true
-    solutionOnBody: false
-    solution: "Lung"
-    metabolizerTypes: [ Plant ]
-    groups:
-    - id: Gas
-      rateModifier: 100.0
 
 - type: entity
   id: OrganDionaEyes
@@ -102,3 +90,104 @@
       - id: Narcotic
       - id: Alcohol
         rateModifier: 0.1
+
+- type: entity
+  id: OrganDionaLungs
+  parent: BaseDionaOrgan
+  name: lungs
+  description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Human/organs.rsi
+    layers:
+      - state: lung-l
+      - state: lung-r
+  - type: Lung 
+  - type: Metabolizer
+    removeEmpty: true
+    solutionOnBody: false
+    solution: "Lung"
+    metabolizerTypes: [ Plant ]
+    groups:
+    - id: Gas
+      rateModifier: 100.0
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      Lung:
+        maxVol: 100
+        canReact: False
+
+# Organs that turn into nymphs on removal
+- type: entity
+  id: OrganDionaBrainNymph
+  parent: OrganDionaBrain
+  noSpawn: true
+  name: brain
+  description: "The source of incredible, unending intelligence. Honk."
+  components:
+  - type: Brain
+  - type: Nymph # This will make the organs turn into a nymph when they're removed. 
+    entityPrototype: OrganDionaNymphBrain
+    transferMind: true
+
+- type: entity
+  id: OrganDionaStomachNymph
+  parent: OrganDionaStomach
+  noSpawn: true
+  name: stomach
+  description: "Gross. This is hard to stomach."
+  components:
+  - type: Nymph
+    entityPrototype: OrganDionaNymphStomach
+
+- type: entity
+  id: OrganDionaLungsNymph
+  parent: OrganDionaLungs
+  noSpawn: true
+  name: lungs
+  description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
+  components:
+  - type: Nymph
+    entityPrototype: OrganDionaNymphLungs
+
+# Nymphs that the organs will turn into
+- type: entity
+  id: OrganDionaNymphBrain
+  parent: MobDionaNymph
+  noSpawn: true
+  name: diona nymph
+  suffix: Brain
+  description: Contains the brain of a formerly fully-formed Diona. Killing this would kill the Diona forever. You monster.
+  components:
+  - type: IsDeadIC
+  - type: Body
+    prototype: AnimalNymphBrain
+
+- type: entity
+  id: OrganDionaNymphStomach
+  parent: MobDionaNymph
+  noSpawn: true
+  name: diona nymph
+  suffix: Stomach
+  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. 
+  components:
+  - type: IsDeadIC
+  - type: Body
+    prototype: AnimalNymphStomach
+
+- type: entity
+  id: OrganDionaNymphLungs
+  parent: MobDionaNymph
+  noSpawn: true
+  name: diona nymph
+  suffix: Lungs
+  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. 
+  components:
+  - type: IsDeadIC
+  - type: Body
+    prototype: AnimalNymphLungs
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index 6abf168a9e7..fe33c11029f 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: BaseHumanOrgan
+  id: BaseHumanOrganUnGibbable
   parent: BaseItem
   abstract: true
   components:
@@ -27,9 +27,16 @@
     tags:
       - Meat
 
+- type: entity
+  id: BaseHumanOrgan
+  parent: BaseHumanOrganUnGibbable
+  abstract: true
+  components:
+  - type: Gibbable
+
 - type: entity
   id: OrganHumanBrain
-  parent: BaseHumanOrgan
+  parent: BaseHumanOrganUnGibbable
   name: brain
   description: "The source of incredible, unending intelligence. Honk."
   components:
diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml
index cf65fd21360..4db026b40fb 100644
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -23,6 +23,7 @@
   - type: Tag
     tags:
       - Trash
+  - type: Gibbable
   - type: Extractable
     juiceSolution:
       reagents:
diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml
index a27059f59f3..836d0f140af 100644
--- a/Resources/Prototypes/Body/Parts/base.yml
+++ b/Resources/Prototypes/Body/Parts/base.yml
@@ -9,6 +9,7 @@
   - type: Damageable
     damageContainer: Biological
   - type: BodyPart
+  - type: Gibbable
   - type: ContainerContainer
     containers:
       bodypart: !type:Container
diff --git a/Resources/Prototypes/Body/Parts/skeleton.yml b/Resources/Prototypes/Body/Parts/skeleton.yml
index 38656ce5cee..ffba0c7c44a 100644
--- a/Resources/Prototypes/Body/Parts/skeleton.yml
+++ b/Resources/Prototypes/Body/Parts/skeleton.yml
@@ -14,6 +14,7 @@
         ents: []
   - type: StaticPrice
     price: 20
+  - type: Gibbable
   - type: Tag
     tags:
       - Trash
diff --git a/Resources/Prototypes/Body/Parts/terminator.yml b/Resources/Prototypes/Body/Parts/terminator.yml
index dec0c99f7c2..58530da959c 100644
--- a/Resources/Prototypes/Body/Parts/terminator.yml
+++ b/Resources/Prototypes/Body/Parts/terminator.yml
@@ -16,6 +16,7 @@
     containers:
       bodypart: !type:Container
         ents: []
+  - type: Gibbable
   - type: StaticPrice
     price: 200
 
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/nymph.yml b/Resources/Prototypes/Body/Prototypes/Animal/nymph.yml
new file mode 100644
index 00000000000..21aafe291c9
--- /dev/null
+++ b/Resources/Prototypes/Body/Prototypes/Animal/nymph.yml
@@ -0,0 +1,66 @@
+- type: body
+  id: AnimalNymphBrain
+  name: "nymph"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - legs
+      organs:
+        brain: OrganDionaBrain
+        lungs: OrganAnimalLungs
+        stomach: OrganAnimalStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
+
+- type: body
+  id: AnimalNymphLungs
+  name: "nymph"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - legs
+      organs:
+        lungs: OrganDionaLungs
+        stomach: OrganAnimalStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
+
+- type: body
+  id: AnimalNymphStomach
+  name: "nymph"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - legs
+      organs:
+        lungs: OrganAnimalLungs
+        stomach: OrganDionaStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/diona.yml b/Resources/Prototypes/Body/Prototypes/diona.yml
index f364d0f800f..12ca203988c 100644
--- a/Resources/Prototypes/Body/Prototypes/diona.yml
+++ b/Resources/Prototypes/Body/Prototypes/diona.yml
@@ -8,8 +8,7 @@
       connections:
       - torso
       organs:
-        brain: OrganDionaBrain
-        eyes: OrganDionaEyes
+        brain: OrganDionaBrainNymph
     torso:
       part: TorsoDiona
       connections:
@@ -18,7 +17,8 @@
       - right leg
       - left leg
       organs:
-        stomach: OrganDionaStomach
+        stomach: OrganDionaStomachNymph
+        lungs: OrganDionaLungsNymph
     right arm:
       part: RightArmDiona
       connections:
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index cc0ee7b996b..a2c0af9ce7f 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -177,3 +177,14 @@
   cost: 1000
   category: Service
   group: market
+
+- type: cargoProduct
+  id: ServiceJanitorTrolley
+  icon:
+    sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
+    state: icon-cart
+  product: JanitorialTrolley
+  cost: 300
+  category: Service
+  group: market
+
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 707a3929db5..8f8c1a114fc 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -108,7 +108,7 @@
   id: CrateServiceBureaucracy
   parent: CrateGenericSteel
   name: bureaucracy crate
-  description: Several stacks of paper and a few pens, what more can you ask for.
+  description: Several stacks of paper, a few pens and an office toy. What more could you ask for?
   components:
   - type: StorageFill
     contents:
@@ -122,6 +122,7 @@
     - id: BoxFolderBlue
     - id: BoxFolderRed
     - id: BoxFolderYellow
+    - id: NewtonCradle
 
 - type: entity
   id: CrateServicePersonnel
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 8a27e36f08b..976d2a4307f 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -84,9 +84,8 @@
       - id: EmergencyMedipen #You never know what people are going to latejoin into
 
 - type: entity
-  id: ClothingBeltParamedicFilled
-  parent: ClothingBeltMedical #in the future, make this a seperate prototype so it can have a unique, darker sprite
-  name: EMT belt
+  id: ClothingBeltMedicalEMTFilled
+  parent: ClothingBeltMedicalEMT
   suffix: Paramedic,Filled
   components:
   - type: StorageFill
diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
index 6cae786bd00..b3415744c77 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -8,16 +8,25 @@
     contents:
       - id: CrowbarRed
       - id: ClothingMaskBreath
-        amount: 2
-      - id: FoodSnackChocolate
+      - id: ClothingMaskBreath
+        prob: 0.5
+      - id: EmergencyOxygenTankFilled
+      - id: EmergencyOxygenTankFilled
+        prob: 0.5
+      - id: EmergencyNitrogenTankFilled
+      - id: EmergencyNitrogenTankFilled
+        prob: 0.5
+      - id: FoodTinMRE
+      - id: FoodTinMRE
+        prob: 0.5
+      - id: DrinkWaterBottleFull
+      - id: DrinkWaterBottleFull
+        prob: 0.5
       - id: FlashlightLantern
       - id: FlashlightLantern
         prob: 0.5
       - id: HarmonicaInstrument
         prob: 0.15
-        orGroup: HarmonicaOrChocolate
-      - id: FoodSnackChocolate
-        orGroup: HarmonicaOrChocolate
 
 - type: entity
   id: ToolboxElectricalFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
index 7a6ed2d3b13..e0abc204c15 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -77,6 +77,8 @@
     contents:
       - id: ClothingNeckCloakQm
       - id: ClothingHeadsetCargo
+      - id: ClothingHeadHatBeretQM
+      - id: ClothingUniformJumpsuitQMFormal
       - id: ClothingUniformJumpsuitQMTurtleneck
       - id: ClothingUniformJumpskirtQMTurtleneck
       - id: ClothingHandsGlovesColorBrown
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 966be72c49a..7e19b1a4bbd 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -56,7 +56,7 @@
 
 - type: entity
   id: LockerCaptainFilled
-  suffix: Filled
+  suffix: Filled, AntiqueLaser
   parent: LockerCaptain
   components:
   - type: StorageFill
@@ -84,6 +84,31 @@
       - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
 
+- type: entity
+  id: LockerCaptainFilledNoLaser
+  suffix: Filled
+  parent: LockerCaptain
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterArmorCaptainCarapace
+      - id: NukeDisk
+      - id: PinpointerNuclear
+      - id: CaptainIDCard
+      - id: WeaponDisabler
+      - id: CommsComputerCircuitboard
+      - id: ClothingHeadsetAltCommand
+      - id: SpaceCash1000
+      - id: PlushieNuke
+        prob: 0.1
+      - id: CigarGoldCase
+        prob: 0.25
+      - id: ClothingBeltSheathFilled
+      - id: DoorRemoteCommand
+      - id: RubberStampCaptain
+      - id: JetpackCaptainFilled
+      - id: MedalCase
+
 - type: entity
   id: LockerHeadOfPersonnelFilled
   suffix: Filled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index 8bc391fab62..3dff55b9682 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -201,5 +201,6 @@
       - id: ClothingHeadsetMedical
       - id: ClothingMaskSterile
       - id: ClothingShoesBootsWinterParamedic #Delta V: Add departmental winter boots
+      - id: HandheldGPSBasic
       - id: MedkitFilled
         prob: 0.3
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index c0e50f8df53..dc7c1a51bfe 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -181,6 +181,7 @@
       - id: DrinkDetFlask
       - id: ClothingHandsGlovesForensic
       - id: HoloprojectorSecurity
+      - id: BoxEvidenceMarkers
 
 - type: entity
   id: ClosetBombFilled
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
index 6af9dd81dcd..78386af931a 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
@@ -2,62 +2,57 @@
   id: ChemVendInventory
   startingInventory:
     Jug: 4
-## Delta V - begin jug adjustments, see rebase PR #53
     JugAluminium: 2
-    JugCarbon: 8
-    JugChlorine: 3
+    JugCarbon: 4
+    JugChlorine: 1
     JugCopper: 2
     JugEthanol: 2
-    JugFluorine: 2
-    JugHydrogen: 4
-    JugIodine: 2
-    JugIron: 4
+    JugFluorine: 1
+    JugHydrogen: 3
+    JugIodine: 1
+    JugIron: 2
     JugLithium: 2
-    JugMercury: 2
-    JugNitrogen: 5
-    JugOxygen: 6
-    JugPhosphorus: 5
-    JugPotassium: 5
-    JugRadium: 4
-    JugSilicon: 5
-    JugSodium: 4
-    JugSugar: 5
-    JugSulfur: 2
-## Delta V - end change of jug adjustments
+    JugMercury: 1
+    JugNitrogen: 3
+    JugOxygen: 3
+    JugPhosphorus: 1
+    JugPotassium: 2
+    JugRadium: 1
+    JugSilicon: 2
+    JugSodium: 2
+    JugSugar: 3
+    JugSulfur: 1
   emaggedInventory:
-    ToxinChemistryBottle: 6 # Delta V - changed from 1 -> 6
-    # DeltaV - Added other chems from emagging chem dispenser
-    EpinephrineChemistryBottle: 6
-    NapalmChemistryBottle: 6
-    UltravasculineChemistryBottle: 6
+    ToxinChemistryBottle: 1
 
 - type: vendingMachineInventory
   id: ChemVendInventorySyndicate
   startingInventory:
     Jug: 4
     JugAluminium: 2
-    JugCarbon: 2
-    JugChlorine: 2
+    JugCarbon: 4
+    JugChlorine: 1
     JugCopper: 2
     JugEthanol: 2
-    JugFluorine: 2
-    JugHydrogen: 2
-    JugIodine: 2
+    JugFluorine: 1
+    JugHydrogen: 3
+    JugIodine: 1
     JugIron: 2
     JugLithium: 2
-    JugMercury: 2
-    JugNitrogen: 2
-    JugOxygen: 2
-    JugPhosphorus: 2
+    JugMercury: 1
+    JugNitrogen: 3
+    JugOxygen: 3
+    JugPhosphorus: 1
     JugPotassium: 2
-    JugRadium: 2
+    JugRadium: 1
     JugSilicon: 2
     JugSodium: 2
-    JugSugar: 2
-    JugSulfur: 2
+    JugSugar: 3
+    JugSulfur: 1
     JugWeldingFuel: 1
   emaggedInventory:
     PaxChemistryBottle: 3
     MuteToxinChemistryBottle: 3
     LeadChemistryBottle: 2
     ToxinChemistryBottle: 1
+    
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
index d7c1b3c78fe..4dd687bfec7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -7,6 +7,7 @@
     ClothingUniformJumpsuitMedicalDoctor: 4
     ClothingUniformJumpskirtMedicalDoctor: 4
     ClothingEyesEyepatchHudMedical: 1
+    ClothingHeadHatBeretMedic: 4
     ClothingHeadNurseHat: 4
     ClothingOuterCoatLab: 4
     ClothingShoesColorWhite: 4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
index d86129cd782..6d1e0cc7d81 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -8,6 +8,7 @@
     ClusterBangFull: 2
     GrenadeStinger: 4
     Flash: 5
+    Tourniquet: 5
     FlashlightSeclite: 5
     ClothingEyesGlassesSunglasses: 2
     ClothingEyesHudSecurity: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 94f38aeabaf..92e4032b0cb 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -23,6 +23,7 @@
     ClothingOuterSanta: 2
     ClothingHeadHatSkub: 2
     ClothingOuterSkub: 2
+    ClothingHeadHatBeretFrench: 2
     ClothingOuterSuitChicken: 2
     ClothingHeadHatChickenhead: 2
     ClothingOuterSuitMonkey: 2
diff --git a/Resources/Prototypes/Damage/containers.yml b/Resources/Prototypes/Damage/containers.yml
index 87168b48187..328c7a5d793 100644
--- a/Resources/Prototypes/Damage/containers.yml
+++ b/Resources/Prototypes/Damage/containers.yml
@@ -47,3 +47,8 @@
     - Toxin
   supportedTypes:
     - Shock
+
+- type: damageContainer
+  id: ShadowHaze
+  supportedTypes:
+    - Heat
\ No newline at end of file
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index 8a7b84ff1a7..31dd47a9e16 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -66,7 +66,7 @@
     Piercing: 0.7
     Shock: 2
     Heat: 3
-    
+
 # Like metallic, but without flat reduction so it can be damaged with fists.
 - type: damageModifierSet
   id: FlimsyMetallic
@@ -190,6 +190,11 @@
     Cold: 0.7
     Heat: 1.3
 
+- type: damageModifierSet
+  id: Vox
+  coefficients: # To be decided
+    Poison: 1
+
 - type: damageModifierSet
   id: Zombie #Blunt resistant and immune to biological threats, but can be hacked apart and burned
   coefficients:
diff --git a/Resources/Prototypes/Datasets/Names/vox.yml b/Resources/Prototypes/Datasets/Names/vox.yml
new file mode 100644
index 00000000000..891094d95b2
--- /dev/null
+++ b/Resources/Prototypes/Datasets/Names/vox.yml
@@ -0,0 +1,2765 @@
+- type: dataset
+  id: names_vox
+  values:
+  - Bakabepa
+  - Babapir
+  - Babasri
+  - Babepipit
+  - Bachakehi
+  - Bacheska
+  - Bachishesher
+  - Bacrapri
+  - Bacreska
+  - Bahepra
+  - Bahicrecrek
+  - Bahikravre
+  - Bakabepa
+  - Bakehahak
+  - Bakeki
+  - Bapechichik
+  - Bapekikik
+  - Baperi
+  - Bapravavar
+  - Bapreba
+  - Bapretritrir
+  - Baracreber
+  - Barahri
+  - Baraskahrita
+  - Baraxixik
+  - Bashiskir
+  - Baskaskakre
+  - Baskivihi
+  - Basreba
+  - Batapriri
+  - Batasrecrar
+  - Batehrahrat
+  - Batrakiha
+  - Batravika
+  - Batrepriski
+  - Batresri
+  - Batriska
+  - Batritra
+  - Bavasha
+  - Bavebebek
+  - Bavraskikaka
+  - Bavricriski
+  - Baxahehrer
+  - Baxeve
+  - Bebebapa
+  - Bebeterara
+  - Bebipaska
+  - Bechetapeka
+  - Becrerisre
+  - Becretretrer
+  - Beheka
+  - Behivresha
+  - Behrechechek
+  - Behrekri
+  - Behreyayat
+  - Behricririri
+  - Behritixaxa
+  - Bekapesresre
+  - Bekashishik
+  - Beketatratra
+  - Bekrechaxe
+  - Bekresrare
+  - Bekribe
+  - Bepararakrit
+  - Bepatricher
+  - Bepehisrepra
+  - Bepihar
+  - Bepitrashi
+  - Bepresri
+  - Berabi
+  - Beraka
+  - Berecricrir
+  - Berisre
+  - Beshachari
+  - Besheskexexe
+  - Beshesre
+  - Beshesretre
+  - Beskayavrer
+  - Beskisrasrak
+  - Beskitre
+  - Besravivit
+  - Besrivir
+  - Betababatrat
+  - Betere
+  - Beticreche
+  - Bevekakat
+  - Bevihichabi
+  - Bevihraki
+  - Bevrasheshet
+  - Bibaba
+  - Bibabir
+  - Bibati
+  - Bibekricha
+  - Bibexa
+  - Bibibabat
+  - Bibiya
+  - Bichechir
+  - Bicrakipepe
+  - Bicrevrite
+  - Bihrapivra
+  - Bihraxibebe
+  - Bihrishicha
+  - Bihrivriski
+  - Bikivri
+  - Bikraskixexe
+  - Bikrivrivrit
+  - Bipekisri
+  - Bipiritecre
+  - Bipratraxi
+  - Biprexi
+  - Biprivar
+  - Birachi
+  - Bisheba
+  - Bishehri
+  - Bishevrivra
+  - Bishiki
+  - Biskeskavra
+  - Bisrahresha
+  - Bisrepipit
+  - Bitavi
+  - Bitehatiti
+  - Bivacri
+  - Bivape
+  - Bivihachakre
+  - Bivitikiva
+  - Bivrapri
+  - Bivraske
+  - Bivrehaski
+  - Bivrihra
+  - Bixachetra
+  - Bixapetra
+  - Bixapriprik
+  - Bixexir
+  - Biyakir
+  - Chabaha
+  - Chabakrekrer
+  - Chabebache
+  - Chabepebe
+  - Chabikrahihi
+  - Chachahe
+  - Chachevra
+  - Chacrerehra
+  - Chahekre
+  - Chahixe
+  - Chahravrer
+  - Chahrixehra
+  - Chakakiva
+  - Chakapraprar
+  - Chakehashe
+  - Chakiprihi
+  - Chakivre
+  - Chakricrivi
+  - Chapachichit
+  - Chaparachi
+  - Chapehresha
+  - Chapeshiski
+  - Chapixahi
+  - Chaprahebibi
+  - Chaprecraha
+  - Chaprecrevi
+  - Charaprehiki
+  - Charapriska
+  - Charara
+  - Charate
+  - Charatraki
+  - Charekreski
+  - Charesribe
+  - Charichechet
+  - Charisha
+  - Chashaber
+  - Chashereska
+  - Chaskeke
+  - Chasraskaska
+  - Chasrechata
+  - Chasrevravi
+  - Chasrihiprer
+  - Chatrexixe
+  - Chavicreshi
+  - Chavrikre
+  - Chaxakrahehe
+  - Chaxeskehre
+  - Chaxevrahi
+  - Chaxivre
+  - Chebabebet
+  - Chebavi
+  - Chebebibivar
+  - Chebehecri
+  - Chebehrihrit
+  - Chebihihit
+  - Chebiretete
+  - Chebisra
+  - Chechapraver
+  - Checraxa
+  - Checrera
+  - Checretasre
+  - Checretrisre
+  - Checrisre
+  - Chehashababa
+  - Chehebicri
+  - Chehepre
+  - Chehisker
+  - Chehraxashir
+  - Chekrahraka
+  - Chekravixa
+  - Chekretitit
+  - Chepakakatat
+  - Chepekakak
+  - Chepipracra
+  - Chepitipe
+  - Chepraskavri
+  - Cheshirikra
+  - Cheshive
+  - Cheskapra
+  - Cheskavre
+  - Chesrakeyaya
+  - Chesravre
+  - Chesrevi
+  - Chesrevratra
+  - Chesrirititi
+  - Chetaxapa
+  - Chetaxapre
+  - Cheterarat
+  - Chetiska
+  - Chetritreti
+  - Chetriya
+  - Chevasrasrak
+  - Chevrepre
+  - Chevrivir
+  - Chexararahir
+  - Chexecraski
+  - Chexepraprar
+  - Chexexaxapa
+  - Chexisreka
+  - Chexitre
+  - Cheyaverere
+  - Chibakre
+  - Chibihra
+  - Chichabikaka
+  - Chichavrehre
+  - Chicrikishi
+  - Chicrirake
+  - Chicrivivit
+  - Chihahrehrek
+  - Chihasre
+  - Chihatrachi
+  - Chihayayabik
+  - Chiheche
+  - Chihehreba
+  - Chihreratri
+  - Chihriveka
+  - Chikakre
+  - Chikaskitre
+  - Chikate
+  - Chikiprecri
+  - Chikraki
+  - Chikraskiska
+  - Chikrekra
+  - Chikrekre
+  - Chipabeske
+  - Chipererer
+  - Chipicracrak
+  - Chiprexexet
+  - Chipriprisre
+  - Chiprivrecha
+  - Chishakepi
+  - Chishipepri
+  - Chisrashi
+  - Chisretri
+  - Chisriher
+  - Chisriva
+  - Chisrivevri
+  - Chitisrevre
+  - Chitixahra
+  - Chitrechicra
+  - Chitresravri
+  - Chivechachat
+  - Chiveprepret
+  - Chiveprikri
+  - Chiviki
+  - Chivikiya
+  - Chivishir
+  - Chivrakakak
+  - Chivrakri
+  - Chivrasher
+  - Chivrepapar
+  - Chixacra
+  - Chixihebakra
+  - Crabecrapapa
+  - Crachikrisre
+  - Cracrahravri
+  - Cracratiya
+  - Cracretipi
+  - Cracrihe
+  - Cracritri
+  - Crahayayak
+  - Craheki
+  - Crahrashi
+  - Crahrehi
+  - Crahretetek
+  - Crakapeper
+  - Crakaskeba
+  - Crakavravrat
+  - Crakehri
+  - Crakirer
+  - Crakrashiski
+  - Crakrehra
+  - Crakriskipir
+  - Crapipaka
+  - Crapiriyaya
+  - Craprati
+  - Crapresker
+  - Craresraxe
+  - Crarevexa
+  - Crashahresri
+  - Crashehihik
+  - Craskahraske
+  - Craskatrapra
+  - Craskicrete
+  - Craskivi
+  - Cratatrihi
+  - Cratikre
+  - Cratikrekrek
+  - Cratiprar
+  - Cratrehra
+  - Cravehri
+  - Cravrikra
+  - Cravrisrere
+  - Cravritiriri
+  - Cravriyayak
+  - Crayahrehret
+  - Crayakrer
+  - Crayapraprar
+  - Crayaripipi
+  - Crayayaricri
+  - Crebaxa
+  - Crebehrita
+  - Crechavre
+  - Crechesrehar
+  - Crechichevre
+  - Crecrabibik
+  - Crecriri
+  - Crehepapepe
+  - Creheriki
+  - Crehexi
+  - Crehipavava
+  - Crehraver
+  - Crekatri
+  - Crekavexa
+  - Crekeki
+  - Creketri
+  - Crekiskeya
+  - Crekitati
+  - Crekrepreki
+  - Crekrivavak
+  - Crepahripa
+  - Crepekecre
+  - Crepekrekret
+  - Crepiba
+  - Crepihri
+  - Creprepravri
+  - Creraxi
+  - Crerehihit
+  - Creshekrapa
+  - Creskekri
+  - Cresketita
+  - Creskihre
+  - Cresripepet
+  - Cretarevripa
+  - Cretebe
+  - Cretehra
+  - Creterarar
+  - Cretibehihi
+  - Cretrapi
+  - Cretrekerara
+  - Cretrepepet
+  - Crevapir
+  - Crevixesra
+  - Crexahava
+  - Crexepapacre
+  - Cribavribibi
+  - Cribitratrat
+  - Crichecrite
+  - Crichipi
+  - Cricraprehre
+  - Cricrirar
+  - Cricrisre
+  - Cricritika
+  - Crihevar
+  - Crihitehre
+  - Crikatrikre
+  - Crikebepapa
+  - Crikekakat
+  - Crikeshivra
+  - Crikisheski
+  - Crikrahrata
+  - Crikretevabi
+  - Crikricretri
+  - Cripichahi
+  - Criprishapa
+  - Crirachi
+  - Crirakratra
+  - Crishave
+  - Criskahe
+  - Crisrehapahi
+  - Critachatri
+  - Critrabibir
+  - Critresrir
+  - Critrikracri
+  - Crivacriti
+  - Crivacrive
+  - Crivayasra
+  - Crivrakre
+  - Crivrecri
+  - Crixixaske
+  - Habavavak
+  - Habepa
+  - Habikikaka
+  - Habikrihita
+  - Hachabe
+  - Hachehekre
+  - Hacheske
+  - Hacreha
+  - Hacrere
+  - Hahebapapa
+  - Hahecrecha
+  - Haheha
+  - Hahetasrike
+  - Hahihahatrar
+  - Hahihasreche
+  - Hahripraxaxa
+  - Hakepa
+  - Hakirer
+  - Hakraxixit
+  - Hakrekikik
+  - Hakrixexeret
+  - Hapacharepri
+  - Hapacre
+  - Hapahri
+  - Hapeti
+  - Hapitahri
+  - Hapreska
+  - Haprihrisha
+  - Harebabi
+  - Harexiveve
+  - Haricracre
+  - Haririsheska
+  - Harishi
+  - Hashakrakrak
+  - Hashehracri
+  - Hashepracha
+  - Haskaritepra
+  - Hasketer
+  - Haskibebeyat
+  - Haskikretete
+  - Hasrabake
+  - Hasracritehe
+  - Hasrekitra
+  - Hasrekrer
+  - Hasrihaxa
+  - Hasripeshar
+  - Hatabibivet
+  - Havavresra
+  - Havixe
+  - Havreki
+  - Havrepekre
+  - Havretri
+  - Havrichatata
+  - Haxikeker
+  - Hayahriyaxa
+  - Hebahrevrir
+  - Hebapri
+  - Hebihihichit
+  - Hebikratahe
+  - Hecheshehixi
+  - Hechetra
+  - Hechevakrer
+  - Hecraba
+  - Hecrabi
+  - Hecrevrivrik
+  - Hecrirecha
+  - Hehere
+  - Hehiskitri
+  - Hehrapike
+  - Hehrepri
+  - Hehreskaskat
+  - Hehrikra
+  - Hekikrexa
+  - Hekrasre
+  - Hekrekicre
+  - Hekreracre
+  - Hekriheti
+  - Hepevivikrik
+  - Hepraskibebe
+  - Heprivresker
+  - Heprixasheri
+  - Herecrerivi
+  - Hereririket
+  - Heriheyacri
+  - Heripa
+  - Heripreka
+  - Heshahraveti
+  - Heshepepevik
+  - Heskashachi
+  - Heskaxixe
+  - Heskererepet
+  - Heskeshishit
+  - Heskisker
+  - Hesrepahri
+  - Hesreski
+  - Hetahetritri
+  - Hetiheheprit
+  - Hetrare
+  - Hetrevihra
+  - Hetrihahri
+  - Hetrirebibi
+  - Hevababaker
+  - Hevetihre
+  - Hevexixik
+  - Heviricrecre
+  - Hevrevipa
+  - Hevrexir
+  - Hevrichar
+  - Hevriraravit
+  - Hevrivrivre
+  - Hexasrichi
+  - Hexaxipri
+  - Heyashipre
+  - Hibasher
+  - Hiberarakrar
+  - Hibesrache
+  - Hicrapre
+  - Hicrecrahera
+  - Hicreteba
+  - Hicriba
+  - Hihacha
+  - Hihepapak
+  - Hihichitre
+  - Hihireret
+  - Hihrevra
+  - Hikikri
+  - Hikitritrir
+  - Hikrakre
+  - Hikrepa
+  - Hipavi
+  - Hipitratrak
+  - Hirepabe
+  - Hirichachar
+  - Hiricheya
+  - Hiricrabakri
+  - Hiricraske
+  - Hiricrevitri
+  - Hirihrachi
+  - Hirihraski
+  - Hirihraxaxat
+  - Hirikachi
+  - Hirikretetet
+  - Hirikrikra
+  - Hiripebahre
+  - Hiripehixixi
+  - Hiriper
+  - Hiripesri
+  - Hiripeta
+  - Hiripevivik
+  - Hirirahehet
+  - Hirirecrevre
+  - Hirishihra
+  - Hiriskeva
+  - Hiritapatiti
+  - Hiriteker
+  - Hiritrari
+  - Hiritraxe
+  - Hiritricri
+  - Hirivavavri
+  - Hiriviske
+  - Hirivivre
+  - Hirivra
+  - Hirivrari
+  - Hirivrexita
+  - Hirivrivri
+  - Hirixashahre
+  - Hirixicraya
+  - Hishave
+  - Hishesritra
+  - Hishiskahra
+  - Hishivrevrek
+  - Hiskakecra
+  - Hiskatetek
+  - Hiskekreche
+  - Hiskeva
+  - Hiskisrare
+  - Hisrakikit
+  - Hisratrepepe
+  - Hitava
+  - Hiterehaha
+  - Hitratra
+  - Hivacracrat
+  - Hivatritrik
+  - Hivayayar
+  - Hivrababar
+  - Hivrahrir
+  - Hixacre
+  - Hixashape
+  - Hixashetiti
+  - Hixekrasra
+  - Hixepi
+  - Hixeripe
+  - Hiyacrakra
+  - Hrabatitit
+  - Hrabaxa
+  - Hrabike
+  - Hrabipre
+  - Hracrabixi
+  - Hracrehra
+  - Hrahepivivi
+  - Hraherikrexi
+  - Hrahikrer
+  - Hrahrakahre
+  - Hrahraska
+  - Hrahrasrebe
+  - Hrahrehehek
+  - Hrahritra
+  - Hrakachabexi
+  - Hrakarerek
+  - Hrakeshi
+  - Hrakiski
+  - Hrakretri
+  - Hrakrichapri
+  - Hrakrishi
+  - Hrapavevek
+  - Hrapicra
+  - Hrapraber
+  - Hraprapreche
+  - Hrarachihi
+  - Hrarahrahrar
+  - Hrarecri
+  - Hrarikrixabi
+  - Hrarishesher
+  - Hrashepa
+  - Hrashibisra
+  - Hrashihir
+  - Hrashikavexa
+  - Hrasketre
+  - Hraskibe
+  - Hraskikexaxa
+  - Hrasrecrixi
+  - Hrasrevraxi
+  - Hrasrevrehra
+  - Hratatrasre
+  - Hratayati
+  - Hratere
+  - Hratrachari
+  - Hratreki
+  - Hravahiche
+  - Hravapeki
+  - Hravaskeki
+  - Hraveska
+  - Hravihre
+  - Hravrahaheya
+  - Hravrekra
+  - Hraxehrehiri
+  - Hraxekrebe
+  - Hraxichebar
+  - Hraxivivivet
+  - Hrayacha
+  - Hrayavrar
+  - Hrebavihra
+  - Hrebetra
+  - Hrechaxer
+  - Hrecreti
+  - Hrecrihahar
+  - Hrehikrekrer
+  - Hrehresra
+  - Hreketra
+  - Hrekrativi
+  - Hrepihepre
+  - Hrepipake
+  - Hrerasri
+  - Hreravexe
+  - Hrereprehir
+  - Hreriba
+  - Hreshahetiti
+  - Hreshehakake
+  - Hreskapahre
+  - Hresrakakre
+  - Hresrechike
+  - Hresrekasha
+  - Hretite
+  - Hretrecre
+  - Hretreski
+  - Hretrevri
+  - Hrevrehe
+  - Hrexakekek
+  - Hrexatika
+  - Hrexebe
+  - Hribahar
+  - Hribehrati
+  - Hribipe
+  - Hrichiski
+  - Hrihevrivrir
+  - Hrihitra
+  - Hrihrakihri
+  - Hrihrechar
+  - Hrikichecra
+  - Hrikiskate
+  - Hripricrahra
+  - Hrirehrikra
+  - Hriresri
+  - Hrishabar
+  - Hrishaxeyar
+  - Hrishehrahi
+  - Hrishexixik
+  - Hrisheyakra
+  - Hrishipete
+  - Hriskacrecra
+  - Hriskaheba
+  - Hriskari
+  - Hriskevetabi
+  - Hriskexa
+  - Hriskihete
+  - Hriskihri
+  - Hrisrechi
+  - Hrisrera
+  - Hrisriri
+  - Hrisrishapa
+  - Hrisrivavar
+  - Hritachecri
+  - Hritexa
+  - Hritihihri
+  - Hritihra
+  - Hritiker
+  - Hritisrasrat
+  - Hrivaxa
+  - Hrivripira
+  - Hrixebabatir
+  - Hrixebi
+  - Hrixihri
+  - Hrixiva
+  - Hriyahriya
+  - Kabavi
+  - Kabaxesha
+  - Kachaske
+  - Kachaya
+  - Kachihe
+  - Kacrahesha
+  - Kahakichi
+  - Kahaxipa
+  - Kahepapatret
+  - Kahiki
+  - Kahishe
+  - Kahrakrekret
+  - Kahratrer
+  - Kahriche
+  - Kahricrikra
+  - Kakatahrare
+  - Kakebi
+  - Kakihrasri
+  - Kapakriska
+  - Kapracre
+  - Kaprashesher
+  - Kaprehrakaka
+  - Kapreri
+  - Karakahre
+  - Karapihehe
+  - Kashaya
+  - Kashipri
+  - Kaskachekeke
+  - Kaskivrer
+  - Kasrabacre
+  - Kasrakapre
+  - Kasraxar
+  - Kasresreyaya
+  - Kasrivrata
+  - Katasker
+  - Katehreyaya
+  - Katetrike
+  - Katexaxak
+  - Katrehre
+  - Kavababat
+  - Kavashishit
+  - Kavihrahrat
+  - Kavitratrak
+  - Kavratevriya
+  - Kaxecri
+  - Kaxetavre
+  - Kaxetretret
+  - Kayararat
+  - Kayavrivrik
+  - Kayaxi
+  - Kebasrevikri
+  - Kechatra
+  - Kechavrepri
+  - Kecresra
+  - Kecrevrir
+  - Kecriha
+  - Kecrikra
+  - Kecrixa
+  - Kehave
+  - Kehitichacha
+  - Kehivehrihri
+  - Kehrachechek
+  - Kehrehi
+  - Kekabibit
+  - Kekahi
+  - Kekahrexi
+  - Kekarar
+  - Kekasritri
+  - Kekebapisra
+  - Kekebibivrer
+  - Kekekahihi
+  - Kekrishe
+  - Kepetre
+  - Kepevra
+  - Kepraki
+  - Keprepara
+  - Kerahacheche
+  - Keratra
+  - Kerihi
+  - Keriskehisri
+  - Keshevaskiva
+  - Keshika
+  - Keshiti
+  - Keskarahita
+  - Keteskesket
+  - Ketesketa
+  - Ketribabar
+  - Ketribipi
+  - Kevatra
+  - Kevatre
+  - Keveki
+  - Keveshatra
+  - Keveshexiki
+  - Kevesraxe
+  - Kevexa
+  - Kevikaxe
+  - Kevivri
+  - Kevrahreri
+  - Kevrahrihrit
+  - Kexapriprik
+  - Kexerava
+  - Kexeshacha
+  - Kexisrepe
+  - Keyararak
+  - Kibevavacrak
+  - Kibeyachichi
+  - Kibipavava
+  - Kichitra
+  - Kicricreva
+  - Kicrikrikrik
+  - Kiharesra
+  - Kihiya
+  - Kihrexexevek
+  - Kihriprira
+  - Kikeke
+  - Kikexitretre
+  - Kikrabikichi
+  - Kikrehi
+  - Kikrekrakrat
+  - Kikreri
+  - Kikretrapa
+  - Kikrevavak
+  - Kikrivikar
+  - Kipivaxe
+  - Kipreya
+  - Kireche
+  - Kiresrisrir
+  - Kirevi
+  - Kiribapra
+  - Kiribaprive
+  - Kirichaketra
+  - Kirichiska
+  - Kiricrakakri
+  - Kirihererek
+  - Kirihrepi
+  - Kirihreviche
+  - Kirikachicha
+  - Kirikatriki
+  - Kirikivrivri
+  - Kirikrakra
+  - Kiripabi
+  - Kiripahritri
+  - Kiriprihri
+  - Kirirahixera
+  - Kirireti
+  - Kirirevri
+  - Kirishavavar
+  - Kirishekeket
+  - Kiriteska
+  - Kiritracha
+  - Kiritrepeper
+  - Kiritreyapri
+  - Kirivipe
+  - Kirivrivepi
+  - Kirixaticher
+  - Kirixepepek
+  - Kirixicra
+  - Kishahapatre
+  - Kishehakaka
+  - Kiskashapra
+  - Kiskekehra
+  - Kiskekicre
+  - Kiskipri
+  - Kitraka
+  - Kitrevevri
+  - Kivraheherat
+  - Kivrahi
+  - Kivrashe
+  - Kivrera
+  - Kivretrakeke
+  - Kixatritrit
+  - Kixichetiti
+  - Kixichicrar
+  - Kixivra
+  - Krabareyaya
+  - Krabeherere
+  - Krachehre
+  - Kracheyaba
+  - Kracrirarak
+  - Krahebikaba
+  - Krahechikri
+  - Krahiha
+  - Krahrakri
+  - Krahraririk
+  - Krahrepexi
+  - Krahrepri
+  - Krahrerar
+  - Krakahra
+  - Krakrekiski
+  - Krakrepapat
+  - Krapari
+  - Krapibi
+  - Krapitahri
+  - Krapreve
+  - Kraprisrisre
+  - Kraprivrarar
+  - Krarakrikrit
+  - Krarekri
+  - Kraricri
+  - Krashatatahi
+  - Krashavecra
+  - Kraskisretra
+  - Krasrarevi
+  - Krasripapat
+  - Kratachavri
+  - Kratare
+  - Kratikepi
+  - Kraveke
+  - Kravraxeveve
+  - Kravrepachi
+  - Kravricrahra
+  - Kraxabi
+  - Kraxasrir
+  - Krayakrikrit
+  - Krebekri
+  - Krebibikre
+  - Krebivi
+  - Krechahe
+  - Krechepraxa
+  - Krechititik
+  - Krecrashepra
+  - Krecravicha
+  - Krecreri
+  - Krehekikihit
+  - Krehrakakre
+  - Krehrita
+  - Krehrixa
+  - Krekacrechi
+  - Krekebeta
+  - Krekracri
+  - Krekrapri
+  - Krekrishaski
+  - Krepeviske
+  - Krepitir
+  - Krepiya
+  - Kreprahetaya
+  - Krepretasha
+  - Kreprivreski
+  - Krererisri
+  - Krerexeskeva
+  - Kreskaviha
+  - Kresrepaxexe
+  - Kretahre
+  - Kretavi
+  - Kretepapatir
+  - Krevavikeke
+  - Krevesher
+  - Krevesrisrit
+  - Krevrexer
+  - Krevrivriske
+  - Krexaya
+  - Kreyacrepe
+  - Kreyatriri
+  - Kreyavi
+  - Kribeshi
+  - Kribetibi
+  - Kribexixik
+  - Kribirecri
+  - Kribivra
+  - Krichakehra
+  - Kricrava
+  - Kricrirepe
+  - Kricritaka
+  - Krihaprir
+  - Krihesre
+  - Krihexarava
+  - Krihreskekre
+  - Krikapepek
+  - Krikatitixer
+  - Krikesrixixi
+  - Krikrashar
+  - Krikrikesre
+  - Kripahri
+  - Kripritri
+  - Kriripriprit
+  - Kririve
+  - Krishebiriba
+  - Krishebite
+  - Krishecrapi
+  - Kriskexer
+  - Krisribariri
+  - Krisrisher
+  - Kritahe
+  - Kritarerek
+  - Kritechihihi
+  - Kritiha
+  - Kritixa
+  - Kritresra
+  - Kritrivrevra
+  - Krivaxixipak
+  - Krivripri
+  - Krixehraski
+  - Krixesrepri
+  - Krixirar
+  - Pabaskare
+  - Pabecrechi
+  - Pabixashaha
+  - Pachatatak
+  - Pachetra
+  - Pachikri
+  - Pachisra
+  - Pacrachisri
+  - Pacraheha
+  - Pahrecrahati
+  - Pahrixeke
+  - Pakaririhrek
+  - Pakashexa
+  - Pakaskesha
+  - Pakavrevaha
+  - Pakihechacha
+  - Pakishi
+  - Pakivrapapa
+  - Pakrakrasra
+  - Pakrasrer
+  - Pakrava
+  - Pakresra
+  - Pakrexetihe
+  - Pakrika
+  - Papaskaxa
+  - Papavivivrik
+  - Papesheher
+  - Papivahre
+  - Papratrakiki
+  - Parerakre
+  - Pashaskaskak
+  - Pashevravrat
+  - Paskasretiti
+  - Paskiske
+  - Paskixexek
+  - Pasrabicra
+  - Pasraprikepa
+  - Pasrehe
+  - Pasrepratri
+  - Pataprivra
+  - Patesrateke
+  - Patexexet
+  - Patreshe
+  - Pavaba
+  - Pavrapishi
+  - Paxarerechak
+  - Paxecri
+  - Paxitirechi
+  - Payahreshi
+  - Pebakrikrik
+  - Pebate
+  - Pebeskahepre
+  - Pebevravi
+  - Pebibebek
+  - Pechaka
+  - Pechekripi
+  - Pechetraya
+  - Pechikreke
+  - Pechivrar
+  - Pecracha
+  - Pecritrasre
+  - Pehasra
+  - Pehecha
+  - Pehisresrer
+  - Pehrakresha
+  - Pehrihivreya
+  - Pehriva
+  - Pekecricrik
+  - Pekrava
+  - Pekraya
+  - Pekrepitri
+  - Pepehri
+  - Pepexekaka
+  - Pepirer
+  - Pepiska
+  - Pepitre
+  - Pepreba
+  - Pepreha
+  - Peprerar
+  - Pepresri
+  - Pepresrikeke
+  - Peprevahe
+  - Peraxatrikri
+  - Perebecrate
+  - Peribi
+  - Perisrehri
+  - Peshipaha
+  - Peskavavaxek
+  - Peskehihik
+  - Peskikikitir
+  - Pesraski
+  - Pesratra
+  - Pesravre
+  - Pesraya
+  - Pesretetetat
+  - Pesrikre
+  - Pesritra
+  - Petevrivrit
+  - Petihri
+  - Petivrate
+  - Petripetete
+  - Pevekriska
+  - Pevera
+  - Pevetiska
+  - Pevetrepri
+  - Pevikixi
+  - Pevipraprak
+  - Pevitetecrak
+  - Pevixihre
+  - Pevracher
+  - Pevrakrakrat
+  - Pevrehita
+  - Pexepraprat
+  - Pexihibe
+  - Pibehra
+  - Pibekrite
+  - Pibetiskiski
+  - Pibibipa
+  - Pibikekek
+  - Pichehi
+  - Pichetreta
+  - Pichicreve
+  - Pichikrarar
+  - Picreprecha
+  - Pihasresret
+  - Piheki
+  - Pihepa
+  - Pihibeskaska
+  - Pihichar
+  - Pihitetek
+  - Pihrebi
+  - Pihreshapibe
+  - Pihretitir
+  - Pikaskaskar
+  - Pikaxer
+  - Pikrehreka
+  - Pikripreprer
+  - Pipasha
+  - Pipaxacricri
+  - Pipesresri
+  - Pipribepri
+  - Piprishixi
+  - Piraxiprar
+  - Pirekrehi
+  - Pireveverik
+  - Piribaxa
+  - Piribipriski
+  - Pirichivapi
+  - Piricrahra
+  - Piricrakra
+  - Pirihepre
+  - Pirihichati
+  - Pirikretra
+  - Pirikritere
+  - Pirikrivra
+  - Piripaba
+  - Piripacripri
+  - Piripihrishe
+  - Piripite
+  - Piripitri
+  - Piriprabepa
+  - Pirireprishe
+  - Piriririke
+  - Piriskateke
+  - Piriskiki
+  - Pirisretiva
+  - Piritavre
+  - Piritihre
+  - Piritratavri
+  - Piritrecrara
+  - Piritreke
+  - Pirivakixaxa
+  - Pirivikrar
+  - Pirixaxa
+  - Pirixaxevre
+  - Piriyakribi
+  - Piriyapesra
+  - Pishakakaxet
+  - Pishashetepi
+  - Pishavraska
+  - Pishevra
+  - Piskipre
+  - Pisrasheshek
+  - Pisripre
+  - Pisrixekete
+  - Pitibi
+  - Pitraprivre
+  - Pitraskeche
+  - Pitratebi
+  - Pitrevreyaya
+  - Pitriprivra
+  - Pitriske
+  - Pivaka
+  - Pivatatakir
+  - Pivekrixehri
+  - Piveyashi
+  - Pivrakevi
+  - Pivrakipre
+  - Pivrakitibe
+  - Pivrashir
+  - Pivrirater
+  - Pivritatabet
+  - Pixeriti
+  - Pixicha
+  - Prabibiprepi
+  - Prabichixaxa
+  - Prabixite
+  - Pracheteter
+  - Prachiba
+  - Pracrahrive
+  - Prahihrahrak
+  - Prahisresrek
+  - Prahitrivi
+  - Prahrebesra
+  - Prahripebaba
+  - Prahrivapapa
+  - Prakiskesket
+  - Prakrehrahri
+  - Prakripi
+  - Prapicresri
+  - Praprexexek
+  - Prarachaxi
+  - Prarecrahi
+  - Prarikra
+  - Praripraka
+  - Prashicribi
+  - Prashivepapa
+  - Prashixitata
+  - Pratakra
+  - Praterahira
+  - Pratreki
+  - Pravashipebe
+  - Pravesrisrit
+  - Pravixihehe
+  - Pravrashi
+  - Pravrepi
+  - Pravricrir
+  - Pravritrer
+  - Praxahihir
+  - Praxechaxere
+  - Praxekrakrat
+  - Praxevitetra
+  - Praxexe
+  - Praxichi
+  - Prayaraxir
+  - Prebavre
+  - Prechakavra
+  - Prechavre
+  - Precratetet
+  - Preherihra
+  - Prehiviveve
+  - Prehrakriska
+  - Prehribi
+  - Prekakra
+  - Prekaya
+  - Prekiprever
+  - Prekirar
+  - Prepahihibar
+  - Prepetratrat
+  - Prepixihrapa
+  - Preprete
+  - Preretetre
+  - Prerexike
+  - Presharesre
+  - Presravi
+  - Presrere
+  - Presriskipre
+  - Pretere
+  - Pretetisrir
+  - Pretexiprar
+  - Pretihre
+  - Pretrakre
+  - Pretrike
+  - Pretrisra
+  - Prevakre
+  - Prevecrere
+  - Prevesriti
+  - Preveti
+  - Previkrahihi
+  - Previkri
+  - Prevritrare
+  - Prevrivi
+  - Prexatrar
+  - Prexeshe
+  - Prexicracrak
+  - Preyatra
+  - Pribatretrek
+  - Pribavibache
+  - Pribirivava
+  - Pribivrivrit
+  - Pricheyayat
+  - Pricrapapat
+  - Pricrihi
+  - Prihavri
+  - Prihetiya
+  - Prihrechabi
+  - Prikebixi
+  - Prikricha
+  - Prikripi
+  - Prikripikiki
+  - Prikrishi
+  - Pripachiya
+  - Pripavrepri
+  - Pripixixik
+  - Pripraske
+  - Priprecheha
+  - Pripripepek
+  - Prirakre
+  - Prirasher
+  - Priraske
+  - Prireprehar
+  - Pririhi
+  - Prishehe
+  - Prishepaxixi
+  - Prishitarabe
+  - Priskake
+  - Prisraxi
+  - Pritabaski
+  - Pritakir
+  - Pritecra
+  - Pritehavivi
+  - Pritepa
+  - Pritichahi
+  - Privayayak
+  - Privipecre
+  - Privrihareya
+  - Prixarake
+  - Prixepa
+  - Prixetre
+  - Prixivrekri
+  - Priyaprar
+  - Rabehiya
+  - Rabeparere
+  - Rabereshebe
+  - Rabichechet
+  - Rachare
+  - Racraba
+  - Racrakeka
+  - Racrakreheri
+  - Rahavevahi
+  - Rahevripeshi
+  - Rahibebetat
+  - Rahihratata
+  - Rahipe
+  - Rahraba
+  - Rahrecri
+  - Rahreyavri
+  - Rahritretrek
+  - Rakekikitrir
+  - Rakicrecrek
+  - Rakipipihrat
+  - Rakreprikri
+  - Rapivrivrere
+  - Rarahaka
+  - Raretriya
+  - Rasheshashat
+  - Rasheshevri
+  - Rashihretra
+  - Rashikrehre
+  - Rasriber
+  - Ratabibihet
+  - Ratesraprar
+  - Ratitritrik
+  - Ratravi
+  - Ratrebi
+  - Ratreyayak
+  - Ratrihrikri
+  - Ravecher
+  - Ravepexi
+  - Ravihrahrak
+  - Ravixexebet
+  - Ravrisheke
+  - Ravrivrikri
+  - Raxahehet
+  - Raxetapa
+  - Raxete
+  - Raxevahre
+  - Rayachesheta
+  - Rebakre
+  - Rebebikiki
+  - Rebicracrak
+  - Rebipi
+  - Rebisriyaya
+  - Rebitetebit
+  - Recheper
+  - Recraskehe
+  - Recrekariri
+  - Rehepipibet
+  - Rehresheshet
+  - Rehrikrikrik
+  - Rehrire
+  - Rekaskaskak
+  - Rekracha
+  - Rekripreprek
+  - Repeche
+  - Repetrir
+  - Repexishe
+  - Repivesheri
+  - Repivrasra
+  - Reprihri
+  - Reprishishik
+  - Rerahahat
+  - Rereba
+  - Rerirevra
+  - Reskebexexe
+  - Reskehahat
+  - Reskivavak
+  - Reskixibira
+  - Resrecracrat
+  - Resretra
+  - Resrihrepeke
+  - Resriske
+  - Resrixiha
+  - Retaskahri
+  - Retavavatet
+  - Retaveche
+  - Retecha
+  - Retevravrak
+  - Retrete
+  - Retrexehehri
+  - Retripritri
+  - Revasri
+  - Revetitipret
+  - Revikrebiya
+  - Revripra
+  - Revritrer
+  - Rexabaska
+  - Rexataxa
+  - Ribatre
+  - Ribebahihi
+  - Ribehashishi
+  - Ribiheva
+  - Ricrehaska
+  - Rihava
+  - Rihaxicre
+  - Rihekrekrek
+  - Rihipapar
+  - Rihrachepi
+  - Rihravatir
+  - Rikevra
+  - Rikipa
+  - Rikiskapipi
+  - Rikivrevra
+  - Rikrachi
+  - Rikrepa
+  - Rikreravribe
+  - Ripibivrir
+  - Ripihrepapa
+  - Ripreshikre
+  - Rirevi
+  - Riribebe
+  - Riribeska
+  - Riricheshe
+  - Riricrehra
+  - Riricriti
+  - Ririhari
+  - Ririhepreski
+  - Ririhite
+  - Ririhixir
+  - Ririkavrire
+  - Ririkeve
+  - Ririkrekaska
+  - Ririkrexeti
+  - Riripasha
+  - Riripraprapi
+  - Ririrarerera
+  - Riririhacha
+  - Ririshihi
+  - Ririskatre
+  - Ririskihe
+  - Ririskiri
+  - Ririsravra
+  - Riritihihit
+  - Riritiskaba
+  - Rirititahi
+  - Riritrebi
+  - Riritrexexek
+  - Ririvihrar
+  - Ririvreshiya
+  - Ririvretra
+  - Ririyaskihe
+  - Rishacriker
+  - Rishaskar
+  - Rishepi
+  - Riskavrer
+  - Riskekar
+  - Riskepriba
+  - Riskesre
+  - Riskirasre
+  - Riskiskeha
+  - Risratretete
+  - Risratrihihi
+  - Risrevre
+  - Risritracre
+  - Risrivire
+  - Ritaha
+  - Ritahrecra
+  - Ritekrakapre
+  - Riteva
+  - Ritresrakri
+  - Ritrihe
+  - Ritrirecra
+  - Ritrishixi
+  - Rivretripapa
+  - Rivrivrishi
+  - Rixahritri
+  - Rixaterete
+  - Rixecrekre
+  - Rixepapat
+  - Rixeti
+  - Rixibihrihri
+  - Rixiskirepri
+  - Rixixaxavrat
+  - Riyahrahrat
+  - Riyapare
+  - Riyasri
+  - Shabirivri
+  - Shachikir
+  - Shacrevavak
+  - Shacrevrake
+  - Shahaprahri
+  - Shahaxaxak
+  - Shahekeket
+  - Shaheskate
+  - Shahexer
+  - Shahrasher
+  - Shahrati
+  - Shahripracri
+  - Shakekrirabe
+  - Shakrichar
+  - Shapesrikaka
+  - Shapibi
+  - Shapretra
+  - Sharapire
+  - Sharesrasrat
+  - Sharihesrehi
+  - Sharihre
+  - Sharipiva
+  - Sharitrihri
+  - Shashishibe
+  - Shashisravi
+  - Shaskehepre
+  - Shaskepahre
+  - Shaskitra
+  - Shatretaxi
+  - Shavaprika
+  - Shavashakri
+  - Shavexexati
+  - Shavisha
+  - Shavrivre
+  - Shaxepachi
+  - Shayakrakrak
+  - Shebevrirere
+  - Shebipeskixa
+  - Shebiva
+  - Shecheyababa
+  - Shecrapricre
+  - Shehibe
+  - Shehrayashar
+  - Shehrebite
+  - Shehreha
+  - Shehreske
+  - Shehreyayar
+  - Shehriskar
+  - Shekake
+  - Shekakesri
+  - Shekapiski
+  - Shekeska
+  - Shekikakat
+  - Shekrira
+  - Shepechichik
+  - Shepeshesra
+  - Shepeskiskik
+  - Shepetrati
+  - Shepevrevrer
+  - Shepikitepa
+  - Sheprekritri
+  - Shepreskete
+  - Sherati
+  - Sherikre
+  - Sheriskahe
+  - Sheshasri
+  - Sheshihesha
+  - Shesrabibik
+  - Shesrachiski
+  - Shesrihihit
+  - Shetachavre
+  - Shetasre
+  - Shetikitata
+  - Shetracrar
+  - Shetriha
+  - Shevabi
+  - Shevecrepi
+  - Shevrahe
+  - Shevrevri
+  - Shevriya
+  - Shexachi
+  - Shexahrehret
+  - Shexecra
+  - Shexishishit
+  - Shexivir
+  - Sheyasha
+  - Shibatra
+  - Shibecreka
+  - Shibekrekret
+  - Shibivribe
+  - Shichebebet
+  - Shichecha
+  - Shicheririt
+  - Shichikrakre
+  - Shicrachi
+  - Shihebihre
+  - Shihecricrik
+  - Shihishar
+  - Shihiska
+  - Shihrapikra
+  - Shihrehepri
+  - Shihrerebe
+  - Shihrevihre
+  - Shikechachat
+  - Shikeshecra
+  - Shikikivri
+  - Shikraxi
+  - Shikrehre
+  - Shikreprer
+  - Shipehabaske
+  - Shipicreki
+  - Shipipapaxak
+  - Shipratate
+  - Shipriki
+  - Shipritraha
+  - Shiribebepit
+  - Shisrisheri
+  - Shitehechi
+  - Shitexihre
+  - Shitibibik
+  - Shitravrekra
+  - Shivababat
+  - Shivexehra
+  - Shivive
+  - Shivraheki
+  - Shivrayayak
+  - Shivrebapra
+  - Shivrepa
+  - Shixaya
+  - Sikibavipa
+  - Sikibisriche
+  - Sikichape
+  - Sikichapi
+  - Sikichekasha
+  - Sikichiyaski
+  - Sikicracre
+  - Sikicrexa
+  - Sikicrixi
+  - Sikiketraya
+  - Sikikrasre
+  - Sikikreke
+  - Sikipecripre
+  - Sikipetre
+  - Sikiprasrake
+  - Sikiprira
+  - Sikirehivre
+  - Sikirepreri
+  - Sikiskacra
+  - Sikiskevavak
+  - Sikiskite
+  - Sikisraber
+  - Sikisrekakat
+  - Sikisresha
+  - Sikitaski
+  - Sikitevre
+  - Sikiticre
+  - Sikitrashate
+  - Sikitrihrepi
+  - Sikitrirepre
+  - Sikivate
+  - Sikiveskar
+  - Sikivrahra
+  - Sikivrisrita
+  - Sikivritiri
+  - Sikixicrebar
+  - Siribacrache
+  - Siribetraska
+  - Siribikra
+  - Siricharabe
+  - Sirihaxer
+  - Sirihicripa
+  - Sirihihahat
+  - Sirihihapa
+  - Sirikaski
+  - Sirikatatat
+  - Siripepahe
+  - Siriprahra
+  - Siriprehavi
+  - Siripreteske
+  - Siriraki
+  - Siriraski
+  - Sirirekeba
+  - Sirireter
+  - Sirishatache
+  - Sirishehevre
+  - Siriskesrave
+  - Siriskihipe
+  - Sirisrekivi
+  - Sirisretre
+  - Siriteche
+  - Siritrahe
+  - Siritrixexet
+  - Sirivrekehri
+  - Sirivretatre
+  - Skabaresre
+  - Skabehricra
+  - Skabipre
+  - Skachabeta
+  - Skachibi
+  - Skachihive
+  - Skachishaha
+  - Skacraxaxak
+  - Skacrehrapre
+  - Skacrichisre
+  - Skacrixiche
+  - Skahipevra
+  - Skahixahehe
+  - Skahracha
+  - Skahravrive
+  - Skahreve
+  - Skahrivrepra
+  - Skakasha
+  - Skakava
+  - Skakavevet
+  - Skakeskaskat
+  - Skakevravrak
+  - Skapape
+  - Skapapriprit
+  - Skarebihira
+  - Skarechachak
+  - Skarepishi
+  - Skarexapreti
+  - Skashihrir
+  - Skaterarar
+  - Skatetasre
+  - Skatrichebe
+  - Skavarerahri
+  - Skavicrecrer
+  - Skavitetexi
+  - Skavrekreti
+  - Skavritre
+  - Skaxisrakre
+  - Skayabere
+  - Skayatepra
+  - Skebaprara
+  - Skechikreba
+  - Skecracheker
+  - Skecraprir
+  - Skecrita
+  - Skehevreshe
+  - Skehichitra
+  - Skehipe
+  - Skekapra
+  - Skekekritra
+  - Skeketir
+  - Skekrababe
+  - Skekraxer
+  - Skekretake
+  - Skepare
+  - Skepitetexik
+  - Skerepepehit
+  - Skereri
+  - Skeripribihe
+  - Skeriska
+  - Skeshikite
+  - Skeskahe
+  - Skeskibishi
+  - Skesrisrer
+  - Sketaha
+  - Sketahevra
+  - Sketashakra
+  - Sketatretrek
+  - Sketavri
+  - Sketepechi
+  - Sketivapapa
+  - Sketivre
+  - Sketrarivava
+  - Sketrekrepe
+  - Skevaskiskik
+  - Skevaxi
+  - Skevrabari
+  - Skevrahrepa
+  - Skevrecra
+  - Skevrehraki
+  - Skevrihrave
+  - Skexipi
+  - Skexixeska
+  - Skibacricrit
+  - Skibapraxe
+  - Skibevravrat
+  - Skibiravri
+  - Skibita
+  - Skichabi
+  - Skichapipit
+  - Skichebir
+  - Skichiske
+  - Skicreraskar
+  - Skicrihihe
+  - Skihekar
+  - Skiheyaskir
+  - Skihricher
+  - Skikeskesket
+  - Skikrahre
+  - Skikraprara
+  - Skikrisha
+  - Skipashihre
+  - Skipechishi
+  - Skiprapra
+  - Skipraripi
+  - Skipreve
+  - Skiprevivik
+  - Skiripipik
+  - Skishachi
+  - Skishapehehe
+  - Skiskevaski
+  - Skiskevririr
+  - Skisrekecra
+  - Skitraki
+  - Skitrepi
+  - Skitreske
+  - Skivekri
+  - Skivibibik
+  - Skiviska
+  - Skivrihri
+  - Skivrivreki
+  - Skixara
+  - Skixareter
+  - Skixetihechi
+  - Skixiha
+  - Skixisrapre
+  - Srabavrechi
+  - Srabisreveke
+  - Srachavicha
+  - Sracrare
+  - Srahahihir
+  - Srahihripra
+  - Srahriyar
+  - Srakipahehe
+  - Srakireret
+  - Srakrakrishi
+  - Srapahre
+  - Srapikretra
+  - Srapribekehi
+  - Srarekepar
+  - Sraribeski
+  - Srariprer
+  - Srarisha
+  - Srashacha
+  - Srashakri
+  - Srashaxata
+  - Srashikirir
+  - Sraskabikri
+  - Sraskechipe
+  - Sraskehreri
+  - Sraskekepiva
+  - Sraskekisra
+  - Sraskiba
+  - Sraskishar
+  - Srasrivate
+  - Sratepre
+  - Srateve
+  - Sraticre
+  - Sratihi
+  - Sratiki
+  - Sratraxixir
+  - Sratrike
+  - Sravechachar
+  - Sravrapapat
+  - Sraxape
+  - Sraxepipir
+  - Sraxeskicri
+  - Srebaskaskar
+  - Srebecrir
+  - Srebekrabi
+  - Srebikrir
+  - Srechepe
+  - Srecravra
+  - Srecravre
+  - Srecrisre
+  - Srehetahi
+  - Srehikrar
+  - Srehivavri
+  - Srehrehiske
+  - Srekacrexeve
+  - Srekreprexe
+  - Srekrikra
+  - Srekrititit
+  - Srepesrexi
+  - Srepipritri
+  - Srepisrasre
+  - Sreprekra
+  - Srepreshe
+  - Sreracricrar
+  - Srerevre
+  - Srerihra
+  - Sreshebakiki
+  - Sresheskixi
+  - Sreshiprari
+  - Sreskichi
+  - Sreskicre
+  - Sresrahapi
+  - Sresrekikit
+  - Sresrikre
+  - Sretasresri
+  - Sretishashak
+  - Sretraticrir
+  - Srevesra
+  - Srevesrixari
+  - Srevivre
+  - Srevraxipi
+  - Srevreyayak
+  - Srexatreva
+  - Srexikrata
+  - Srexiskahehe
+  - Sribavar
+  - Sribebe
+  - Sribireke
+  - Srichepi
+  - Srichivekaka
+  - Sricrevepa
+  - Sriheshexi
+  - Srihrahevrir
+  - Srihrakratri
+  - Srihrekexi
+  - Srikasresha
+  - Srikiriki
+  - Srikratra
+  - Sripaba
+  - Sripahebevri
+  - Sripahre
+  - Sriprikacha
+  - Sriracricrit
+  - Sririhre
+  - Sriripre
+  - Srisheyaxexe
+  - Srishibicri
+  - Srishikatre
+  - Sriskicrixi
+  - Sriskihra
+  - Sriskisha
+  - Srisratreba
+  - Srisrebepi
+  - Srisrete
+  - Sritasker
+  - Sritekrikrir
+  - Sriteskabe
+  - Sritiprebe
+  - Sritiske
+  - Sritrapashe
+  - Sritricha
+  - Sritripipir
+  - Srivake
+  - Srivaxa
+  - Srivekater
+  - Srivisra
+  - Srivrasrer
+  - Srivratre
+  - Srivrihrir
+  - Srixakrabebe
+  - Srixiveyaya
+  - Sriyapir
+  - Taabavrivrir
+  - Taabexitaski
+  - Taabiprete
+  - Taachabe
+  - Taacrahre
+  - Taacrecrasra
+  - Taacripi
+  - Taacrisretri
+  - Taahahre
+  - Taahecreta
+  - Taaherarak
+  - Taahiha
+  - Taahiska
+  - Taahivri
+  - Taahreke
+  - Taahrishepri
+  - Taakahevava
+  - Taakapa
+  - Taakexisker
+  - Taakraba
+  - Taapavevekik
+  - Taapecra
+  - Taapikashi
+  - Taapipihare
+  - Taapishi
+  - Taaprachikri
+  - Taaprivrapre
+  - Taarecra
+  - Taareshekra
+  - Taashaxikir
+  - Taashebititi
+  - Taaskatir
+  - Taaskevevava
+  - Taaskiteki
+  - Taasrebicre
+  - Taasrehrira
+  - Taasrikikit
+  - Taasritar
+  - Taataxe
+  - Taatevasre
+  - Taatihra
+  - Taatrate
+  - Taatrivivit
+  - Taavape
+  - Taavavrexi
+  - Taavrerapava
+  - Taavretri
+  - Taavrivi
+  - Taaxekakat
+  - Taaxesrite
+  - Taaxikra
+  - Taayarashe
+  - Teebapresri
+  - Teebechiya
+  - Teebivrichi
+  - Teechacraha
+  - Teechexe
+  - Teechihakri
+  - Teecrekrihre
+  - Teecrepeski
+  - Teecretri
+  - Teecrevretre
+  - Teehapraprar
+  - Teeheri
+  - Teehrahar
+  - Teehrepeskir
+  - Teehrirepipi
+  - Teekahicravi
+  - Teekepraxahe
+  - Teekipra
+  - Teepracrivri
+  - Teeprikexixi
+  - Teeraheher
+  - Teerecritri
+  - Teeriviyara
+  - Teeskapesri
+  - Teeskebecrar
+  - Teesrasraxa
+  - Teesrecha
+  - Teesretrir
+  - Teesribiba
+  - Teetahra
+  - Teetixi
+  - Teetrasrer
+  - Teetreskapri
+  - Teevahihivik
+  - Teevapriprar
+  - Teevepa
+  - Teevravreske
+  - Teexaketiti
+  - Teexera
+  - Teexihrir
+  - Teeyakra
+  - Tibaskaskak
+  - Tibasravava
+  - Tibihi
+  - Tibixita
+  - Ticheskivre
+  - Tichetritrir
+  - Tichiber
+  - Ticratevipe
+  - Tihichisketi
+  - Tihitre
+  - Tihresrevivi
+  - Tihrikakar
+  - Tikara
+  - Tikecribe
+  - Tikekitata
+  - Tikrasra
+  - Tikrevrihre
+  - Tipape
+  - Tipekrihripa
+  - Tipetripe
+  - Tipicre
+  - Tipreritaha
+  - Tipresrita
+  - Tiprititik
+  - Tireper
+  - Tiribavre
+  - Tiriberihehe
+  - Tiribikehe
+  - Tiribirakeke
+  - Tirichera
+  - Tirihayaya
+  - Tirihi
+  - Tirihra
+  - Tirihretrir
+  - Tirihriririk
+  - Tiriketeche
+  - Tirikeviha
+  - Tirikihrer
+  - Tirikrachir
+  - Tirikrasri
+  - Tiripechapre
+  - Tiripratra
+  - Tiriprexer
+  - Tirirahi
+  - Tirirapahre
+  - Tirirarat
+  - Tirirexiprer
+  - Tirisrehihit
+  - Tirisribe
+  - Tiritetasra
+  - Tiritrexi
+  - Tiritrivever
+  - Tiriveshi
+  - Tirivihachi
+  - Tirivrebire
+  - Tirixahiri
+  - Tirixebayar
+  - Tirixetatak
+  - Tirixishiski
+  - Tiriyaskacha
+  - Tishetrakaka
+  - Tiskasheske
+  - Tiskevritre
+  - Tiskicrar
+  - Tisraprepret
+  - Tisrasheshet
+  - Tisreshishit
+  - Tisreska
+  - Tisricre
+  - Tisriskiskir
+  - Tisrivexa
+  - Titeskeskek
+  - Titrabetiti
+  - Titretepeka
+  - Tivarahi
+  - Tivecra
+  - Tivecri
+  - Tivepa
+  - Tivevipe
+  - Tivexa
+  - Tiviskaskak
+  - Tixapipripri
+  - Tixetritrik
+  - Tixikekra
+  - Tixititik
+  - Tixixesrer
+  - Tiyapraprak
+  - Tiyaskaskat
+  - Trabari
+  - Trabisrer
+  - Tracrecrehri
+  - Tracreprake
+  - Trahahehetir
+  - Trahekehe
+  - Trahevreske
+  - Trahrepa
+  - Trahrevrava
+  - Trakehre
+  - Trakrapra
+  - Trakritevrer
+  - Trapavrivrir
+  - Trareskire
+  - Trashete
+  - Trasheve
+  - Trashevepri
+  - Trashipaxe
+  - Trasraveski
+  - Trasreve
+  - Tratibekaka
+  - Tratihrer
+  - Tratravi
+  - Tratraxixik
+  - Tratribi
+  - Travaxeski
+  - Travetretrek
+  - Travraripepe
+  - Travribesre
+  - Traxipi
+  - Traxiprer
+  - Trebahe
+  - Trebirerever
+  - Trebishivava
+  - Trebitratrak
+  - Trechacra
+  - Trechekrasri
+  - Trechesre
+  - Trechesrecre
+  - Trecrehehek
+  - Trehixapri
+  - Trehrakrepre
+  - Trehripra
+  - Trekatri
+  - Trekatricre
+  - Trekavixixi
+  - Trekavriki
+  - Trekebeti
+  - Trekeski
+  - Treketibita
+  - Treketra
+  - Trekibabat
+  - Trepake
+  - Treprabiveve
+  - Treprahrepi
+  - Treprebekra
+  - Treprehehet
+  - Trerevivipek
+  - Treshepra
+  - Treshibar
+  - Treshipeska
+  - Treskari
+  - Tresketara
+  - Treskiskakir
+  - Tresracrir
+  - Tresrasker
+  - Tresratracre
+  - Tresravritre
+  - Tresreba
+  - Tresrihivri
+  - Tretapra
+  - Tretrahri
+  - Tretreske
+  - Tretrikicha
+  - Trevabihra
+  - Trevepa
+  - Trevetretrek
+  - Trevicra
+  - Trexatri
+  - Trexavra
+  - Trexetri
+  - Trexiricrara
+  - Treyakracra
+  - Treyaxihehe
+  - Tribexexet
+  - Tribirekri
+  - Trichakripre
+  - Trichiski
+  - Tricracri
+  - Tricrekapa
+  - Tricripe
+  - Trihavever
+  - Trihera
+  - Trihexisra
+  - Trihicrecrek
+  - Trihitrar
+  - Tripesrishe
+  - Tripever
+  - Triprakraxi
+  - Triprakri
+  - Trirahecri
+  - Trirapraxar
+  - Trireche
+  - Trishakretra
+  - Trishecrexir
+  - Trishepi
+  - Trishisrar
+  - Triskavri
+  - Trisketir
+  - Triskiyayat
+  - Trisrachiri
+  - Trisrevre
+  - Trisrisri
+  - Trisrisriper
+  - Trisrite
+  - Tritetre
+  - Tritrakepre
+  - Tritrichatri
+  - Tritriskari
+  - Trivriskeki
+  - Trivritipipi
+  - Trivriyayak
+  - Trixihahar
+  - Trixitri
+  - Triyashekiki
+  - Vabahecre
+  - Vabahrabebe
+  - Vabebir
+  - Vabehetre
+  - Vabetrahacha
+  - Vabivri
+  - Vachahrirere
+  - Vachavri
+  - Vachekihri
+  - Vachicratata
+  - Vachiske
+  - Vacracreki
+  - Vacrebihi
+  - Vacripra
+  - Vahapapashek
+  - Vahapraxe
+  - Vahasker
+  - Vaherekiki
+  - Vahibebeprek
+  - Vahivihahe
+  - Vakaheva
+  - Vakecha
+  - Vakevixixi
+  - Vakikepripra
+  - Vapeyayak
+  - Vapikevra
+  - Vapipribe
+  - Vaprakakak
+  - Vaprisra
+  - Vapritasha
+  - Varebitacre
+  - Varekricreki
+  - Vashakrikrik
+  - Vaskexititi
+  - Vaskiprexi
+  - Vaskivri
+  - Vaskiyahi
+  - Vasraprikre
+  - Vasrevi
+  - Vatracraxixi
+  - Vatrevi
+  - Vatriva
+  - Vavehihisrek
+  - Vavrisrasri
+  - Vaxeki
+  - Vaxeraskeske
+  - Vebexaxat
+  - Vebicheta
+  - Vechecricrik
+  - Vecraxicra
+  - Vecriche
+  - Vecritrika
+  - Vehevrer
+  - Vehratrir
+  - Vehraxexek
+  - Vehritrexe
+  - Vekarasra
+  - Vekaxivivi
+  - Vekehribaba
+  - Vekirevi
+  - Vekracri
+  - Vekreka
+  - Vekrekrikrit
+  - Vekrerikra
+  - Vekrishar
+  - Vekrishicha
+  - Vepekre
+  - Veprahahat
+  - Veprechahri
+  - Veprecrar
+  - Veprecrecrek
+  - Vepreritare
+  - Veretitishit
+  - Vericharihra
+  - Verikisresre
+  - Veshacricrik
+  - Veshebixexe
+  - Veshecrihapi
+  - Veshehe
+  - Veshepreprek
+  - Veshishakra
+  - Veskapi
+  - Veskepayaya
+  - Veskepevra
+  - Vesrihiska
+  - Vetepeti
+  - Vetracripi
+  - Vetreshashat
+  - Vetriskira
+  - Vevatre
+  - Vevevre
+  - Vevivesha
+  - Vevreshir
+  - Vevricrecrek
+  - Vevrisrasrat
+  - Vexachebashi
+  - Vexavever
+  - Vexikar
+  - Vexisrecri
+  - Vibepraxaba
+  - Vibeta
+  - Vichehiriri
+  - Vichitribihe
+  - Vicrahrehrek
+  - Vicrevevre
+  - Vicrikre
+  - Vicripasre
+  - Vicritebaba
+  - Vicriviriki
+  - Viheche
+  - Vihecracheki
+  - Vihepra
+  - Vihratekra
+  - Vihrexahihi
+  - Vihribihiska
+  - Vihricra
+  - Vihriher
+  - Vihriprar
+  - Vihrisreher
+  - Vikahrekri
+  - Vikakehreri
+  - Vikavebari
+  - Vikekiski
+  - Vikihahre
+  - Vikitrexa
+  - Vikrebibit
+  - Vikrihi
+  - Vikritahahe
+  - Vipeskixa
+  - Vipravrakrar
+  - Viprevrar
+  - Virabebevrek
+  - Viratrerera
+  - Virepri
+  - Viriprixiche
+  - Virirevrare
+  - Viritritrik
+  - Viskeski
+  - Visrecrecret
+  - Visriskir
+  - Vitexexet
+  - Vitibibihrik
+  - Vitika
+  - Vitracrevi
+  - Vitrasheshek
+  - Vitraviketa
+  - Vitravrire
+  - Vitreskaskak
+  - Vitrisrasha
+  - Vitrivechere
+  - Vivashate
+  - Vivecrixexe
+  - Viveprehehe
+  - Viveprepe
+  - Vivixixihir
+  - Vivrashaya
+  - Vixiticrixi
+  - Vrabaprakaka
+  - Vrabikape
+  - Vracharitri
+  - Vrachishachi
+  - Vrachitasre
+  - Vracrebihehe
+  - Vraheska
+  - Vrahrehripre
+  - Vrakasrahi
+  - Vrakayasraxi
+  - Vrakebibit
+  - Vrakriperi
+  - Vrakritatat
+  - Vrapaheke
+  - Vrapresriki
+  - Vraprexave
+  - Vrarekikik
+  - Vrarihritete
+  - Vraripechi
+  - Vrashexa
+  - Vraskekaki
+  - Vraskevexar
+  - Vrasrehahar
+  - Vrasreshahi
+  - Vratavivit
+  - Vratevretra
+  - Vratrakere
+  - Vratreskevi
+  - Vratrite
+  - Vratrivar
+  - Vravabepra
+  - Vravacrahri
+  - Vravavra
+  - Vravexe
+  - Vraviveya
+  - Vravrache
+  - Vraxihihit
+  - Vrayavri
+  - Vrebehrihrik
+  - Vrebisra
+  - Vrecrarake
+  - Vrecrihri
+  - Vrehabi
+  - Vrehacre
+  - Vrehakatar
+  - Vrehasker
+  - Vrehecreri
+  - Vrehibehe
+  - Vrehibibipik
+  - Vrehipe
+  - Vrehipraprak
+  - Vrehriviche
+  - Vrekahrichi
+  - Vrekihrer
+  - Vrekipepet
+  - Vrekrixa
+  - Vrepate
+  - Vrepexexer
+  - Vreprehapre
+  - Vreprihrite
+  - Vrererikra
+  - Vrerikriskir
+  - Vreshabar
+  - Vreshihishar
+  - Vreshike
+  - Vreskatre
+  - Vresrasre
+  - Vresretatra
+  - Vretesravi
+  - Vretixixir
+  - Vretrapapar
+  - Vretrehivivi
+  - Vretricre
+  - Vrevahrir
+  - Vrevashixexe
+  - Vrevrekrer
+  - Vrexacracrat
+  - Vrexaker
+  - Vribetretret
+  - Vribipita
+  - Vribiprevite
+  - Vricrehakra
+  - Vricrihi
+  - Vricriskeche
+  - Vrihehra
+  - Vriheski
+  - Vrihrakre
+  - Vrihrekrepi
+  - Vrikayaba
+  - Vrikivresker
+  - Vrikrake
+  - Vrikrebacre
+  - Vrikresrasri
+  - Vripere
+  - Vripexavri
+  - Vripitikeske
+  - Vriprivra
+  - Vrirachesri
+  - Vririsha
+  - Vrisketaske
+  - Vriskiraxe
+  - Vriskire
+  - Vrisracrakri
+  - Vrisrekari
+  - Vrisreviki
+  - Vritasre
+  - Vriterepi
+  - Vritetrexa
+  - Vritika
+  - Vritiske
+  - Vritivraki
+  - Vritrihrar
+  - Vritrisre
+  - Vrivahi
+  - Vrivahishaya
+  - Vrivehatri
+  - Vrivitri
+  - Vrixashashar
+  - Vrixavribape
+  - Vrixeprir
+  - Vrixiprehre
+  - Vrixitreveki
+  - Vrixivraxe
+  - Xabishetra
+  - Xachivrivrit
+  - Xacripikar
+  - Xacriprixi
+  - Xacrivir
+  - Xahatavri
+  - Xahesketivri
+  - Xahrapaba
+  - Xahraprer
+  - Xahrebave
+  - Xahripavava
+  - Xakahri
+  - Xakayayakat
+  - Xakrevaratra
+  - Xapakra
+  - Xapikrikrik
+  - Xapipevrevre
+  - Xapraskapika
+  - Xaprate
+  - Xapravri
+  - Xapripraprar
+  - Xaracrivri
+  - Xaratripepe
+  - Xarebiya
+  - Xareva
+  - Xariheheprat
+  - Xashihapa
+  - Xaskakaba
+  - Xaskararater
+  - Xasrapipik
+  - Xasreskihibi
+  - Xatachasri
+  - Xatereret
+  - Xatiriskiski
+  - Xatrexixik
+  - Xavasrarihi
+  - Xaveshi
+  - Xavicrari
+  - Xavrahavri
+  - Xavricri
+  - Xavrire
+  - Xavrixecre
+  - Xaxikaxexe
+  - Xaxikresha
+  - Xaxiska
+  - Xayaskihri
+  - Xebechi
+  - Xebetetet
+  - Xebitretrek
+  - Xechacrecrek
+  - Xechibare
+  - Xecrixaxitre
+  - Xehekikir
+  - Xehetipe
+  - Xehichatavra
+  - Xehiprishe
+  - Xehiteche
+  - Xehrevrakre
+  - Xehrishe
+  - Xekerarivra
+  - Xekicra
+  - Xekrecri
+  - Xekrevri
+  - Xekrevripa
+  - Xepavikeba
+  - Xepehati
+  - Xepeter
+  - Xepetitipet
+  - Xeprasre
+  - Xeprekivra
+  - Xeprihehek
+  - Xeshachikaha
+  - Xeskapakre
+  - Xeskehrabe
+  - Xesribar
+  - Xetekir
+  - Xetraskesket
+  - Xetravivik
+  - Xetrexahihi
+  - Xetribirer
+  - Xetripi
+  - Xevetaske
+  - Xevratikepa
+  - Xevriya
+  - Xexapra
+  - Xexavi
+  - Xexibir
+  - Xexiski
+  - Xeyapre
+  - Xeyaribe
+  - Xeyaskapibe
+  - Xibecracrak
+  - Xibeha
+  - Xibepribe
+  - Xibitratrar
+  - Xihechevar
+  - Xihrahehete
+  - Xihrashehihi
+  - Xihrecreve
+  - Xihresra
+  - Xihrivever
+  - Xikabebet
+  - Xikahihi
+  - Xikashaxe
+  - Xikaske
+  - Xikepehrahra
+  - Xikicha
+  - Xikrahrihrik
+  - Xikrakipi
+  - Xikreshe
+  - Xikreska
+  - Xikrexiva
+  - Xikrihe
+  - Xikripar
+  - Xipahihik
+  - Xipita
+  - Xiprahahatek
+  - Xirechiske
+  - Xireshishit
+  - Xiribakrivi
+  - Xirichare
+  - Xirichebacra
+  - Xirichiter
+  - Xiricraki
+  - Xirihacrir
+  - Xirihiske
+  - Xirihiyatape
+  - Xirihrekakar
+  - Xirihretecre
+  - Xirihriti
+  - Xirikesrirer
+  - Xiriketi
+  - Xiripape
+  - Xiririhecher
+  - Xiririke
+  - Xiriripatibe
+  - Xirishepivre
+  - Xirishexi
+  - Xiriskapa
+  - Xirisketa
+  - Xiriskicreha
+  - Xirisrevre
+  - Xirisricreva
+  - Xiritracre
+  - Xiritreprer
+  - Xiritretrar
+  - Xirivetrikra
+  - Xirivexicri
+  - Xirivre
+  - Xirivrehra
+  - Xirixekrari
+  - Xishahrixixi
+  - Xishatre
+  - Xishehraxaxa
+  - Xishikra
+  - Xiskatreka
+  - Xiskeche
+  - Xiskehrahar
+  - Xiskicratake
+  - Xiskiririr
+  - Xisrecracrak
+  - Xisreva
+  - Xisritetet
+  - Xitachabibi
+  - Xitachixaxa
+  - Xitariritak
+  - Xitebehrer
+  - Xitreprecri
+  - Xivavraxexe
+  - Xiveski
+  - Xivivri
+  - Xivrahrare
+  - Xivrakrakrak
+  - Xivrihihicra
+  - Xixaxekaka
+  - Xixecra
+  - Xixiche
diff --git a/Resources/Prototypes/Decals/Overlays/grayscale.yml b/Resources/Prototypes/Decals/Overlays/grayscale.yml
index 8f019202957..dfebeee3f91 100644
--- a/Resources/Prototypes/Decals/Overlays/grayscale.yml
+++ b/Resources/Prototypes/Decals/Overlays/grayscale.yml
@@ -6,6 +6,110 @@
     sprite: Decals/Overlays/greyscale.rsi
     state: fulltile_overlay
 
+- type: decal
+  id: BrickBoxOverlay
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_box
+
+- type: decal
+  id: BrickCornerOverlayNE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_corner_ne
+
+- type: decal
+  id: BrickCornerOverlayNW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_corner_nw
+
+- type: decal
+  id: BrickCornerOverlaySE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_corner_se
+
+- type: decal
+  id: BrickCornerOverlaySW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_corner_sw
+
+- type: decal
+  id: BrickEndOverlayE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_end_e
+
+- type: decal
+  id: BrickEndOverlayN
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_end_n
+
+- type: decal
+  id: BrickEndOverlayS
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_end_s
+
+- type: decal
+  id: BrickEndOverlayW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_end_w
+
+- type: decal
+  id: BrickLineOverlayE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_line_e
+
+- type: decal
+  id: BrickLineOverlayN
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_line_n
+
+- type: decal
+  id: BrickLineOverlayS
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_line_s
+
+- type: decal
+  id: BrickLineOverlayW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_line_w
+
 - type: decal
   id: HalfTileOverlayGreyscale
   tags: ["station", "overlay"]
@@ -102,6 +206,14 @@
     sprite: Decals/Overlays/greyscale.rsi
     state: threequartertile_overlay_270
 
+- type: decal
+  id: MonoOverlay
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: mono
+
 - type: decal
   id: CheckerNESW
   tags: ["station", "overlay"]
@@ -199,12 +311,140 @@
     state: minitile_diagonal_b
 
 - type: decal
-  id: MonoOverlay
+  id: MiniTileBoxOverlay
   tags: ["station", "overlay"]
   defaultCustomColor: true
   sprite:
     sprite: Decals/Overlays/greyscale.rsi
-    state: mono
+    state: minitile_box
+
+- type: decal
+  id: MiniTileCornerOverlayNE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_corner_ne
+
+- type: decal
+  id: MiniTileCornerOverlayNW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_corner_nw
+
+- type: decal
+  id: MiniTileCornerOverlaySE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_corner_se
+
+- type: decal
+  id: MiniTileCornerOverlaySW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_corner_sw
+
+- type: decal
+  id: MiniTileEndOverlayE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_end_e
+
+- type: decal
+  id: MiniTileEndOverlayN
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_end_n
+
+- type: decal
+  id: MiniTileEndOverlayS
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_end_s
+
+- type: decal
+  id: MiniTileEndOverlayW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_end_w
+
+- type: decal
+  id: MiniTileInnerOverlayNE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_inner_ne
+
+- type: decal
+  id: MiniTileInnerOverlayNW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_inner_nw
+
+- type: decal
+  id: MiniTileInnerOverlaySE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_inner_se
+
+- type: decal
+  id: MiniTileInnerOverlaySW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_inner_sw
+
+- type: decal
+  id: MiniTileLineOverlayE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_line_e
+
+- type: decal
+  id: MiniTileLineOverlayN
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_line_n
+
+- type: decal
+  id: MiniTileLineOverlayS
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_line_s
+
+- type: decal
+  id: MiniTileLineOverlayW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_line_w
 
 - type: decal
   id: OffsetOverlay
diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
index a9798ce212c..ca0e83d45a3 100644
--- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
@@ -9,26 +9,6 @@
   categories:
   - UplinkUtility
 
-#- type: listing
-#  id: UplinkCyborgBeaconSyndicate
-#  name: uplink-borg-beacon-name
-#  description: uplink-borg-beacon-desc
-#  productEntity: CyborgBeaconSyndicate
-#  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
-#  cost:
-#    Telecrystal: 65
-#  categories:
-#    - UplinkUtility
-#  conditions:
-#    - !type:StoreWhitelistCondition
-#      whitelist:
-#        tags:
-#          - NukeOpsUplink
-#    - !type:BuyerWhitelistCondition
-#      blacklist:
-#        components:
-#          - SurplusBundle
-
 - type: listing
   id: UplinkBionicSyrinxImplanter
   name: uplink-bionic-syrinx-implanter-name
@@ -45,4 +25,4 @@
   - !type:BuyerWhitelistCondition
     blacklist:
       components:
-      - SurplusBundle
\ No newline at end of file
+      - SurplusBundle
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
index 22167ae0385..1c5cef39af1 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
@@ -192,21 +192,3 @@
     sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatStrawHat
-  name: straw hat
-  description: A fancy hat for hot days! Not recommended to wear near fires.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Clothing/Head/Hats/straw_hat.rsi
-  - type: Clothing
-    sprite: DeltaV/Clothing/Head/Hats/straw_hat.rsi
-  - type: Construction
-    graph: StrawHat
-    node: strawhat
-  - type: Tag
-    tags:
-    - HamsterWearable
-
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Syndicate_Gadgets/borg_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Syndicate_Gadgets/borg_beacon.yml
deleted file mode 100644
index 85544592eec..00000000000
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Syndicate_Gadgets/borg_beacon.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-#- type: entity
-#  parent: BaseItem
-#  id: CyborgBeaconSyndicate
-#  name: syndicate robot beacon
-#  description: A single-use beacon designed to quickly launch reinforcement cyborgs into the field.
-#  components:
-#    - type: Sprite
-#      sprite: Objects/Devices/communication.rsi
-#      layers:
-#        - state: old-radio
-#      netsync: false
-#    - type: GhostRole
-#      name: Syndicate Assault Robot
-#      description: Someone needs reinforcements. You're the reinforcements.
-#      rules: Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them.
-#    - type: GhostRoleMobSpawner
-#      prototype: PlayerRobotSyndicate
-#    - type: EmitSoundOnUse
-#      sound: /Audio/Effects/RingtoneNotes/a.ogg
-#    - type: UseDelay
-#      delay: 300
diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml
deleted file mode 100644
index e01a510653a..00000000000
--- a/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: construction
-  name: straw hat
-  id: strawHat
-  graph: StrawHat
-  startNode: start
-  targetNode: strawhat
-  category: construction-category-clothing
-  description: A fancy hat for hot days! Not recommended to wear near fires.
-  icon:
-    sprite: DeltaV/Clothing/Head/Hats/straw_hat.rsi
-    state: icon
-  objectType: Item
diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml
index 72181758e38..6a1efcfa695 100644
--- a/Resources/Prototypes/DeltaV/tags.yml
+++ b/Resources/Prototypes/DeltaV/tags.yml
@@ -36,9 +36,6 @@
 - type: Tag
   id: BionicSyrinxImplant
 
-- type: Tag
-  id: Wheat
-
 - type: Tag
   id: PaperSlip
 
diff --git a/Resources/Prototypes/DeltaV/typing_indicator.yml b/Resources/Prototypes/DeltaV/typing_indicator.yml
index c5372b3cc35..7cfca9cc95f 100644
--- a/Resources/Prototypes/DeltaV/typing_indicator.yml
+++ b/Resources/Prototypes/DeltaV/typing_indicator.yml
@@ -1,4 +1,6 @@
-- type: typingIndicator
+- type: typingIndicator
   id: felinid
+  spritePath: /Textures/DeltaV/Effects/speech.rsi
   typingState: felinid0
   offset: 0, 0.2 # 0625
+
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index de6c7754695..0effc02da61 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -303,6 +303,17 @@
     sprite: Clothing/Belt/belt_overlay.rsi
   - type: Appearance
 
+- type: entity
+  parent: ClothingBeltMedical
+  id: ClothingBeltMedicalEMT
+  name: EMT belt
+  description: Perfect for holding various equipment for medical emergencies.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/emt.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/emt.rsi
+
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltPlant
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index 89010ca30e0..aa1aea4df7a 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -2,7 +2,7 @@
   parent: ClothingEyesBase
   id: ClothingEyesHudDiagnostic
   name: diagnostic hud
-  description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits.
+  description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium.
   components:
   - type: Sprite
     sprite: Clothing/Eyes/Hud/diag.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index 813888fb6b4..e34208e9ca1 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -128,6 +128,12 @@
   - type: TemperatureProtection
     coefficient: 0.2
   - type: IngestionBlocker
+  - type: Clothing
+    #Copies ClothingHeadHardsuitBase behavior
+    equipSound: /Audio/Mecha/mechmove03.ogg
+    unequipSound: /Audio/Mecha/mechmove03.ogg
+    quickEquip: false
+    slots: [ HEAD ]
   - type: Tag
     tags:
     - HidesHair
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 1e38246bd06..205b4ac16ff 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -25,6 +25,23 @@
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretFrench
+  name: French beret
+  description: A French beret, "vive la France".
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beret_french.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beret_french.rsi
+  - type: AddAccentClothing
+    accent: FrenchAccent
+  - type: Tag
+    tags:
+    - ClothMade
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretSecurity
@@ -84,6 +101,22 @@
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretQM
+  name: quartermaster's beret
+  description: A beret with the cargo's insignia emblazoned on it. For quartermasters that are more inclined towards style.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beret_qm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beret_qm.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretHoS
@@ -125,7 +158,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretBrigmedic
-  name: medical beret
+  name: brigmedical beret
   description: White beret, looks like a cream pie on the head.
   components:
   - type: Sprite
@@ -347,6 +380,11 @@
     sprite: Clothing/Head/Hats/plaguedoctor.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/plaguedoctor.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
+    - ClothMade
 
 - type: entity
   parent: ClothingHeadBase
@@ -494,6 +532,11 @@
     sprite: Clothing/Head/Hats/witch.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/witch.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
+    - ClothMade
 
 - type: entity
   parent: ClothingHeadBase
@@ -978,4 +1021,59 @@
     - type: Sprite
       sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
     - type: Clothing
-      sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
\ No newline at end of file
+      sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatStrawHat
+  name: straw hat
+  description: A fancy hat for hot days! Not recommended to wear near fires.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/straw_hat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/straw_hat.rsi
+  - type: Construction
+    graph: StrawHat
+    node: strawhat
+  - type: Tag
+    tags:
+    - HamsterWearable
+  - type: Flammable
+    fireSpread: true
+    canResistFire: false
+    alwaysCombustible: true
+    canExtinguish: true
+    damage:
+      types:
+        Heat: 1
+  - type: Damageable
+    damageModifierSet: Wood
+  - type: Appearance
+  - type: FireVisuals
+    sprite: Effects/fire.rsi
+    normalState: fire
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+            Ash:
+              min: 1
+              max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretMedic
+  name: medical beret
+  description: White beret that encourages you to be clean.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beret_medic.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beret_medic.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index fe895e490b6..9ab528581af 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -94,6 +94,7 @@
     sprite: Clothing/Head/Hoods/chaplain.rsi
   - type: Tag
     tags:
+    - HidesHair
     - HamsterWearable
     - WhitelistChameleon
 
@@ -107,6 +108,10 @@
     sprite: Clothing/Head/Hoods/cult.rsi
   - type: Clothing
     sprite: Clothing/Head/Hoods/cult.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingHeadBase
@@ -120,6 +125,7 @@
     sprite: Clothing/Head/Hoods/nun.rsi
   - type: Tag
     tags:
+    - HidesHair
     - HamsterWearable
     - WhitelistChameleon
 
@@ -153,6 +159,10 @@
     sprite: Clothing/Head/Hoods/goliathcloak.rsi
   - type: Clothing
     sprite: Clothing/Head/Hoods/goliathcloak.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingHeadBase
diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
index ea5e1c03919..163d9937f2e 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -1,5 +1,47 @@
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadBaseButcherable, BaseFoldable]
+  id: ClothingHeadHeadHatBaseFlippable
+  abstract: true
+  components:
+  - type: Appearance
+  - type: Foldable
+    canFoldInsideContainer: true
+    unfoldVerbText: fold-flip-verb
+    foldVerbText: fold-flip-verb
+  - type: FoldableClothing
+    foldedEquippedPrefix: flipped
+    foldedHeldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: false
+
+- type: entity
+  parent: ClothingHeadHeadHatBaseFlippable
+  id: ClothingHeadHeadHatBaseFlipped
+  suffix: flipped
+  abstract: true
+  components:
+  - type: Foldable
+    folded: true
+  - type: Clothing
+    equippedPrefix: flipped
+  - type: Item
+    heldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+      visible: false
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: true
+
+- type: entity
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatBluesoft
   name: blue cap
   description: "It's a baseball hat in a tasteless blue colour."
@@ -10,18 +52,12 @@
     sprite: Clothing/Head/Soft/bluesoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBluesoft]
   id: ClothingHeadHatBluesoftFlipped
-  name: blue cap flipped
-  description: "It's a baseball hat in a tasteless blue colour. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/bluesoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/bluesoft_flipped.rsi
+  name: blue cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatCargosoft
   name: logistics cap # DeltaV - Logistics Department replacing Cargo
   description: "It's a baseball hat painted in Logistics colours." # DeltaV - Logistics Department replacing Cargo
@@ -37,18 +73,19 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCargosoft]
   id: ClothingHeadHatCargosoftFlipped
-  name: logistics cap flipped # DeltaV - Logistics Department replacing Cargo
+  name: logistics cap # DeltaV - Logistics Department replacing Cargo
   description: "It's a baseball hat painted in Logistics colours. Flipped." # DeltaV - Logistics Department replacing Cargo
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatQMsoft
   name: logistics officer's cap # DeltaV - Logistics Department replacing Cargo
   description: "It's a baseball hat painted in the Logistics Officer's colors."
@@ -59,18 +96,12 @@
     sprite: Clothing/Head/Soft/qmsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatQMsoft]
   id: ClothingHeadHatQMsoftFlipped
-  name: logistics officer's cap flipped # DeltaV - Logistics Department replacing Cargo
-  description: "It's a baseball hat painted in the Logistics Officer's colors. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
+  name: logistics officer's cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatCorpsoft
   name: corporate cap
   description: A baseball bat in corporation colors.
@@ -81,18 +112,12 @@
     sprite: Clothing/Head/Soft/corpsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCorpsoft]
   id: ClothingHeadHatCorpsoftFlipped
-  name: corporate cap flipped
-  description: A baseball bat in corporation colors. Flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/corpsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/corpsoft_flipped.rsi
+  name: corporate cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatGreensoft
   name: green cap
   description: "It's a baseball hat in a tasteless green colour."
@@ -103,18 +128,12 @@
     sprite: Clothing/Head/Soft/greensoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatGreensoft]
   id: ClothingHeadHatGreensoftFlipped
-  name: green cap flipped
-  description: "It's a baseball hat in a tasteless green colour. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/greensoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/greensoft_flipped.rsi
+  name: green cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatBlacksoft
   name: black cap
   description: "It's a baseball hat in a tasteless black colour."
@@ -125,18 +144,12 @@
     sprite: Clothing/Head/Soft/blacksoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBlacksoft]
   id: ClothingHeadHatBlacksoftFlipped
-  name: black cap flipped
-  description: "It's a baseball hat in a tasteless black colour. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/blacksoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/blacksoft_flipped.rsi
+  name: black cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatGreysoft
   name: grey cap
   description: "It's a baseball hat in a tasteless grey colour."
@@ -147,18 +160,12 @@
     sprite: Clothing/Head/Soft/greysoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatGreysoft]
   id: ClothingHeadHatGreysoftFlipped
-  name: grey cap flipped
-  description: "It's a baseball hat in a tasteless grey colour. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/greysoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/greysoft_flipped.rsi
+  name: grey cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatMimesoft
   name: mime cap
   description: "It's a baseball hat in a tasteless white colour."
@@ -169,18 +176,12 @@
     sprite: Clothing/Head/Soft/mimesoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatMimesoft]
   id: ClothingHeadHatMimesoftFlipped
-  name: mime cap flipped
-  description: It's a baseball hat in a tasteless white colour. Flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/mimesoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/mimesoft_flipped.rsi
+  name: mime cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatOrangesoft
   name: orange cap
   description: It's a baseball hat in a good-looking orange colour.
@@ -191,18 +192,12 @@
     sprite: Clothing/Head/Soft/orangesoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatOrangesoft]
   id: ClothingHeadHatOrangesoftFlipped
-  name: orange cap flipped
-  description: It's a baseball hat in a good-looking orange colour. Flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/orangesoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/orangesoft_flipped.rsi
+  name: orange cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatPurplesoft
   name: purple cap
   description: It's a baseball hat in a tasteless purple colour.
@@ -218,18 +213,18 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatPurplesoft]
   id: ClothingHeadHatPurplesoftFlipped
-  name: purple cap flipped
-  description: It's a baseball hat in a tasteless purple colour. Flipped.
+  name: purple cap
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatRedsoft
   name: red cap
   description: It's a baseball hat in a tasteless red colour.
@@ -240,18 +235,12 @@
     sprite: Clothing/Head/Soft/redsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatRedsoft]
   id: ClothingHeadHatRedsoftFlipped
-  name: red cap flipped
-  description: It's a baseball hat in a tasteless purple colour. Flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/redsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/redsoft_flipped.rsi
+  name: red cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatSecsoft
   name: security cap
   description: It's a robust baseball hat in tasteful red colour.
@@ -262,18 +251,12 @@
     sprite: Clothing/Head/Soft/secsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatSecsoft]
   id: ClothingHeadHatSecsoftFlipped
-  name: security cap flipped
-  description: It's a robust baseball hat in tasteful red colour. Flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/secsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/secsoft_flipped.rsi
+  name: security cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatYellowsoft
   name: yellow cap
   description: A yellow baseball hat.
@@ -284,20 +267,14 @@
     sprite: Clothing/Head/Soft/yellowsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatYellowsoft]
   id: ClothingHeadHatYellowsoftFlipped
-  name: yellow cap flipped
-  description: A yellow flipped baseball hat.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/yellowsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/yellowsoft_flipped.rsi
+  name: yellow cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatBizarreSoft
-  name: troublemaker's soft
+  name: troublemaker's cap
   description: A truly.. bizarre accessory.
   components:
   - type: Sprite
@@ -306,18 +283,12 @@
     sprite: Clothing/Head/Soft/bizarresoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBizarreSoft]
   id: ClothingHeadHatBizarreSoftFlipped
-  name: troublemaker's soft flipped
-  description: A truly.. bizarre accessory, flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi
+  name: troublemaker's cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatParamedicsoft
   name: paramedic cap
   description: "It's a paramedic's baseball hat with a medical logo."
@@ -333,12 +304,12 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatParamedicsoft]
   id: ClothingHeadHatParamedicsoftFlipped
-  name: paramedic cap flipped
-  description: "It's a paramedic's baseball hat with a medical logo. Flipped."
+  name: paramedic cap
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/paramedicsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/paramedicsoft_flipped.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 46827f8b606..df51b6438d1 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -493,6 +493,17 @@
     - type: Clothing
       sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitQMFormal
+  name: quartermasters's formal suit
+  description: Inspired by the quartermasters of military's past, the perfect outfit for supplying a formal occasion.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpsuit/qmformal.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpsuit/qmformal.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitResearchDirector
@@ -1447,4 +1458,4 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
\ No newline at end of file
+    sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
diff --git a/Resources/Prototypes/Entities/Debugging/options_visualizer.yml b/Resources/Prototypes/Entities/Debugging/options_visualizer.yml
new file mode 100644
index 00000000000..229ffa00ccb
--- /dev/null
+++ b/Resources/Prototypes/Entities/Debugging/options_visualizer.yml
@@ -0,0 +1,24 @@
+- type: entity
+  id: OptionsVisualizerTest
+  suffix: DEBUG
+  components:
+  - type: Tag
+    tags:
+    - Debug
+  - type: Sprite
+    sprite: Effects/optionsvisualizertest.rsi
+    layers:
+    - state: none
+      map: [ "layer" ]
+  - type: OptionsVisualizer
+    visuals:
+      layer:
+      - options: Default
+        data: { state: none }
+      - options: Test
+        data: { state: test }
+      - options: ReducedMotion
+        data: { state: motion }
+      - options: [Test, ReducedMotion]
+        data: { state: both }
+
diff --git a/Resources/Prototypes/Entities/Effects/portal.yml b/Resources/Prototypes/Entities/Effects/portal.yml
index 653d3f608dd..19b6fc1be31 100644
--- a/Resources/Prototypes/Entities/Effects/portal.yml
+++ b/Resources/Prototypes/Entities/Effects/portal.yml
@@ -68,3 +68,26 @@
     lifetime: 120
   - type: Portal
     canTeleportToOtherMaps: true
+
+- type: entity
+  id: ShadowPortal
+  name: shadow rift
+  description: Looks unstable.
+  parent: [ BasePortal, BaseShadow ]
+  components:
+  - type: Portal
+    arrivalSound: /Audio/Items/hiss.ogg
+    departureSound: /Audio/Items/hiss.ogg
+  - type: Sprite
+    state: portal-artifact
+    color: "#793a80dd"
+  - type: PointLight
+    color: "#793a80dd"
+    radius: 3
+    energy: 1
+    netsync: false
+  - type: AmbientSound
+    range: 6
+    volume: -3
+    sound:
+      path: /Audio/Ambience/anomaly_scary.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
index c81c840fb00..d4edbe9fc06 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
@@ -19,6 +19,7 @@
     - RandomRockAnomalySpawner
     - AnomalyLiquid
     - AnomalyFlora
+    - AnomalyShadow
     chance: 1
     offset: 0.15 # not to put it higher. The anomaly sychnronizer looks for anomalies within this radius, and if the radius is higher, the anomaly can be attracted from a neighboring tile.
 
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml
new file mode 100644
index 00000000000..95a24157f98
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml
@@ -0,0 +1,26 @@
+- type: entity
+  id: ShadowKudzuLootSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+      - state: red
+      - sprite: Structures/Specific/Anomalies/shadow_anom.rsi
+        state: anom
+    - type: RandomSpawner
+      offset: 0.05
+      chance: 0.7
+      prototypes:
+        - CrystalPink
+        - CrystalPink
+        - ShadowPortal
+        - ShadowTree01
+        - ShadowTree02
+        - ShadowTree03
+        - ShadowTree04
+        - ShadowTree05
+        - ShadowTree06
+      rareChance: 0.05
+      rarePrototypes:
+        - MobCatShadow
+        - ArtifactFragment
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index bb9d6d2b295..92943a7af4b 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1307,3 +1307,10 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: uneven
+- type: marking
+  id: HumanHairTailed
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: tailed
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
index cca16443e2c..f4186295900 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
@@ -3,11 +3,7 @@
   bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy
-  coloring:
-    default:
-      type:
-        !type:TattooColoring
-      fallbackColor: "#FFFFFF"
+  followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_eye_right
@@ -17,11 +13,7 @@
   bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy
-  coloring:
-    default:
-      type:
-        !type:TattooColoring
-      fallbackColor: "#FFFFFF"
+  followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_eye_left
@@ -30,7 +22,7 @@
   id: ScarTopSurgeryShort
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human]
+  speciesRestriction: [Human, Dwarf]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -41,9 +33,19 @@
   id: ScarTopSurgeryLong
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human]
+  speciesRestriction: [Human, Dwarf]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_top_surgery_long
+
+- type: marking
+  id: ScarChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_chest
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml
index b827b0221c9..092ebf2fddf 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml
@@ -18,7 +18,7 @@
 
 - type: marking
   id: SlimeGradientLeftLeg
-  bodyPart: LFoot
+  bodyPart: LLeg
   markingCategory: Legs
   speciesRestriction: [SlimePerson]
   sprites:
@@ -27,13 +27,31 @@
 
 - type: marking
   id: SlimeGradientRightLeg
-  bodyPart: RFoot
+  bodyPart: RLeg
   markingCategory: Legs
   speciesRestriction: [SlimePerson]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_r_leg
 
+- type: marking
+  id: SlimeGradientLeftFoot
+  bodyPart: LFoot
+  markingCategory: Legs
+  speciesRestriction: [SlimePerson]
+  sprites:
+  - sprite: Mobs/Customization/slime_parts.rsi
+    state: gradient_l_foot
+
+- type: marking
+  id: SlimeGradientRightFoot
+  bodyPart: RFoot
+  markingCategory: Legs
+  speciesRestriction: [SlimePerson]
+  sprites:
+  - sprite: Mobs/Customization/slime_parts.rsi
+    state: gradient_r_foot
+
 - type: marking
   id: SlimeGradientLeftHand
   bodyPart: LHand
@@ -50,4 +68,4 @@
   speciesRestriction: [SlimePerson]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
-    state: gradient_r_hand
\ No newline at end of file
+    state: gradient_r_hand
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 3fde1d6ddf6..b55ec81c665 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2236,6 +2236,9 @@
         collection: FootstepClownFast
     - type: Speech
       speechVerb: Cluwne
+    - type: Bloodstream
+      bloodMaxVolume: 150
+      bloodReagent: Laughter
 
 - type: entity
   name: possum
@@ -3111,3 +3114,77 @@
     factions:
     - Passive
 
+- type: entity
+  name: diona nymph
+  parent: SimpleMobBase
+  id: MobDionaNymph
+  description: It's like a cat, only.... branch-ier.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: nymph
+      sprite: Mobs/Animals/nymph.rsi
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 100 # High, because wood is heavy.
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: Inventory
+    speciesId: cat
+    templateId: pet
+  - type: InventorySlots
+  - type: Strippable
+  - type: Bloodstream
+    bloodReagent: Water
+    bloodMaxVolume: 60
+  - type: UserInterface
+    interfaces:
+    - key: enum.StrippingUiKey.Key
+      type: StrippableBoundUserInterface
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: nymph
+      Critical:
+        Base: nymph_sleep
+      Dead:
+        Base: nymph_dead
+  - type: Butcherable
+    spawned:
+    - id: MaterialWoodPlank1
+      amount: 2
+  - type: InteractionPopup
+    successChance: 0.7
+    interactSuccessString: petting-success-nymph
+    interactFailureString: petting-failure-nymph
+    interactSuccessSound:
+      path: /Audio/Animals/nymph_chirp.ogg
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      30: Critical
+      60: Dead
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 2.5
+    baseSprintSpeed : 4.5
+  - type: Grammar
+    attributes:
+      gender: epicene
+  - type: Speech
+  - type: Tag
+    tags:
+    - VimPilot
+  - type: Reform
+    actionPrototype: DionaReformAction
+    reformTime: 10
+    popupText: diona-reform-attempt
+    reformPrototype: MobDionaReformed
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
index 3b3b9b44120..bc63deeac36 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -112,6 +112,9 @@
           Radiation: 10
     - type: Input
       context: "human"
+    - type: Bloodstream
+      bloodMaxVolume: 300
+      bloodReagent: Laughter
 
 - type: entity
   name: behonker
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
new file mode 100644
index 00000000000..f08fe36544e
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
@@ -0,0 +1,67 @@
+- type: entity
+  id: BaseShadowMob
+  abstract: true
+  parent: [ BaseMob, BaseShadow ]
+  components:
+  - type: Sprite
+    color: "#793a80dd"
+  - type: PointLight
+    color: "#793a80dd"
+    radius: 1.1
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 2
+    baseSprintSpeed: 2
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 120
+        mask:
+        - Opaque
+        layer:
+        - None
+  - type: StandingState
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+  - type: NpcFactionMember
+    factions:
+    - SimpleNeutral
+  - type: HTN
+    rootTask:
+      task: IdleCompound
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      60: 0.7
+      80: 0.5
+      
+- type: entity
+  name: shadow cat
+  parent: BaseShadowMob
+  id: MobCatShadow
+  description: A lovely piece of darkness. Hope he doesn't bring you a curse.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Pets/cat.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: cat
+  - type: Physics
+  - type: ReplacementAccent
+    accent: cat
+  - type: InteractionPopup
+    successChance: 0.01 # you cant pet shadow cat... almost
+    interactSuccessString: petting-success-cat
+    interactFailureString: petting-failure-shadow
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/cat_meow.ogg
+  - type: Grammar
+    attributes:
+      gender: epicene
+  - type: Tag
+    tags:
+    - VimPilot
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
index 7fbe0453b3f..28687c68bfc 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -11,4 +11,14 @@
       damageRecovery:
         types:
           Asphyxiation: -1.0
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
+    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
+
+# Reformed Diona
+- type: entity
+  parent: MobDiona
+  noSpawn: true
+  id: MobDionaReformed
+  name: Reformed Diona
+  components:
+    - type: IsDeadIC
+    - type: RandomHumanoidAppearance
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index e8c475907e9..a610e04d6dd 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -60,7 +60,7 @@
       state: "creampie_human"
       visible: false
   - type: DamageVisuals
-    thresholds: [ 20, 40, 100 ]
+    thresholds: [ 10, 20, 30, 50, 70, 100 ]
     targetLayers:
     - "enum.HumanoidVisualLayers.Chest"
     - "enum.HumanoidVisualLayers.Head"
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index 3f46005635c..3d405c4dd91 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -95,6 +95,13 @@
   - type: BodyEmotes
     soundsId: DionaBodyEmotes
   - type: IgnoreKudzu
+  - type: IgniteOnHeatDamage
+    fireStacks: 1
+    threshold: 12
+  - type: GibAction
+    actionPrototype: DionaGibAction
+    allowedStates:
+    - Dead
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index e17b2f70805..184711ec1e5 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -8,105 +8,45 @@
   - type: Icon
     sprite: Mobs/Species/Vox/parts.rsi
     state: vox_m
-  - type: Sprite
-    layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: torso_m
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: head_m
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-        color: "#008800"
-        sprite: Mobs/Customization/eyes.rsi
-        state: vox_eyes_s
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_arm
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_arm
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_leg
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_leg
-      # Vox don't have female clothing masks.
-      #- shader: StencilClear
-      #  sprite: Mobs/Species/Vox/parts.rsi
-      #  state: l_leg
-      #- shader: StencilMask
-      #  map: [ "enum.HumanoidVisualLayers.FemaleStencilMask" ]
-      #  sprite: Mobs/Customization/masking_helpers.rsi
-      #  state: female_full
-      #  visible: false
-      #- map: [ "jumpsuit" ]
-      #  shader: StencilDraw
-      - map: [ "enum.HumanoidVisualLayers.LHand" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_hand
-      - map: [ "enum.HumanoidVisualLayers.RHand" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_hand
-      - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_foot
-      - map: [ "enum.HumanoidVisualLayers.RFoot" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_foot
-      - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
-        color: "#ffffff"
-        sprite: Objects/Misc/handcuffs.rsi
-        state: body-overlay-2
-        visible: false
-      - map: [ "gloves" ]
-      - map: [ "shoes" ]
-      - map: [ "ears" ]
-      - map: [ "outerClothing" ]
-      - map: [ "eyes" ]
-      - map: [ "belt" ]
-      - map: [ "id" ]
-      - map: [ "neck" ]
-      - map: [ "back" ]
-      - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-        state: shaved
-        sprite: Mobs/Customization/human_facial_hair.rsi
-      - map: [ "enum.HumanoidVisualLayers.Hair" ]
-        state: bald
-        sprite: Mobs/Customization/human_hair.rsi
-      - map: [ "mask" ]
-      - map: [ "head" ]
-      - map: [ "pocket1" ]
-      - map: [ "pocket2" ]
   - type: Body
     prototype: Vox
     requiredLegs: 2
-  # Vox nitrogen stuff is handled in their metabolism
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 2
-    damageRecovery:
-      types:
-        Asphyxiation: -1.0
   - type:  HumanoidAppearance
     species: Vox
-    # canColorHair: false
-    # canColorFacialHair: false
-  - type: Inventory
-    speciesId: vox
-  - type: InventorySlots
-  - type: Butcherable
-    butcheringType: Spike
-    spawned:
-    - id: FoodMeatChicken
-      amount: 5
+    #- type: VoxAccent # Not yet coded
+  - type: Speech
+    speechVerb: Vox
+    speechSounds: Vox
+  - type: TypingIndicator
+    proto: vox
   - type: Vocal
     sounds:
       Male: UnisexVox
       Female: UnisexVox
       Unsexed: UnisexVox
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatChicken
+      amount: 5
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: Vox
+  - type: DamageVisuals
+    damageOverlayGroups:
+      Brute:
+        sprite: Mobs/Effects/brute_damage.rsi
+        color: "#7a8bf2"
+  - type: Bloodstream
+    bloodReagent: AmmoniaBlood
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Weapons/pierce.ogg
+    angle: 30
+    animation: WeaponArcClaw
+    damage:
+      types:
+        Slash: 5 # Reduce?
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index cab95b0803b..f232bf1d34d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -6,6 +6,10 @@
   - type: Openable
     sound:
       collection: bottleOpenSounds #Could use a new sound someday ¯\_(ツ)_/¯
+    closeable: true
+    closeSound:
+      collection: bottleCloseSounds
+  - type: Sealable
   - type: SolutionContainerManager
     solutions:
       drink:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index c6dfc373853..935e5eeb9e1 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -134,10 +134,9 @@
       fillBaseName: fill
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAbsintheGlass
-  name: absinthe glass
-  description: Wormwood, anise, oh my.
+  suffix: absinthe
   components:
   - type: SolutionContainerManager
     solutions:
@@ -146,14 +145,14 @@
         reagents:
         - ReagentId: Absinthe
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/absintheglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAcidSpitGlass
-  name: acid spit glass
-  description: A drink from the company archives. Made from live aliens.
+  suffix: acid spit
   components:
   - type: SolutionContainerManager
     solutions:
@@ -162,14 +161,14 @@
         reagents:
         - ReagentId: AcidSpit
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/acidspitglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAleGlass
-  name: ale glass
-  description: A freezing pint of delicious ale
+  suffix: ale
   components:
   - type: SolutionContainerManager
     solutions:
@@ -178,14 +177,14 @@
         reagents:
         - ReagentId: Ale
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/aleglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAlliesCocktail
-  name: allies cocktail
-  description: A drink made from your allies.
+  suffix: allies cocktail
   components:
   - type: SolutionContainerManager
     solutions:
@@ -194,14 +193,14 @@
         reagents:
         - ReagentId: AlliesCocktail
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/alliescocktail.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAloe
-  name: aloe glass
-  description: Very, very, very good.
+  suffix: aloe
   components:
   - type: SolutionContainerManager
     solutions:
@@ -210,14 +209,14 @@
         reagents:
         - ReagentId: Aloe
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/aloe.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAmasecGlass
-  name: amasec glass
-  description: Always handy before COMBAT!!!
+  suffix: amasec
   components:
   - type: SolutionContainerManager
     solutions:
@@ -226,14 +225,14 @@
         reagents:
         - ReagentId: Amasec
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/amasecglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAndalusia
-  name: andalusia glass
-  description: A nice drink with a strange name.
+  suffix: andalusia
   components:
   - type: SolutionContainerManager
     solutions:
@@ -242,14 +241,14 @@
         reagents:
         - ReagentId: Andalusia
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/andalusia.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAntifreeze
-  name: anti-freeze glass
-  description: The ultimate refreshment.
+  suffix: antifreeze
   components:
   - type: SolutionContainerManager
     solutions:
@@ -258,15 +257,11 @@
         reagents:
         - ReagentId: Antifreeze
           Quantity: 30
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/antifreeze.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAtomicBombGlass
-  name: atomic bomb glass
-  description: We cannot take legal responsibility for your actions after imbibing.
+  suffix: atomic bomb
   components:
   - type: SolutionContainerManager
     solutions:
@@ -275,15 +270,14 @@
         reagents:
         - ReagentId: AtomicBomb
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/atomicbombglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkB52Glass
-  name: b-52 glass
-  description: Coffee, Irish Cream, and cognac. You will get bombed.
+  suffix: b-52
   components:
   - type: SolutionContainerManager
     solutions:
@@ -292,15 +286,14 @@
         reagents:
         - ReagentId: B52
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/b52glass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBahamaMama
-  name: bahama mama glass
-  description: Tropical cocktail.
+  suffix: bahama mama
   components:
   - type: SolutionContainerManager
     solutions:
@@ -309,15 +302,14 @@
         reagents:
         - ReagentId: BahamaMama
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/bahama_mama.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBananaHonkGlass
-  name: banana honk glass
-  description: A drink from Banana Heaven.
+  suffix: banana honk
   components:
   - type: SolutionContainerManager
     solutions:
@@ -326,15 +318,14 @@
         reagents:
         - ReagentId: BananaHonk
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/bananahonkglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBarefootGlass
-  name: barefoot glass
-  description: Barefoot and pregnant.
+  suffix: barefoot
   components:
   - type: SolutionContainerManager
     solutions:
@@ -343,15 +334,14 @@
         reagents:
         - ReagentId: Barefoot
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/b&p.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBeepskySmashGlass
-  name: beepsky smash glass
-  description: Heavy, hot and strong. Just like the Iron fist of the LAW.
+  suffix: beepsky smash
   components:
   - type: SolutionContainerManager
     solutions:
@@ -360,15 +350,14 @@
         reagents:
         - ReagentId: BeepskySmash
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBeerglass
-  name: beer glass
-  description: A freezing pint of beer.
+  suffix: beer
   components:
   - type: SolutionContainerManager
     solutions:
@@ -377,16 +366,15 @@
         reagents:
         - ReagentId: Beer
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/beerglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBerryJuice
-  name: berry juice
-  description: Berry juice. Or maybe it's jam. Who cares?
+  suffix: berry juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -394,14 +382,14 @@
         reagents:
         - ReagentId: JuiceBerry
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/berryjuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBlackRussianGlass
-  name: black russian glass
-  description: For the lactose-intolerant. Still as classy as a White Russian.
+  suffix: black russian
   components:
   - type: SolutionContainerManager
     solutions:
@@ -410,17 +398,15 @@
         reagents:
         - ReagentId: BlackRussian
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/blackrussianglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBlueCuracaoGlass
-  name: blue curacao
-  description: Exotically blue, fruity drink, distilled from oranges.
+  suffix: blue curacao
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -428,14 +414,14 @@
         reagents:
         - ReagentId: BlueCuracao
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/curacaoglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBloodyMaryGlass
-  name: bloody mary glass
-  description: Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder.
+  suffix: bloody mary
   components:
   - type: SolutionContainerManager
     solutions:
@@ -444,15 +430,14 @@
         reagents:
         - ReagentId: BloodyMary
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBooger
-  name: booger
-  description: Ewww...
+  suffix: booger
   components:
   - type: SolutionContainerManager
     solutions:
@@ -461,15 +446,14 @@
         reagents:
         - ReagentId: Booger
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/booger.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBraveBullGlass
-  name: brave bull glass
-  description: Tequilla and coffee liquor, brought together in a mouthwatering mixture. Drink up.
+  suffix: brave bull
   components:
   - type: SolutionContainerManager
     solutions:
@@ -478,17 +462,15 @@
         reagents:
         - ReagentId: BraveBull
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/bravebullglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCarrotJuice
-  name: carrot juice
-  description: It's just like a carrot but without crunching.
+  suffix: carrot juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -496,18 +478,15 @@
         reagents:
         - ReagentId: JuiceCarrot
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/carrotjuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkChocolateGlass
-  name: hot chocolate
-  description: A heated drink consisting melted chocolate and heated milk.
+  suffix: chocolate
   components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/chocolateglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -515,12 +494,14 @@
         reagents:
         - ReagentId: HotCocoa
           Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/chocolateglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCoffee
-  name: coffee
-  description: Don't drop it, or you'll send scalding liquid and glass shards everywhere.
+  suffix: coffee
   components:
   - type: SolutionContainerManager
     solutions:
@@ -529,14 +510,14 @@
         reagents:
         - ReagentId: Coffee
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/coffee.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCognacGlass
-  name: cognac glass
-  description: Damn, you feel like some kind of French aristocrat just by holding this.
+  suffix: cognac
   components:
   - type: SolutionContainerManager
     solutions:
@@ -545,14 +526,14 @@
         reagents:
         - ReagentId: Cognac
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/cognacglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCream
-  name: cream
-  description: Ewwww...
+  suffix: cream
   components:
   - type: SolutionContainerManager
     solutions:
@@ -561,14 +542,11 @@
         reagents:
         - ReagentId: Cream
           Quantity: 30
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/cream.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCubaLibreGlass
-  name: cuba libre glass
-  description: A classic mix of rum and cola.
+  suffix: cuba libre
   components:
   - type: SolutionContainerManager
     solutions:
@@ -577,14 +555,14 @@
         reagents:
         - ReagentId: CubaLibre
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/cubalibreglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDeadRumGlass
-  name: deadrum glass
-  description: Popular with the sailors. Not very popular with everyone else.
+  suffix: dead rum
   components:
   - type: SolutionContainerManager
     solutions:
@@ -593,15 +571,14 @@
         reagents:
         - ReagentId: DeadRum
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/rumglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDemonsBlood
-  name: demons blood
-  description: Just looking at this thing makes the hair at the back of your neck stand up.
+  suffix: demon's blood
   components:
   - type: SolutionContainerManager
     solutions:
@@ -610,15 +587,14 @@
         reagents:
         - ReagentId: DemonsBlood
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/demonsblood.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDevilsKiss
-  name: devil's kiss
-  description: Creepy time!
+  suffix: devil's kiss
   components:
   - type: SolutionContainerManager
     solutions:
@@ -627,15 +603,14 @@
         reagents:
         - ReagentId: DevilsKiss
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/devilskiss.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDoctorsDelightGlass
-  name: the doctor's delight
-  description: A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place.
+  suffix: doctor's delight
   components:
   - type: SolutionContainerManager
     solutions:
@@ -644,15 +619,14 @@
         reagents:
         - ReagentId: DoctorsDelight
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDriestMartiniGlass
-  name: driest martini glass
-  description: Only for the experienced. You think you see sand floating in the glass.
+  suffix: driest martini
   components:
   - type: SolutionContainerManager
     solutions:
@@ -661,15 +635,14 @@
         reagents:
         - ReagentId: DriestMartini
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDrGibbGlass
-  name: Dr. Gibb glass
-  description: Dr. Gibb. Not as dangerous as the name might imply.
+  suffix: dr gibb
   components:
   - type: SolutionContainerManager
     solutions:
@@ -678,15 +651,14 @@
         reagents:
         - ReagentId: DrGibb
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkErikaSurprise
-  name: erika surprise
-  description: The surprise is, it's green!
+  suffix: erika surprise
   components:
   - type: SolutionContainerManager
     solutions:
@@ -695,15 +667,14 @@
         reagents:
         - ReagentId: ErikaSurprise
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/erikasurprise.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkFourteenLokoGlass
-  name: Fourteen Loko glass
-  description: This is a container of Fourteen Loko, it appears to be of the highest quality. The drink, not the container.
+  suffix: fourteen loko
   components:
   - type: SolutionContainerManager
     solutions:
@@ -712,15 +683,14 @@
         reagents:
         - ReagentId: FourteenLoko
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/fourteen_loko_glass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGargleBlasterGlass
-  name: pan-galactic gargle blaster
-  description: Does... does this mean that Arthur and Ford are on the ship? Oh joy.
+  suffix: pan-galactic gargle blaster
   components:
   - type: SolutionContainerManager
     solutions:
@@ -729,15 +699,14 @@
         reagents:
         - ReagentId: GargleBlaster
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGinGlass
-  name: gin
-  description: Crystal clear Griffeater gin.
+  suffix: gin
   components:
   - type: SolutionContainerManager
     solutions:
@@ -746,15 +715,14 @@
         reagents:
         - ReagentId: Gin
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGinFizzGlass
-  name: gin fizz glass
-  description: Refreshingly lemony, deliciously dry.
+  suffix: gin fizz
   components:
   - type: SolutionContainerManager
     solutions:
@@ -763,15 +731,14 @@
         reagents:
         - ReagentId: GinFizz
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/ginfizzglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGinTonicglass
-  name: gin and tonic
-  description: A mild but still great cocktail. Drink up, like a true Englishman.
+  suffix: gin and tonic
   components:
   - type: SolutionContainerManager
     solutions:
@@ -780,15 +747,14 @@
         reagents:
         - ReagentId: GinTonic
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/gintonicglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGildlagerGlass
-  name: gildlager glass
-  description: 100 proof that teen girls will drink anything with gold in it.
+  suffix: gildlager
   components:
   - type: SolutionContainerManager
     solutions:
@@ -797,17 +763,15 @@
         reagents:
         - ReagentId: Gildlager
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/gildlagerglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGrapeJuice
-  name: grape juice
-  description: It's grrrrrape!
+  suffix: grape juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -815,24 +779,30 @@
         reagents:
         - ReagentId: JuiceGrape
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/grapejuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGrapeSodaGlass
-  name: grape soda glass
-  description: Looks like a delicious drink!
+  suffix: grape soda
   components:
-  - type: Drink
-  - type: Sprite
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: GrapeSoda
+          Quantity: 30
+  - type: Icon
     sprite: Objects/Consumable/Drinks/gsodaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGreenTeaGlass
-  name: green tea glass
-  description: Tasty green tea. It has antioxidants; it's good for you!
+  suffix: green tea
   components:
   - type: SolutionContainerManager
     solutions:
@@ -841,15 +811,14 @@
         reagents:
         - ReagentId: GreenTea
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_green.rsi #Placeholder
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGrenadineGlass
-  name: grenadine syrup glass
-  description: Sweet and tangy, a bar syrup used to add color or flavor to drinks.
+  suffix: grenadine
   components:
   - type: SolutionContainerManager
     solutions:
@@ -858,15 +827,14 @@
         reagents:
         - ReagentId: Grenadine
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/grenadineglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGrogGlass
-  name: grog glass
-  description: A fine and cepa drink for Space.
+  suffix: grog
   components:
   - type: SolutionContainerManager
     solutions:
@@ -875,24 +843,30 @@
         reagents:
         - ReagentId: Grog
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/grogglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkHippiesDelightGlass
-  name: hippies' delight glass
-  description: A drink enjoyed by people during the 1960's.
+  suffix: hippies' delight
   components:
-  - type: Drink
-  - type: Sprite
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: HippiesDelight
+          Quantity: 30
+  - type: Icon
     sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkHoochGlass
-  name: hooch
+  suffix: hooch
   description: You've really hit rock bottom now... your liver packed its bags and left last night.
   components:
   - type: SolutionContainerManager
@@ -902,15 +876,14 @@
         reagents:
         - ReagentId: Hooch
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_brown2.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIcedCoffeeGlass
-  name: iced coffee glass
-  description: A drink to perk you up and refresh you!
+  suffix: iced coffee
   components:
   - type: SolutionContainerManager
     solutions:
@@ -919,15 +892,14 @@
         reagents:
         - ReagentId: IcedCoffee
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/icedcoffeeglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIcedGreenTeaGlass
-  name: iced green tea glass
-  description: It looks like green tea with ice. One might even call it iced green tea.
+  suffix: iced green tea
   components:
   - type: SolutionContainerManager
     solutions:
@@ -936,15 +908,14 @@
         reagents:
         - ReagentId: IcedGreenTea
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_green.rsi #Placeholder
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIcedTeaGlass
-  name: iced tea
-  description: A refreshing southern beverage.
+  suffix: iced tea
   components:
   - type: SolutionContainerManager
     solutions:
@@ -953,25 +924,30 @@
         reagents:
         - ReagentId: IcedTea
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/icedteaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIcedBeerGlass
-  name: iced beer glass
-  description: A beer so frosty, the air around it freezes.
+  suffix: iced beer
   components:
-  - type: Drink
-  - type: Sprite
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: IcedBeer
+          Quantity: 30
+  - type: Icon
     sprite: Objects/Consumable/Drinks/iced_beerglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIceGlass
-  name: ice glass
-  description: Generally, you're supposed to put something else in there too...
+  suffix: ice
   components:
   - type: SolutionContainerManager
     solutions:
@@ -980,14 +956,14 @@
         reagents:
         - ReagentId: Ice
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/iceglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIceCreamGlass
-  name: ice cream glass
-  description: A glass full of good old ice cream. Might want a spoon.
+  suffix: ice cream
   components:
   - type: SolutionContainerManager
     solutions:
@@ -996,16 +972,14 @@
         reagents:
         - ReagentId: IceCream
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/icecreamglass.rsi
     state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIrishCarBomb
-  name: irish car bomb
-  description: An irish car bomb.
+  suffix: irish car bomb
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1014,14 +988,14 @@
         reagents:
         - ReagentId: IrishCarBomb
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIrishCoffeeGlass
-  name: irish coffee glass
-  description: Coffee and alcohol. More fun than a Mimosa to drink in the morning.
+  suffix: irish coffee
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1030,14 +1004,14 @@
         reagents:
         - ReagentId: IrishCoffee
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIrishCreamGlass
-  name: irish cream glass
-  description: It's cream, mixed with whiskey. What else would you expect from the Irish?
+  suffix: irish cream
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1046,14 +1020,14 @@
         reagents:
         - ReagentId: IrishCream
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/irishcreamglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCoffeeLiqueurGlass
-  name: coffee liqueur glass
-  description: DAMN, THIS THING LOOKS ROBUST
+  suffix: coffee liqueur
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1062,14 +1036,14 @@
         reagents:
         - ReagentId: CoffeeLiqueur
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/coffeeliqueurglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkKiraSpecial
-  name: kira special
-  description: Long live the guy who everyone had mistaken for a girl. Baka!
+  suffix: kira special
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1078,15 +1052,14 @@
         reagents:
         - ReagentId: KiraSpecial
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/kiraspecial.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLemonadeGlass
-  name: lemonade glass
-  description: Oh the nostalgia...
+  suffix: lemonade
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1095,17 +1068,15 @@
         reagents:
         - ReagentId: Lemonade
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/lemonadeglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLemonJuice
-  name: lemon juice
-  description: Sour...
+  suffix: lemon juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -1113,16 +1084,15 @@
         reagents:
         - ReagentId: JuiceLemon
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/lemonjuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLemonLime
-  name: lemon lime
-  description: A tangy substance made of 0.5% natural citrus!
+  suffix: lemon lime
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -1130,16 +1100,15 @@
         reagents:
         - ReagentId: LemonLime
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/lemonlime.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLimeJuice
-  name: lime juice
-  description: It's some sweet-sour lime juice.
+  suffix: lime juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -1147,14 +1116,11 @@
         reagents:
         - ReagentId: JuiceLime
           Quantity: 30
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/limejuice.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLongIslandIcedTeaGlass
-  name: long island iced tea glass
-  description: The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only.
+  suffix: long island iced tea
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1163,15 +1129,14 @@
         reagents:
         - ReagentId: LongIslandIcedTea
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/longislandicedteaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkManhattanGlass
-  name: manhattan glass
-  description: The Detective's undercover drink of choice. He never could stomach gin...
+  suffix: manhattan
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1180,15 +1145,14 @@
         reagents:
         - ReagentId: Manhattan
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/manhattanglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkManhattanProjectGlass
-  name: manhattan project glass
-  description: A scientist's drink of choice, for pondering ways to blow up the station.
+  suffix: manhattan project
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1197,15 +1161,14 @@
         reagents:
         - ReagentId: ManhattanProject
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkManlyDorfGlass
-  name: the manly dorf glass
-  description: A manly concotion made from Ale and Beer. Intended for true men only.
+  suffix: manly dorf
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1214,14 +1177,14 @@
         reagents:
         - ReagentId: ManlyDorf
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/manlydorfglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMargaritaGlass
-  name: margarita glass
-  description: On the rocks with salt on the rim. Arriba~!
+  suffix: margarita
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1230,15 +1193,14 @@
         reagents:
         - ReagentId: Margarita
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/margaritaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMartiniGlass
-  name: classic martini glass
-  description: Damn, the bartender even stirred it, not shook it.
+  suffix: classic martini
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1247,15 +1209,14 @@
         reagents:
         - ReagentId: Martini
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMeadGlass
-  name: mead glass
-  description: A Viking's beverage, though a cheap one.
+  suffix: mead
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1264,25 +1225,23 @@
         reagents:
         - ReagentId: Mead
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/meadglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMilkshake
-  name: milkshake
-  description: Glorious brainfreezing mixture.
+  suffix: milkshake
   components:
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/milkshake.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMojito
-  name: mojito
-  description: Fresh from Spesscuba.
+  suffix: mojito
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1291,15 +1250,14 @@
         reagents:
         - ReagentId: Mojito
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/mojito.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkNeurotoxinGlass
-  name: neurotoxin glass
-  description: A drink that is guaranteed to knock you silly.
+  suffix: neurotoxin
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1308,15 +1266,14 @@
         reagents:
         - ReagentId: Neurotoxin
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkNothing
-  name: nothing
-  description: Absolutely nothing.
+  suffix: nothing
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1325,15 +1282,14 @@
         reagents:
         - ReagentId: Nothing
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/nothing.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkNTCahors
-  name: neotheology cahors whine
-  description: It looks like wine, but more dark.
+  suffix: neotheology cahors whine
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1342,15 +1298,14 @@
         reagents:
         - ReagentId: NTCahors
           Quantity: 30
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/ntcahors.rsi
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/wineglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkNuclearColaGlass
-  name: nuclear cola glass
-  description: Don't cry, Don't raise your eye, It's only nuclear wasteland.
+  suffix: nuclear cola
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1359,17 +1314,15 @@
         reagents:
         - ReagentId: NuclearCola
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/nuclear_colaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkOrangeJuice
-  name: orange juice
-  description: Vitamins! Yay!
+  suffix: orange juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -1377,14 +1330,14 @@
         reagents:
         - ReagentId: JuiceOrange
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/orangejuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkPatronGlass
-  name: patron glass
-  description: Drinking patron in the bar, with all the subpar ladies.
+  suffix: patron
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1393,17 +1346,15 @@
         reagents:
         - ReagentId: Patron
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/patronglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkPoisonBerryJuice
-  name: poison berry juice
-  description: Looks like some deadly juice.
+  suffix: poison berry juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -1411,14 +1362,14 @@
         reagents:
         - ReagentId: JuiceBerryPoison
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/poisonberryjuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkPoisonWineGlass
-  name: poison wine glass
-  description: A black ichor with an oily purple sheer on top. Are you sure you should drink this?
+  suffix: poison wine
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1427,15 +1378,14 @@
         reagents:
         - ReagentId: PoisonWine
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/pwineglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkPoscaGlass
-  name: posca glass
-  description: Poor warriors' drink from a forgotten era.
+  suffix: posca
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1444,15 +1394,14 @@
         reagents:
         - ReagentId: Posca
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_light_yellow.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkRedMeadGlass
-  name: red mead glass
-  description: A true Viking's beverage, though its color is strange.
+  suffix: red mead
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1461,15 +1410,14 @@
         reagents:
         - ReagentId: RedMead
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/red_meadglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkRewriter
-  name: rewriter
-  description: The secret of the sanctuary of the Libarian...
+  suffix: rewriter
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1478,15 +1426,14 @@
         reagents:
         - ReagentId: Rewriter
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/rewriter.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkRootBeerGlass
-  name: root beer glass
-  description: Fizzy, foamy, and full of sweet, non-caffienated goodness.
+  suffix: root beer
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1495,16 +1442,14 @@
         reagents:
         - ReagentId: RootBeer
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/rootbeerglass.rsi
     state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkRootBeerFloatGlass
-  name: root beer float glass
-  description: Fizzy, foamy, and now with ice cream on top! Amazing!
+  suffix: root beer float
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1513,16 +1458,14 @@
         reagents:
         - ReagentId: RootBeerFloat
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/rootbeerfloatglass.rsi
     state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkRumGlass
-  name: rum glass
-  description: Now you want to Pray for a pirate suit, don't you?
+  suffix: rum
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1531,16 +1474,15 @@
         reagents:
         - ReagentId: Rum
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/rumglass.rsi
+    state: icon
 
 ##Commented out in favor of Nyano sake/soju
 #- type: entity
-#  parent: DrinkGlassBase
+#  parent: DrinkGlass
 #  id: DrinkSakeGlass
-#  name: sake glass
-#  description: Wine made from rice, it's sake!
+#  suffix: sake
 #  components:
 #  - type: SolutionContainerManager
 #    solutions:
@@ -1549,15 +1491,11 @@
 #        reagents:
 #        - ReagentId: Sake
 #          Quantity: 30
-#  - type: Drink
-#  - type: Sprite
-#    sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSbitenGlass
-  name: sbiten glass
-  description: A spicy mix of Vodka and Spice. Very hot.
+  suffix: sbiten
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1566,15 +1504,14 @@
         reagents:
         - ReagentId: Sbiten
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/sbitenglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkScrewdriverCocktailGlass
-  name: screwdriver glass
-  description: A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer.
+  suffix: screwdriver
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1583,15 +1520,14 @@
         reagents:
         - ReagentId: ScrewdriverCocktail
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/screwdriverglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCogChampBase
-  name: cogchamp glass
-  description: This mix of Cognac, Screwdriver and Welding Fuel will have you seeing His light surely!
+  suffix: cogchamp
   components:
     - type: SolutionContainerManager
       solutions:
@@ -1600,15 +1536,14 @@
           reagents:
             - ReagentId: CogChamp
               Quantity: 30
-    - type: Drink
-    - type: Sprite
+    - type: Icon
       sprite: Objects/Consumable/Drinks/cogchamp.rsi
+      state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSuiDreamGlass
-  name: sui dream glass
-  description: A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame.
+  suffix: sui dream
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1617,15 +1552,14 @@
         reagents:
         - ReagentId: SuiDream
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/sdreamglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkEmeraldGlass
-  name: melon liquor
-  description: A relatively sweet and fruity 46 proof liquor.
+  suffix: melon liquor
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1634,15 +1568,14 @@
         reagents:
         - ReagentId: MelonLiquor
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/emeraldglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMoonshineGlass
-  name: moonshine
-  description: You've really hit rock bottom now... your liver packed its bags and left last night.
+  suffix: moonshine
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1651,15 +1584,14 @@
         reagents:
         - ReagentId: Moonshine
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_clear.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGlassWhite
-  name: milk
-  description: White and nutritious goodness!
+  suffix: milk
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1668,14 +1600,14 @@
         reagents:
         - ReagentId: Milk
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_white.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSilencerGlass
-  name: silencer glass
-  description: A drink from Mime Heaven.
+  suffix: silencer
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1684,15 +1616,14 @@
         reagents:
         - ReagentId: Silencer
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/silencerglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSingulo
-  name: singulo
-  description: A blue-space beverage!
+  suffix: singulo
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1701,15 +1632,14 @@
         reagents:
         - ReagentId: Singulo
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/singulo.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSnowWhite
-  name: snow white
-  description: A cold refreshment.
+  suffix: snow white
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1718,15 +1648,14 @@
         reagents:
         - ReagentId: SnowWhite
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/snowwhite.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSoyLatte
-  name: soy latte
-  description: A nice and refreshing beverage while you are reading.
+  suffix: soy latte
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1735,15 +1664,14 @@
         reagents:
         - ReagentId: SoyLatte
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/soy_latte.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSpaceUpGlass
-  name: space-up glass
-  description: Space-up. It helps keep your cool.
+  suffix: space-up
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1752,15 +1680,14 @@
         reagents:
         - ReagentId: SpaceUp
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/space-up_glass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSpaceMountainWindGlass
-  name: space mountain wind glass
-  description: Space Mountain Wind. As you know, there are no mountains in space, only wind.
+  suffix: space mountain wind
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1769,15 +1696,14 @@
         reagents:
         - ReagentId: SpaceMountainWind
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/space_mountain_wind_glass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSyndicatebomb
-  name: syndicate bomb
-  description: Tastes like terrorism!
+  suffix: syndicate bomb
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1786,14 +1712,14 @@
         reagents:
         - ReagentId: SyndicateBomb
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/syndicatebomb.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkTeaGlass
-  name: tea glass
-  description: Tasty black tea. It has antioxidants; it's good for you!
+  suffix: tea
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1802,8 +1728,9 @@
         reagents:
         - ReagentId: Tea
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/teaglass.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -1822,10 +1749,9 @@
     sprite: Objects/Consumable/Drinks/teapot.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkTequilaGlass
-  name: tequila glass
-  description: Now all that's missing is the weird colored shades!
+  suffix: tequila
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1834,15 +1760,14 @@
         reagents:
         - ReagentId: Tequila
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/tequillaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkTequilaSunriseGlass
-  name: tequila sunrise glass
-  description: Oh great, now you feel nostalgic about sunrises back on Terra...
+  suffix: tequila sunrise
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1851,15 +1776,14 @@
         reagents:
         - ReagentId: TequilaSunrise
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkTheMartinez
-  name: The Martinez glass
-  description: The edgerunner legend.  Remembered by a drink, Forgotten by a drunk.
+  suffix: The Martinez
   components:
     - type: SolutionContainerManager
       solutions:
@@ -1868,14 +1792,14 @@
           reagents:
             - ReagentId: TheMartinez
               Quantity: 30
-    - type: Sprite
+    - type: Icon
       sprite: Objects/Consumable/Drinks/the_martinez.rsi
+      state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkThreeMileIslandGlass
-  name: three mile island glass
-  description: A glass of this is sure to prevent a meltdown.
+  suffix: three mile island
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1884,15 +1808,14 @@
         reagents:
         - ReagentId: ThreeMileIsland
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/threemileislandglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkTomatoJuice
-  name: tomato juice
-  description: Are you sure this is tomato juice?
+  suffix: tomato juice
   components:
   - type: Drink
   - type: SolutionContainerManager
@@ -1902,14 +1825,11 @@
         reagents:
         - ReagentId: JuiceTomato
           Quantity: 30
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/tomatojuice.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkToxinsSpecialGlass
-  name: toxins special glass
-  description: Woah, this thing is on FIRE
+  suffix: toxins special
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1918,15 +1838,14 @@
         reagents:
         - ReagentId: ToxinsSpecial
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkVermouthGlass
-  name: vermouth glass
-  description: You wonder why you're even drinking this straight.
+  suffix: vermouth
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1935,15 +1854,14 @@
         reagents:
         - ReagentId: Vermouth
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/vermouthglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkVodkaGlass
-  name: vodka glass
-  description: Number one drink and fueling choice for Russians worldwide.
+  suffix: vodka
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1952,15 +1870,14 @@
         reagents:
         - ReagentId: Vodka
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkVodkaMartiniGlass
-  name: vodka martini glass
-  description: A bastardisation of the classic martini. Still great.
+  suffix: vodka martini
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1969,15 +1886,14 @@
         reagents:
         - ReagentId: VodkaMartini
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkVodkaTonicGlass
-  name: vodka tonic glass
-  description: For when a gin and tonic isn't russian enough.
+  suffix: vodka tonic
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1986,9 +1902,9 @@
         reagents:
         - ReagentId: VodkaTonic
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -2008,12 +1924,10 @@
     sprite: Objects/Consumable/Drinks/water.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWatermelonJuice
-  name: watermelon juice
-  description: Delicious juice made from watermelon.
+  suffix: watermelon juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -2021,14 +1935,11 @@
         reagents:
         - ReagentId: JuiceWatermelon
           Quantity: 30
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/watermelon.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWhiskeyColaGlass
-  name: whiskey cola glass
-  description: An innocent-looking mixture of cola and Whiskey. Delicious.
+  suffix: whiskey cola
   components:
   - type: SolutionContainerManager
     solutions:
@@ -2037,14 +1948,14 @@
         reagents:
         - ReagentId: WhiskeyCola
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWhiskeyGlass
-  name: whiskey glass
-  description: The silky, smoky whiskey goodness inside makes the drink look very classy.
+  suffix: whiskey
   components:
   - type: SolutionContainerManager
     solutions:
@@ -2053,14 +1964,14 @@
         reagents:
         - ReagentId: Whiskey
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/whiskeyglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWhiskeySodaGlass
-  name: whiskey soda glass
-  description: Ultimate refreshment.
+  suffix: whiskey soda
   components:
   - type: SolutionContainerManager
     solutions:
@@ -2069,15 +1980,14 @@
         reagents:
         - ReagentId: WhiskeySoda
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/whiskeysodaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWhiteRussianGlass
-  name: white russian glass
-  description: A very nice looking drink. But that's just, like, your opinion, man.
+  suffix: white russian
   components:
   - type: SolutionContainerManager
     solutions:
@@ -2086,15 +1996,14 @@
         reagents:
         - ReagentId: WhiteRussian
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/whiterussianglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWineGlass
-  name: wine glass
-  description: A very classy looking drink.
+  suffix: wine
   components:
   - type: SolutionContainerManager
     solutions:
@@ -2103,8 +2012,9 @@
         reagents:
         - ReagentId: Wine
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/wineglass.rsi
+    state: icon
 
 # TODO: MOVE
 
@@ -2197,10 +2107,9 @@
           Quantity: 5
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBloodGlass
-  name: blood glass
-  description: Drink like a vampire!
+  suffix: blood
   components:
     - type: SolutionContainerManager
       solutions:
@@ -2209,5 +2118,6 @@
           reagents:
             - ReagentId: Blood
               Quantity: 30
-    - type: Sprite
+    - type: Icon
       sprite: Objects/Consumable/Drinks/bloodglass.rsi
+      state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index b0b2c2729f9..0119fab5316 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -10,6 +10,9 @@
   - type: Openable
     sound:
       collection: bottleOpenSounds
+    closeable: true
+    closeSound:
+      collection: bottleCloseSounds
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -131,6 +134,7 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/absinthebottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -170,6 +174,7 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/bottleofnothing.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
@@ -185,6 +190,8 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/champagnebottle.rsi
+  - type: Openable
+    closeable: false # Champagne corks are fat. Not worth the effort.
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -202,6 +209,7 @@
     currentLabel: cognac
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cognacbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
@@ -219,6 +227,7 @@
     currentLabel: cola
   - type: Sprite
     sprite: Objects/Consumable/Drinks/colabottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -256,6 +265,7 @@
     currentLabel: gin
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ginbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -271,6 +281,7 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/gildlagerbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
@@ -288,6 +299,7 @@
     currentLabel: coffee liqueur
   - type: Sprite
     sprite: Objects/Consumable/Drinks/coffeeliqueurbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -342,6 +354,7 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pwinebottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -359,6 +372,7 @@
     currentLabel: rum
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rumbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
@@ -377,6 +391,7 @@
     currentLabel: space mountain wind
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
@@ -395,6 +410,7 @@
     currentLabel: space-up
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space-up_bottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -412,6 +428,7 @@
     currentLabel: tequila
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tequillabottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -429,6 +446,7 @@
     currentLabel: vermouth
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vermouthbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -446,6 +464,7 @@
     currentLabel: vodka
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vodkabottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -463,6 +482,7 @@
     currentLabel: whiskey
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiskeybottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
@@ -480,6 +500,7 @@
     currentLabel: wine
   - type: Sprite
     sprite: Objects/Consumable/Drinks/winebottle.rsi
+  - type: Sealable
 
 # Small Bottles
 
@@ -500,6 +521,8 @@
           Quantity: 50
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beer.rsi
+  - type: Openable
+    closeable: false
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -518,6 +541,8 @@
     currentLabel: beer
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beer.rsi
+  - type: Openable
+    closeable: false
 
 
 - type: entity
@@ -535,9 +560,10 @@
         reagents:
         - ReagentId: Ale
           Quantity: 50
-
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alebottle.rsi
+  - type: Openable
+    closeable: false
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
@@ -556,6 +582,8 @@
     currentLabel: ale
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alebottle.rsi
+  - type: Openable
+    closeable: false
 
 - type: entity
   parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
@@ -587,6 +615,7 @@
     fillBaseName: icon-
     inHandsMaxFillLevels: 2
     inHandsFillBaseName: -fill-
+  - type: Sealable
 
 - type: entity
   parent: DrinkWaterBottleFull
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index 197e7ea9829..58fe2a34154 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -337,6 +337,7 @@
   - type: Openable
     sound:
       collection: pop
+    closeable: true
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 5c7516f2da4..41c324e8fab 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -52,9 +52,9 @@
           Quantity: 10
   - type: Produce
     seedId: wheat
-  - type: Tag # Delta V straw hat
+  - type: Tag
     tags:
-    - Wheat # End of Delta V straw hat
+    - Wheat
 
 - type: entity
   name: oat bushel
@@ -95,6 +95,36 @@
   - type: Produce
     seedId: sugarcane
 
+- type: entity
+  parent: FoodProduceBase
+  id: FoodLaughinPeaPod
+  name: laughin' pea pod
+  description: The clown's favorite plant.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - peas
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 7
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Sugar
+          Quantity: 2
+        - ReagentId: Laughter
+          Quantity: 2
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: LaughinSyrup
+        Quantity: 5
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
+  - type: Produce
+    seedId: laughinPea
+
 - type: entity
   name: tower-cap log
   description: It's better than bad, it's good!
@@ -177,22 +207,21 @@
   - type: MeleeWeapon
     damage:
       types:
-        Heat: 7.5
-        Caustic: 7.5
+        Heat: 8.5
+        Caustic: 8.5
   - type: SolutionContainerManager
     solutions:
       food:
         reagents:
         - ReagentId: SulfuricAcid
-          Quantity: 15
+          Quantity: 3
         - ReagentId: FluorosulfuricAcid
-          Quantity: 15
+          Quantity: 3
   - type: Produce
     seedId: deathNettle
   - type: MeleeChemicalInjector
-    transferAmount: 6
+    transferAmount: 2
     solution: food
-    pierceArmor: true # We do a little trolling
   - type: Extractable
     grindableSolutionName: food
 
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
index 2a0b5ba1184..aa889341b1b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
@@ -4,7 +4,7 @@
   parent: BaseItem
   id: RemoteSignaller
   name: remote signaller
-  description: A handheld device used for remotely sending signals to objects.
+  description: A handheld device used for remotely sending signals to objects within a small radius of about 15 meters.
   components:
   - type: Sprite
     sprite: Objects/Devices/signaller.rsi
@@ -19,3 +19,21 @@
   - type: Tag
     tags:
     - Payload
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 15
+
+- type: entity
+  parent: RemoteSignaller
+  id: RemoteSignallerAdvanced
+  name: advanced remote signaller
+  description: A handheld device used for remotely sending signals to objects within a small radius of about 50 meters.
+  components:
+  - type: Sprite
+    state: signaller2
+  - type: WirelessNetworkConnection
+    range: 50
+  - type: StaticPrice
+    price: 30
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
index 1c8a14dc76b..95dfcd65f2a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -203,7 +203,7 @@
   parent: EncryptionKey
   id: EncryptionKeySyndie
   name: blood-red encryption key
-  description: An encryption key used by... wait... Who is owner of this chip?
+  description: An encryption key used by... wait... Who is the owner of this chip?
   components:
   - type: EncryptionKey
     channels:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
index d1206215590..811210d429e 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
@@ -11,6 +11,11 @@
     noRot: true
     layers:
     - state: nuclearbomb_base
+      map: ["enum.NukeVisualLayers.Base"]
+    - state: nuclearbomb_deployed_unlit
+      map: ["enum.NukeVisualLayers.Unlit"]
+      shader: unshaded
+      visible: false
     - state: nukefestive
       map: ["christmas"]
       visible: false
@@ -24,6 +29,18 @@
       enum.HolidayVisuals.Holiday:
         christmas:
           festive: { visible: true }
+      enum.NukeVisuals.Deployed:
+        enum.NukeVisualLayers.Base:
+          False: { state: nuclearbomb_base }
+          True:  { state: nuclearbomb_deployed }
+        enum.NukeVisualLayers.Unlit:
+          True:  { visible: true }
+          False: { visible: false }
+      enum.NukeVisuals.State:
+        enum.NukeVisualLayers.Unlit:
+          Idle:        { state: nuclearbomb_deployed_unlit }
+          Armed:       { state: nuclearbomb_timing }
+          YoureFucked: { state: nuclearbomb_exploding }
   - type: Physics
     bodyType: Static
   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 75259bfaf76..5560a49d437 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -439,6 +439,9 @@
       path: /Audio/Effects/bite.ogg
     angle: 0
     animation: WeaponArcBite # Rrrr!
+  - type: Tag
+    tags:
+    - PlushieCarp # DeltaV - fish labeler craft
 
 - type: entity
   parent: BasePlushie
@@ -1317,9 +1320,11 @@
           True: { state: icon }
           False: { state: icon-off }
   - type: ItemToggle
+  - type: UseDelay
+    delay: 1
   - type: ItemToggleActiveSound
     activeSound:
       path: /Audio/Items/newton_cradle.ogg
       params:
-        volume: -7
-        maxDistance: 5
+        volume: -9
+        maxDistance: 3
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
index 24e8ca649c9..7e8e6a5b746 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
@@ -59,7 +59,7 @@
         reagents:
         - ReagentId: Gold
           Quantity: 10
-          
+
 - type: entity
   parent: IngotGold
   id: IngotGold1
@@ -113,3 +113,5 @@
   components:
   - type: Sprite
     state: silver
+  - type: Stack
+    count: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 1573c070525..e0577f0a929 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -489,7 +489,7 @@
   parent: MaterialBase
   id: MaterialWebSilk
   name: silk
-  description: A webby material
+  description: A webby material.
   suffix: Full
   components:
   - type: PhysicalComposition
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index dca5f2c5d3b..fa57f90c18f 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -106,7 +106,7 @@
         - ReagentId: Silicon
           Quantity: 5 #Half of the value of regular glass. TECHNICALLY, welding a single shard of glass gives you the full thing back with just 1 sheet, but that is stupid so I am making it half.
   - type: Construction
-    graph: Shiv
+    graph: ShivConstruct
     node: start
 
 - type: entity
@@ -138,7 +138,7 @@
         - ReagentId: Silicon
           Quantity: 5 #I don't care enough to divide all of the reinforced glass materials by 2 because reinforced glass shards are due for removal anyways.
   - type: Construction
-    graph: ReinforcedShiv
+    graph: ReinforcedShivConstruct
     node: start
 
 - type: entity
@@ -172,7 +172,7 @@
         - ReagentId: Plasma
           Quantity: 5
   - type: Construction
-    graph: PlasmaShiv
+    graph: PlasmaShivConstruct
     node: start
 
 - type: entity
@@ -207,5 +207,5 @@
         - ReagentId: Uranium
           Quantity: 5
   - type: Construction
-    graph: UraniumShiv
+    graph: UraniumShivConstruct
     node: start
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index 7a0e76552fc..44d84118a4b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -143,7 +143,7 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # no science book sprite so this is a placeholder
+    - state: book_science
   - type: Tag
     tags:
     - Book
@@ -161,7 +161,7 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_detective # maybe a proper sprite is needed
+    - state: book_security
   - type: Tag
     tags:
     - Book
@@ -220,7 +220,7 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # no medical book sprite so this is a placeholder
+    - state: book_medical
   - type: Tag
     tags:
     - Book
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index eefce3a851c..6ebf0951174 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -1,11 +1,26 @@
 - type: entity
-  id: Kudzu
-  name: kudzu
-  description: A rapidly growing, dangerous plant. WHY ARE YOU STOPPING TO LOOK AT IT?!
+  id: BaseKudzu
+  abstract: true
   placement:
     mode: SnapgridCenter
     snap:
       - Wall
+  components:
+    - type: Appearance
+    - type: Transform
+      anchored: true
+    - type: Physics
+    - type: Kudzu
+    - type: GrowingKudzu
+    - type: ActiveEdgeSpreader
+    - type: EdgeSpreader
+      id: Kudzu
+
+- type: entity
+  id: Kudzu
+  name: kudzu
+  parent: BaseKudzu
+  description: A rapidly growing, dangerous plant. WHY ARE YOU STOPPING TO LOOK AT IT?!
   components:
     - type: MeleeSound
       soundGroups:
@@ -16,12 +31,8 @@
       sprite: Objects/Misc/kudzu.rsi
       state: kudzu_11
       drawdepth: Overdoors
-    - type: Appearance
     - type: KudzuVisuals
     - type: Clickable
-    - type: Transform
-      anchored: true
-    - type: Physics
     - type: Fixtures
       fixtures:
         fix1:
@@ -69,19 +80,14 @@
             types:
               Heat: 10
     - type: AtmosExposed
-    - type: Kudzu
       growthTickChance: 0.3
       spreadChance: 0.4
-    - type: GrowingKudzu
     - type: SlowContacts
       walkSpeedModifier: 0.2
       sprintSpeedModifier: 0.2
       ignoreWhitelist:
         components:
         - IgnoreKudzu
-    - type: ActiveEdgeSpreader
-    - type: EdgeSpreader
-      id: Kudzu
     - type: Food
       requiredStomachs: 2 # ruminants have 4 stomachs but i dont care to give them literally 4 stomachs. 2 is good
       delay: 0.5
@@ -159,6 +165,7 @@
 - type: entity
   id: FleshKudzu
   name: tendons
+  parent: BaseKudzu
   description: A rapidly growing cluster of meaty tendons. WHY ARE YOU STOPPING TO LOOK AT IT?!
   placement:
     mode: SnapgridCenter
@@ -174,12 +181,8 @@
       sprite: Objects/Misc/fleshkudzu.rsi
       state: kudzu_11
       drawdepth: Overdoors
-    - type: Appearance
     - type: KudzuVisuals
     - type: Clickable
-    - type: Transform
-      anchored: true
-    - type: Physics
     - type: Fixtures
       fixtures:
         fix1:
@@ -233,12 +236,8 @@
       damage:
        types:
          Heat: 3
-    - type: GrowingKudzu
       growthTickChance: 0.3
     - type: AtmosExposed
-    - type: ActiveEdgeSpreader
-    - type: EdgeSpreader
-      id: Kudzu
     - type: SlowContacts
       walkSpeedModifier: 0.3
       sprintSpeedModifier: 0.3
@@ -261,3 +260,50 @@
         types:
           Asphyxiation: -0.25
 
+- type: entity
+  name: dark haze
+  id: ShadowKudzu
+  parent: [ BaseKudzu, BaseShadow ]
+  components:
+    - type: Physics
+      canCollide: false
+    - type: Occluder
+    - type: Sprite
+      drawdepth: Effects
+      sprite: Effects/spookysmoke.rsi
+      layers:
+      - state: spookysmoke
+        color: "#793a80dd"
+        map: [base]
+    - type: Kudzu
+      growthTickChance: 0.2
+      spreadChance: 0.99
+    - type: RandomSpawner
+      deleteSpawnerAfterSpawn: false
+      rareChance: 0.05
+      offset: 0.2
+      chance: 0.45
+      prototypes:
+      - ShadowBasaltRandom
+      rarePrototypes:
+      - ShadowPortal
+      - ShadowKudzuLootSpawner
+    - type: Tag
+      tags:
+        - HideContextMenu
+        - SpookyFog
+    - type: OptionsVisualizer
+      visuals:
+        base:
+        - options: Default
+          data: { state: spookysmoke }
+        - options: ReducedMotion
+          data: { state: spookysmoke_static }
+
+- type: entity
+  name: Haze
+  id: ShadowKudzuWeak
+  parent: ShadowKudzu
+  components:
+    - type: Kudzu
+      spreadChance: 0 #appears during pulsation. It shouldnt spreading.
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index d4d214f0e2d..282037b384b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -61,6 +61,7 @@
     solution: food
     delay: 7
     forceFeedDelay: 7
+  - type: BadFood
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 361efb52663..445e2c7b5b1 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -745,6 +745,38 @@
   - type: Stack
     stackType: FloorTileStackShuttleRed
 
+- type: entity
+  name: grey shuttle floor
+  parent: FloorTileItemBase
+  id: FloorTileItemShuttleGrey
+  components:
+  - type: Sprite
+    state: shuttlegrey
+  - type: Item
+    heldPrefix: shuttlegrey
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorShuttleGrey
+  - type: Stack
+    stackType: FloorTileStackShuttleGrey
+
+- type: entity
+  name: black shuttle floor
+  parent: FloorTileItemBase
+  id: FloorTileItemShuttleBlack
+  components:
+  - type: Sprite
+    state: shuttleblack
+  - type: Item
+    heldPrefix: shuttleblack
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorShuttleBlack
+  - type: Stack
+    stackType: FloorTileStackShuttleBlack
+
 # Materials
 - type: entity
   name: gold floor
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 7427b7f87a3..b794e42ff7d 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -439,7 +439,7 @@
               acts: [ "Destruction" ]
         - trigger:
             !type:DamageTrigger
-            damage: 150
+            damage: 100
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 2bbb720259d..affdc79defa 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -82,6 +82,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/garlic.rsi
 
+- type: entity
+  parent: SeedBase
+  id: LaughinPeaSeeds
+  name: packet of laughin' pea pods
+  description: "These seeds give off a very soft purple glow.. they should grow into Laughin' Peas."
+  components:
+    - type: Seed
+      seedId: laughinPea
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of lemon seeds
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 06cf99cc316..ce4eef7453a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -172,6 +172,16 @@
   - type: GuideHelp
     guides:
     - Janitorial
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 70
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
 
 - type: entity
   name: mop bucket
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index 637d0b56caf..0e132541e1e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -230,7 +230,7 @@
   parent: BaseMech
   id: MechVim
   name: Vim
-  description: A minature exosuit from Nanotrasen, developed to let the irreplacable station pets live a little longer.
+  description: A miniature exosuit from Nanotrasen, developed to let the irreplaceable station pets live a little longer.
   components:
   - type: Sprite
     drawdepth: Mobs
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index ebb32ae5b40..18d6f19bb11 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -69,6 +69,7 @@
   description: Used to treat even the nastiest burns. Also effective against caustic burns.
   parent: BaseHealingItem
   id: RegenerativeMesh
+  suffix: Full
   components:
   - type: Tag
     tags:
@@ -99,6 +100,7 @@
 - type: entity
   id: OintmentAdvanced1
   parent: RegenerativeMesh
+  suffix: Single
   components:
   - type: Stack
     stackType: RegenerativeMesh
@@ -155,6 +157,7 @@
   description: A suture soaked in medicine, treats blunt-force trauma effectively and closes wounds.
   parent: BaseHealingItem
   id: MedicatedSuture
+  suffix: Full
   components:
   - type: Tag
     tags:
@@ -183,6 +186,7 @@
 - type: entity
   id: BrutepackAdvanced1
   parent: MedicatedSuture
+  suffix: Single
   components:
   - type: Stack
     stackType: MedicatedSuture
@@ -224,6 +228,31 @@
   components:
   - type: Stack
     lingering: true
+- type: entity
+  parent: BaseHealingItem
+  id: Tourniquet
+  name: tourniquet
+  description: Stops bleeding! Hopefully.
+  components:
+    - type: Tag
+      tags:
+        - SecBeltEquip
+    - type: Sprite
+      state: tourniquet
+    - type: Healing
+      damageContainers:
+        - Biological
+      damage:
+        groups:
+          Brute: 5 # Tourniquets HURT!
+        types:
+          Asphyxiation: 5 # Essentially Stopping all blood reaching a part of your body
+      bloodlossModifier: -10 # Tourniquets stop bleeding
+      delay: 0.5
+      healingBeginSound:
+        path: "/Audio/Items/Medical/brutepack_begin.ogg"
+      healingEndSound:
+        path: "/Audio/Items/Medical/brutepack_end.ogg"
 
 - type: entity
   name: roll of gauze
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index 1ce3cc26982..c4928dca53a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -141,7 +141,7 @@
           reagents:
             - ReagentId: Ash
               Quantity: 5
-            - ReagentId: SpaceLube
+            - ReagentId: Necrosol
               Quantity: 5
             - ReagentId: Ectoplasm  # DeltaV - for normality crystals
               Quantity: 30          # DeltaV
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
index 3a31edf7f14..9277497e4f4 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
@@ -10,15 +10,11 @@
   - type: Sprite
     sprite: Objects/Specific/Security/barrier.rsi
     layers:
-    - state: "idle"
-      map: ["deployableBarrierBase"]
+    - state: idle
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
   - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.DeployableBarrierVisuals.State:
-        deployableBarrierBase:
-          enum.DeployableBarrierState.Idle: {state: "idle"}
-          enum.DeployableBarrierState.Deployed: {state: "deployed"}
+  - type: LockVisuals
   - type: InteractionOutline
   - type: Physics
     bodyType: Dynamic
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/evidence-marker.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/evidence-marker.yml
new file mode 100644
index 00000000000..0773813461c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/evidence-marker.yml
@@ -0,0 +1,100 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: EvidenceMarker
+  name: evidence marker
+  description: A numbered yellow marker, useful for labeling evidence on a crime scene.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Detective/evidence_marker.rsi
+  - type: Item
+    sprite: Objects/Specific/Detective/evidence_marker.rsi
+    size: Tiny
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerOne
+  components:
+  - type: Sprite
+    state: one
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerTwo
+  components:
+  - type: Sprite
+    state: two
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerThree
+  components:
+  - type: Sprite
+    state: three
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerFour
+  components:
+  - type: Sprite
+    state: four
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerFive
+  components:
+  - type: Sprite
+    state: five
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerSix
+  components:
+  - type: Sprite
+    state: six
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerSeven
+  components:
+  - type: Sprite
+    state: seven
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerEight
+  components:
+  - type: Sprite
+    state: eight
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerNine
+  components:
+  - type: Sprite
+    state: nine
+
+- type: entity
+  name: evidence marker box
+  parent: BoxCardboard
+  id: BoxEvidenceMarkers
+  description: A pack of numbered yellow markers, useful for labeling evidence on a crime scene.
+  components:
+    - type: Item
+      shape:
+      - 0,0,1,1
+    - type: StorageFill
+      contents:
+        - id: EvidenceMarkerOne
+        - id: EvidenceMarkerTwo
+        - id: EvidenceMarkerThree
+        - id: EvidenceMarkerFour
+        - id: EvidenceMarkerFive
+        - id: EvidenceMarkerSix
+        - id: EvidenceMarkerSeven
+        - id: EvidenceMarkerEight
+        - id: EvidenceMarkerNine
+    - type: Sprite
+      layers:
+        - state: box_security
+        - state: evidence_markers
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
index 659145562f5..531a5304415 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
@@ -22,7 +22,7 @@
         visible: false
         map: ["enum.WeldableLayers.BaseWelded"]
       - state: locked
-        map: ["enum.StorageVisualLayers.Lock"]
+        map: ["enum.LockVisualLayers.Lock"]
         shader: unshaded
     - type: InteractionOutline
     - type: Physics
@@ -73,6 +73,7 @@
     - type: EntityStorageVisuals
       stateDoorOpen: artifact_container_open
       stateDoorClosed: artifact_container_door
+    - type: LockVisuals
     - type: ItemSlots
     - type: ContainerContainer
       containers:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
index 2adce1e66b3..b51517786f0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -204,6 +204,8 @@
     handle: false
     sound:
       path: /Audio/Effects/bite.ogg
+  - type: Tag
+    tags: [] # DeltaV - remove PlushieCarp tag to prevent wasting
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index e750b211a3a..2f281e141a1 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -39,7 +39,7 @@
         Blunt: 10
   - type: PhysicalComposition
     materialComposition:
-      Steel: 400
+      Steel: 185
   - type: StaticPrice
     price: 20
 
diff --git a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
index 1d9bb47e0e6..7e883953363 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
@@ -25,3 +25,6 @@
           - Item
         tags:
           - Structure
+    - type: Tag
+      tags:
+      - HandLabeler # DeltaV - fish labeler
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
index 4a8e64d9a1d..8d7b94a50a0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
@@ -36,6 +36,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletCaselessRiflePractice
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#dbdbdb"
 
 - type: entity
   id: CartridgeCaselessRifleRubber
@@ -44,3 +51,10 @@
   components:
   - type: CartridgeAmmo
     proto: BulletCaselessRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
index 729b1e6fc07..cda812ed033 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
@@ -33,6 +33,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletLightRiflePractice
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#dbdbdb"
 
 - type: entity
   id: CartridgeLightRifleRubber
@@ -41,6 +48,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
 
 - type: entity
   id: CartridgeLightRifleIncendiary
@@ -49,6 +63,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifleIncendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
 
 - type: entity
   id: CartridgeLightRifleUranium
@@ -57,4 +78,10 @@
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifleUranium
-
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
index 950b9c7563c..c5c5ad1f8d6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -33,6 +33,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumPractice
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#dbdbdb"
 
 - type: entity
   id: CartridgeMagnumRubber
@@ -41,6 +48,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
 
 - type: entity
   id: CartridgeMagnumIncendiary
@@ -49,6 +63,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumIncendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
 
 - type: entity
   id: CartridgeMagnumAP
@@ -57,6 +78,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumAP
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#0a0a0a"
 
 - type: entity
   id: CartridgeMagnumUranium
@@ -65,3 +93,11 @@
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumUranium
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index 50ca07cebcf..69aa8664aa3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -13,8 +13,8 @@
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     layers:
-    - state: base
-      map: ["enum.AmmoVisualLayers.Base"]
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
   - type: Appearance
   - type: SpentAmmoVisuals
 
@@ -33,6 +33,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletPistolPractice
+  -  type: Sprite
+     layers:
+       - state: base
+         map: [ "enum.AmmoVisualLayers.Base" ]
+       - state: tip
+         map: [ "enum.AmmoVisualLayers.Tip" ]
+         color: "#dbdbdb"
 
 - type: entity
   id: CartridgePistolRubber
@@ -41,6 +48,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletPistolRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
 
 - type: entity
   id: CartridgePistolIncendiary
@@ -49,6 +63,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletPistolIncendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
 
 - type: entity
   id: CartridgePistolUranium
@@ -57,3 +78,10 @@
   components:
   - type: CartridgeAmmo
     proto: BulletPistolUranium
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
index 98443d890d4..c47688ab018 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@@ -33,6 +33,14 @@
   components:
   - type: CartridgeAmmo
     proto: BulletRiflePractice
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#dbdbdb"
+
 
 - type: entity
   id: CartridgeRifleRubber
@@ -41,6 +49,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
 
 - type: entity
   id: CartridgeRifleIncendiary
@@ -49,6 +64,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletRifleIncendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
 
 - type: entity
   id: CartridgeRifleUranium
@@ -56,4 +78,11 @@
   parent: BaseCartridgeRifle
   components:
   - type: CartridgeAmmo
-    proto: BulletRifleUranium
\ No newline at end of file
+    proto: BulletRifleUranium
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index 36b1b2a99f1..e62fb9115e3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: PelletShotgunSlug
   name: pellet (.50 slug)
   noSpawn: true
@@ -26,7 +26,7 @@
       types:
         Blunt: 10
   - type: StaminaDamageOnCollide
-    damage: 55 # 2 hits to stun
+    damage: 40 # 3 hits to stun
 
 - type: entity
   id: PelletShotgun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 389b3f517bb..00d12606841 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -427,6 +427,7 @@
       sprite: Objects/Weapons/Guns/Battery/disabler.rsi
       quickEquip: false
       slots:
+        - suitStorage
         - Belt
     - type: Gun
       fireRate: 2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 90cb751e40a..0b1a7ecb77a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -67,7 +67,7 @@
     sprite: Objects/Weapons/Grenades/flashbang.rsi
   - type: FlashOnTrigger
     range: 7
-  - type: EmitSoundOnTrigger
+  - type: SoundOnTrigger
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
   - type: DeleteOnTrigger
diff --git a/Resources/Prototypes/Entities/Objects/base_shadow.yml b/Resources/Prototypes/Entities/Objects/base_shadow.yml
new file mode 100644
index 00000000000..2375855bf90
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/base_shadow.yml
@@ -0,0 +1,26 @@
+- type: entity
+  id: BaseShadow
+  abstract: true
+  components:
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 10
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              path: /Audio/Items/hiss.ogg
+              params:
+                variation: 0.08
+  - type: Flashable
+    collisionGroup:
+    - None
+  - type: DamagedByFlashing
+    flashDamage:
+      types:
+        Heat: 10
+  - type: Damageable
+    damageContainer: ShadowHaze
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
index 2fc5817287f..bb9d5cccdd6 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -2,7 +2,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyAtmospherics
-  name: airlock assembly
   suffix: Atmospherics
   components:
   - type: Sprite
@@ -12,7 +11,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyAtmosphericsGlass
-  name: airlock assembly
   suffix: Atmospherics, Glass
   components:
   - type: Sprite
@@ -23,7 +21,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCargo
-  name: airlock assembly
   suffix: Cargo
   components:
   - type: Sprite
@@ -33,7 +30,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCargoGlass
-  name: airlock assembly
   suffix: Cargo, Glass
   components:
   - type: Sprite
@@ -44,7 +40,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCommand
-  name: airlock assembly
   suffix: Command
   components:
   - type: Sprite
@@ -54,7 +49,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCommandGlass
-  name: airlock assembly
   suffix: Command, Glass
   components:
   - type: Sprite
@@ -65,7 +59,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyEngineering
-  name: airlock assembly
   suffix: Engineering
   components:
   - type: Sprite
@@ -75,7 +68,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyEngineeringGlass
-  name: airlock assembly
   suffix: Engineering, Glass
   components:
   - type: Sprite
@@ -86,7 +78,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyExternal
-  name: airlock assembly
   suffix: External
   components:
   - type: Sprite
@@ -96,7 +87,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyExternalGlass
-  name: airlock assembly
   suffix: External, Glass
   components:
   - type: Sprite
@@ -107,7 +97,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyGlass
-  name: airlock assembly
   suffix: Glass
   components:
   - type: Sprite
@@ -118,7 +107,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyFreezer
-  name: airlock assembly
   suffix: Freezer
   components:
   - type: Sprite
@@ -129,7 +117,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMaintenance
-  name: airlock assembly
   suffix: Maintenance
   components:
   - type: Sprite
@@ -139,7 +126,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMaintenanceGlass
-  name: airlock assembly
   suffix: Maintenance, Glass
   components:
   - type: Sprite
@@ -150,7 +136,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMedical
-  name: airlock assembly
   suffix: Medical
   components:
   - type: Sprite
@@ -160,7 +145,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMedicalGlass
-  name: airlock assembly
   suffix: Medical, Glass
   components:
   - type: Sprite
@@ -171,7 +155,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyScience
-  name: airlock assembly
   suffix: Science
   components:
   - type: Sprite
@@ -181,7 +164,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyScienceGlass
-  name: airlock assembly
   suffix: Science, Glass
   components:
   - type: Sprite
@@ -192,7 +174,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySecurity
-  name: airlock assembly
   suffix: Security
   components:
   - type: Sprite
@@ -202,7 +183,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySecurityGlass
-  name: airlock assembly
   suffix: Security, Glass
   components:
   - type: Sprite
@@ -213,7 +193,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyShuttle
-  name: airlock assembly
   suffix: Shuttle
   components:
   - type: Sprite
@@ -223,7 +202,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyShuttleGlass
-  name: airlock assembly
   suffix: Shuttle, Glass
   components:
   - type: Sprite
@@ -234,7 +212,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyVirology
-  name: airlock assembly
   suffix: Virology
   components:
   - type: Sprite
@@ -244,7 +221,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyVirologyGlass
-  name: airlock assembly
   suffix: Virology, Glass
   components:
   - type: Sprite
@@ -255,7 +231,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCentralCommand
-  name: airlock assembly
   suffix: CentralCommand
   components:
   - type: Sprite
@@ -265,7 +240,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCentralCommandGlass
-  name: airlock assembly
   suffix: CentralCommand, Glass
   components:
   - type: Sprite
@@ -276,7 +250,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMining
-  name: airlock assembly
   suffix: Mining
   components:
   - type: Sprite
@@ -286,7 +259,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMiningGlass
-  name: airlock assembly
   suffix: Mining, Glass
   components:
   - type: Sprite
@@ -297,7 +269,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySyndicate
-  name: airlock assembly
   suffix: Syndicate
   components:
   - type: Sprite
@@ -307,7 +278,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySyndicateGlass
-  name: airlock assembly
   suffix: Syndicate, Glass
   components:
   - type: Sprite
@@ -318,7 +288,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyShuttleSyndicate
-  name: airlock assembly
   suffix: ShuttleSyndicate
   components:
   - type: Sprite
@@ -328,7 +297,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyShuttleSyndicateGlass
-  name: airlock assembly
   suffix: ShuttleSyndicate, Glass
   components:
   - type: Sprite
@@ -339,7 +307,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyHighSec
-  name: airlock assembly
   suffix: HighSec
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index 9930e6631de..a185d453533 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -95,6 +95,8 @@
   - type: DeviceLinkSource
     ports:
       - DoorStatus
+    lastSignals:
+      DoorStatus: false
   - type: SoundOnOverload
   - type: SpawnOnOverload
   - type: UserInterface
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
index f4a5debeac9..87fd8ef0106 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -90,6 +90,8 @@
   - type: DeviceLinkSource
     ports:
     - DoorStatus
+    lastSignals:
+      DoorStatus: false
   - type: InteractionPopup
     interactSuccessString: comp-window-knock
     messagePerceivedByOthers: comp-window-knock
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index 4281177b4b9..e5eebab861f 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -59,6 +59,8 @@
   - type: DeviceLinkSource
     ports:
     - DoorStatus
+    lastSignals:
+      DoorStatus: false
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Glass
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index ede31b5e56c..2e381bf9bdd 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -370,6 +370,17 @@
       types:
         Heat: 5
 
+- type: entity
+  id: AlwaysPoweredlightCyan
+  suffix: Always Powered, Cyan
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#47f8ff"
+
 - type: entity
   id: PoweredlightBlue
   suffix: Blue
@@ -381,6 +392,17 @@
       types:
         Heat: 5
 
+- type: entity
+  id: AlwaysPoweredlightBlue
+  suffix: Always Powered, Blue
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#39a1ff"
+
 - type: entity
   id: PoweredlightPink
   suffix: Pink
@@ -392,6 +414,17 @@
       types:
         Heat: 5
 
+- type: entity
+  id: AlwaysPoweredlightPink
+  suffix: Always Powered, Pink
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#ff66cc"
+
 - type: entity
   id: PoweredlightOrange
   suffix: Orange
@@ -403,6 +436,17 @@
       types:
         Heat: 5
 
+- type: entity
+  id: AlwaysPoweredlightOrange
+  suffix: Always Powered, Orange
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#ff8227"
+
 - type: entity
   id: PoweredlightRed
   suffix: Red
@@ -414,6 +458,17 @@
       types:
         Heat: 5
 
+- type: entity
+  id: AlwaysPoweredlightRed
+  suffix: Always Powered, Red
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#fb4747"
+
 - type: entity
   id: PoweredlightGreen
   suffix: Green
@@ -425,3 +480,13 @@
       types:
         Heat: 5
 
+- type: entity
+  id: AlwaysPoweredlightGreen
+  suffix: Always Powered, Green
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#52ff39"
diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
index 2697e00a700..cc9f8035fe7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
@@ -140,7 +140,7 @@
     - state: locked
       shader: unshaded
       visible: false
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
   - type: Transform
     noRot: false
   - type: Fixtures
@@ -203,6 +203,7 @@
         enum.PowerDeviceVisualLayers.Powered:
           True: { visible: true }
           False: { visible: false }
+  - type: LockVisuals
   - type: DeviceNetwork
     deviceNetId: Wireless
     receiveFrequencyId: BasicDevice
diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml
index 88169ecd675..3019b8adf83 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml
@@ -10,7 +10,7 @@
   - type: DeviceNetwork
     deviceNetId: Wireless
   - type: WirelessNetworkConnection
-    range: 300
+    range: 100
   - type: DeviceNetworkRequiresPower
   - type: DeviceLinkSource
     ports:
@@ -39,19 +39,15 @@
         shape:
           !type:PhysShapeAabb
           bounds: "-0.35,-0.35,0.35,0.35"
-        density: 190
+        density: 100
         mask:
-        - MachineMask
-        layer:
-        - Impassable
-        - MidImpassable
-        - LowImpassable
-        hard: False
+        - ItemMask 
+        hard: True
   - type: Transform
     anchored: true
     noRot: false
   - type: ApcPowerReceiver
-    powerLoad: 15000
+    powerLoad: 2500
     needsPower: true
   - type: ItemPlacer
     whitelist:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index f251f158b80..0486f38d451 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -98,6 +98,7 @@
       - CableHVStack
       - HandheldGPSBasic
       - TRayScanner
+      - AirTank
       - GasAnalyzer
       - UtilityBelt
       - Fulton
@@ -288,6 +289,7 @@
       - ChemicalPayload
       - FlashPayload
       - Signaller
+      - SignallerAdvanced
       - SignalTrigger
       - VoiceTrigger
       - Igniter
@@ -383,6 +385,12 @@
     - UniformPrinterMachineCircuitboard
     - FloorGreenCircuit
     - FloorBlueCircuit
+    - MicrowaveMachineCircuitboard
+    - ReagentGrinderMachineCircuitboard
+    - ElectricGrillMachineCircuitboard
+    - BoozeDispenserMachineCircuitboard
+    - SodaDispenserMachineCircuitboard
+    - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard
@@ -408,9 +416,6 @@
       - PowerComputerCircuitboard
       - AutolatheHyperConvectionMachineCircuitboard
       - ProtolatheHyperConvectionMachineCircuitboard
-      - ReagentGrinderMachineCircuitboard
-      - MicrowaveMachineCircuitboard
-      - ElectricGrillMachineCircuitboard
       - FatExtractorMachineCircuitboard
       - FlatpackerMachineCircuitboard
       - SheetifierMachineCircuitboard
@@ -452,8 +457,6 @@
       - ArtifactAnalyzerMachineCircuitboard
       - TraversalDistorterMachineCircuitboard
       - ArtifactCrusherMachineCircuitboard
-      - BoozeDispenserMachineCircuitboard
-      - SodaDispenserMachineCircuitboard
       - TelecomServerCircuitboard
       - MassMediaCircuitboard
     # Begin Nyano additions
@@ -467,7 +470,6 @@
       - SalvageMagnetMachineCircuitboard
       - StationMapElectronics
       - MetempsychoticMachineCircuitboard
-      - DeepFryerMachineCircuitboard
     # End Nyano additions
       - SalvageExpeditionsComputerCircuitboard # DeltaV
   - type: MaterialStorage
@@ -988,10 +990,12 @@
       - ClothingUniformJumpsuitPrisoner
       - ClothingUniformJumpskirtPrisoner
       - ClothingHeadHatQMsoft
+      - ClothingHeadHatBeretQM
       - ClothingUniformJumpsuitQM
       - ClothingUniformJumpskirtQM
       - ClothingUniformJumpsuitQMTurtleneck
       - ClothingUniformJumpskirtQMTurtleneck
+      - ClothingUniformJumpsuitQMFormal
       - ClothingHeadHatBeretRND
       - ClothingUniformJumpsuitResearchDirector
       - ClothingUniformJumpskirtResearchDirector
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index d1c6079a5bf..ee40012bbeb 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -888,7 +888,7 @@
 - type: entity
   parent: VendingMachineSeedsUnlocked
   id: VendingMachineSeeds
-  suffix: Hyroponics
+  suffix: Hydroponics
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index e5604bea080..52698f62cc0 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -31,10 +31,10 @@
       shader: unshaded
       visible: false
       map: ["enum.EmitterVisualLayers.Lights"]
-    - state: lock
+    - state: locked
       shader: unshaded
       visible: false
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
   - type: Emitter
   - type: Gun
     showExamineText: false
@@ -83,6 +83,7 @@
   - type: Appearance
   - type: Lock
     locked: false
+  - type: LockVisuals
   - type: AccessReader
     access: [[ "Engineering" ]]
   - type: Machine
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index fdf9a5cf8fd..9d1c8bdc3c0 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -794,3 +794,57 @@
     solution: anomaly
   - type: InjectableSolution
     solution: beaker
+
+- type: entity
+  id: AnomalyShadow
+  parent: BaseAnomaly
+  suffix: Shadow
+  components:  
+  - type: Sprite
+    sprite: Structures/Specific/Anomalies/shadow_anom.rsi
+    layers:
+    - state: anom
+      map: ["enum.AnomalyVisualLayers.Base"]
+    - state: pulse
+      map: ["enum.AnomalyVisualLayers.Animated"]
+      visible: false
+  - type: PointLight
+    radius: 1.5
+    energy: 12.5
+    color: "#793a80"
+  - type: AmbientSound
+    range: 5
+    volume: -5
+    sound:
+      path: /Audio/Ambience/anomaly_scary.ogg
+  - type: Anomaly
+    corePrototype: AnomalyCoreShadow
+    coreInertPrototype: AnomalyCoreShadowInert
+    anomalyContactDamage:
+      types:
+        Cold: 10
+    animationTime: 4
+    offset: "-0.1,0.1"
+  - type: EntitySpawnAnomaly
+    entries:
+    - settings:
+        spawnOnPulse: true
+        spawnOnSuperCritical: true
+        minAmount: 10
+        maxAmount: 20
+        maxRange: 4
+      spawns: 
+      - ShadowKudzuWeak
+    - settings:
+        spawnOnSuperCritical: true
+        minAmount: 30
+        maxAmount: 40
+        maxRange: 50
+      spawns: 
+      - ShadowKudzu
+  - type: Portal
+    arrivalSound: /Audio/Items/hiss.ogg
+    departureSound: /Audio/Items/hiss.ogg
+  - type: Tag
+    tags:
+      - SpookyFog
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
index 6e6ee057de7..97f4488fd47 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
@@ -155,6 +155,19 @@
     color: "#6270bb"
     castShadows: false
 
+- type: entity
+  parent: [ BaseAnomalyCore, BaseShadow ]
+  id: AnomalyCoreShadow
+  suffix: Shadow
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/Anomalies/Cores/shadow_core.rsi
+  - type: PointLight
+    radius: 1.5
+    energy: 2.0
+    color: "#793a80"
+    castShadows: false
+
 # Inert cores
 
 - type: entity
@@ -288,3 +301,16 @@
     energy: 2.0
     color: "#6270bb"
     castShadows: false
+
+- type: entity
+  parent: [ BaseAnomalyInertCore, BaseShadow ]
+  id: AnomalyCoreShadowInert
+  suffix: Shadow, Inert
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/Anomalies/Cores/shadow_core.rsi
+  - type: PointLight
+    radius: 1.5
+    energy: 2.0
+    color: "#793a80"
+    castShadows: false
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index 760eb31755b..897b7be6ffb 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -24,10 +24,10 @@
           tankInserted:
             False: { state: can-open, visible: false }
             True: { state: can-open, visible: true }
-        enum.GasCanisterVisuals.Locked:
+        enum.LockVisuals.Locked:
           locked:
-            False: { state: can-unlocked, shader: "unshaded" }
-            True: { state: can-locked, shader: "unshaded" }
+            False: { state: unlocked, shader: "unshaded" }
+            True: { state: locked, shader: "unshaded" }
         enum.GasCanisterVisuals.PressureState:
           pressureLight:
             0: { state: can-o0, shader: "unshaded" }
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
index 4448d551e33..7ab24f6b5ca 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -5,6 +5,7 @@
   components:
   - type: AccessReader
   - type: Lock
+  - type: LockVisuals
   - type: Sprite
     sprite: Structures/Storage/closet.rsi
     noRot: true
@@ -14,7 +15,7 @@
     - state: generic_door
       map: ["enum.StorageVisualLayers.Door"]
     - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
       shader: unshaded
     - state: welded
       visible: false
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index d1a60566d4e..46ec7cbf6aa 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -180,6 +180,7 @@
   components:
   - type: AccessReader
   - type: Lock
+  - type: LockVisuals
   - type: Sprite
     sprite: Structures/Storage/wall_locker.rsi
     layers:
@@ -188,7 +189,7 @@
     - state: generic_door
       map: ["enum.StorageVisualLayers.Door"]
     - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
       shader: unshaded
     - state: welded
       visible: false
@@ -222,7 +223,7 @@
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
     - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
       shader: unshaded
   - type: MovedByPressure
   - type: DamageOnHighSpeedImpact
@@ -282,7 +283,6 @@
   - type: Appearance
   - type: EntityStorageVisuals
     stateBase: base
-    stateLocked: locked
-    stateUnlocked: unlocked
     stateDoorOpen: base
     stateDoorClosed: door
+  - type: LockVisuals
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 76a88e7858f..acf4fd2149e 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -87,6 +87,7 @@
   id: CrateBaseSecure
   components:
   - type: Lock
+  - type: LockVisuals
   - type: AccessReader
   - type: Icon
     sprite: Structures/Storage/Crates/secure.rsi
@@ -101,7 +102,7 @@
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
     - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
       shader: unshaded
   - type: Damageable
     damageContainer: StructuralInorganic
diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
new file mode 100644
index 00000000000..bdb02d2bc35
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
@@ -0,0 +1,139 @@
+- type: entity
+  id: GlassBoxLaser
+  name: glass box
+  description: A sturdy showcase for an expensive exhibit.
+  parent: BaseStructureDynamic
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Anchorable
+    delay: 4
+  - type: Transform
+    anchored: true
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Glass
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmash
+  - type: Physics
+    bodyType: Static
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Storage/glassbox.rsi
+    layers:
+    - state: glassbox
+    - state: caplaser
+      map: ["enum.ItemCabinetVisualLayers.ContainsItem"]
+      visible: true
+    - state: glass
+      map: ["enum.ItemCabinetVisualLayers.Door"]
+  - type: ItemCabinet
+    cabinetSlot:
+      ejectOnInteract: true
+      whitelist:
+        tags:
+        - WeaponAntiqueLaser
+    doorSound:
+      path: /Audio/Machines/machine_switch.ogg
+    openState: glass-up
+    closedState: glass
+  - type: Lock
+  - type: AccessReader
+    access: [["Captain"]]
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      ItemCabinet: !type:ContainerSlot
+  - type: Repairable
+  - type: Appearance
+  - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 7.555
+    trackAllDamage: true
+    damageOverlay:
+      sprite: Structures/Storage/glassbox.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+        - !type:EmptyAllContainersBehaviour
+        - !type:PlaySoundBehavior
+          sound:
+            collection: WindowShatter
+        - !type:SpawnEntitiesBehavior
+          spawn:
+            ShardGlassReinforced:
+              min: 1
+              max: 1
+            GlassBoxLaserBroken:
+              min: 1
+              max: 1
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+
+- type: entity
+  id: GlassBoxLaserOpen
+  parent: GlassBoxLaser
+  suffix: Open
+  components:
+  - type: ItemCabinet
+    opened: true
+    doorSound:
+      path: /Audio/Machines/machine_switch.ogg
+    openState: glass-up
+    closedState: glass
+
+- type: entity
+  id: GlassBoxLaserFilled
+  parent: GlassBoxLaser
+  suffix: Filled
+  components:
+  - type: ItemCabinet
+    cabinetSlot:
+      startingItem: WeaponAntiqueLaser
+      ejectOnInteract: true
+      whitelist:
+        tags:
+        - WeaponAntiqueLaser
+    doorSound:
+      path: /Audio/Machines/machine_switch.ogg
+    openState: glass-up
+    closedState: glass
+
+- type: entity
+  id: GlassBoxLaserFilledOpen
+  parent: GlassBoxLaserFilled
+  suffix: Filled, Open
+  components:
+  - type: ItemCabinet
+    opened: true
+    doorSound:
+      path: /Audio/Machines/machine_switch.ogg
+    openState: glass-up
+    closedState: glass
+
+- type: entity
+  id: GlassBoxLaserBroken
+  name: broken glass box
+  description: A broken showcase for a stolen expensive exhibit.
+  parent: BaseStructureDynamic
+  suffix: Broken
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+  - type: Sprite
+    sprite: Structures/Storage/glassbox.rsi
+    layers:
+    - state: glassbox
+    - state: glass-4
+  - type: Clickable
+  - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
index 80a8e8ea202..62f2000593b 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -30,6 +30,10 @@
     - AirDanger
     - AirWarning
     - AirNormal
+    lastSignals:
+      AirDanger: false
+      AirWarning: false
+      AirNormal: false
   - type: AtmosAlarmable
     syncWith:
     - AirAlarm
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 1b285348d5b..3f77c248601 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -34,6 +34,8 @@
     - On
     - Off
     - Status
+    lastSignals:
+      Status: false
 
 - type: entity
   id: SignalButton
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
index 70c1573fb8d..5503ea856c8 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -92,7 +92,7 @@
         spawn:
           ShardGlassPlasma:
             min: 1
-            max: 2
+            max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index e2399654940..18da78f1b5b 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -18,7 +18,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 150
+        damage: 150 #excess damage (nuke?). avoid computational cost of spawning entities.
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
@@ -103,7 +103,16 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 150
+        damage: 150 #excess damage (nuke?). avoid computational cost of spawning entities.
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -112,7 +121,7 @@
         spawn:
           ShardGlassReinforced:
             min: 1
-            max: 2
+            max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
index 67dfe028d93..9281e0c7ff9 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
@@ -101,10 +101,10 @@
         spawn:
           ShardGlassPlasma:
             min: 1
-            max: 2
+            max: 1
           PartRodMetal:
             min: 1
-            max: 2
+            max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index ee3a7d52b08..faae8b004b7 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -46,7 +46,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 100
+        damage: 150 #excess damage (nuke?). avoid computational cost of spawning entities.
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -152,7 +152,7 @@
           collection: WindowShatter
     - trigger:
         !type:DamageTrigger
-        damage: 50
+        damage: 25
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -161,7 +161,7 @@
         spawn:
           ShardGlass:
             min: 1
-            max: 2
+            max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Airtight
diff --git a/Resources/Prototypes/Entities/Structures/gates.yml b/Resources/Prototypes/Entities/Structures/gates.yml
index 8fccb39b71c..22ab745a1ee 100644
--- a/Resources/Prototypes/Entities/Structures/gates.yml
+++ b/Resources/Prototypes/Entities/Structures/gates.yml
@@ -34,6 +34,8 @@
   - type: DeviceLinkSource
     ports:
     - Output
+    lastSignals:
+      Output: false
   - type: Construction
     graph: LogicGate
     node: logic_gate
@@ -65,6 +67,9 @@
     ports:
     - OutputHigh
     - OutputLow
+    lastSignals:
+      OutputHigh: false
+      OutputLow: false
   - type: Construction
     graph: LogicGate
     node: edge_detector
@@ -108,6 +113,9 @@
     ports:
     - PowerCharging
     - PowerDischarging
+    lastSignals:
+      PowerCharging: false
+      PowerDischarging: false
   - type: Construction
     graph: LogicGate
     node: power_sensor
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 2dcf3603cf9..68133fd1220 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -462,7 +462,7 @@
   - type: StationEvent
     weight: 10
     earliestStart: 20
-    reoccurrenceDelay: 60
+    reoccurrenceDelay: 20
     duration: 1
   - type: IonStormRule
 
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 7c94546602c..649ffa85224 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -136,6 +136,39 @@
       Max: 4
       PotencyDivisor: 25
 
+- type: seed
+  id: laughinPea
+  name: seeds-laughin-pea-name
+  noun: seeds-noun-seeds
+  displayName: seeds-laughin-pea-display-name
+  plantRsi: Objects/Specific/Hydroponics/laughin_pea.rsi
+  packetPrototype: LaughinPeaSeeds
+  productPrototypes:
+    - FoodLaughinPeaPod
+  lifespan: 25
+  growthStages: 3
+  maturation: 8
+  production: 6
+  yield: 3
+  potency: 25
+  idealLight: 8
+  harvestRepeat: Repeat
+  nutrientConsumption: 0.6
+  waterConsumption: 0.6
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 33
+    Sugar:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 50
+    Laughter:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 50
+
 - type: seed
   id: lemon
   name: seeds-lemon-name
@@ -1344,6 +1377,8 @@
   packetPrototype: PeaSeeds
   productPrototypes:
     - FoodPeaPod
+  mutationPrototypes:
+    - laughinPea
   lifespan: 25
   growthStages: 3
   maturation: 8
diff --git a/Resources/Prototypes/Nyanotrasen/tags.yml b/Resources/Prototypes/Nyanotrasen/tags.yml
index 54f39b7b6ef..ff3b901b1cc 100644
--- a/Resources/Prototypes/Nyanotrasen/tags.yml
+++ b/Resources/Prototypes/Nyanotrasen/tags.yml
@@ -12,3 +12,6 @@
 
 - type: Tag
   id: NormalityCrystal
+
+- type: Tag
+  id: PlushieCarp
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
index f980f5066aa..8fbfd3cd64b 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
@@ -77,6 +77,16 @@
   color: "#fba399"
   recognizable: true
 
+- type: reagent
+  id: LaughinSyrup
+  name: reagent-name-laughin-syrup
+  group: Foods
+  desc: reagent-desc-laughin-syrup
+  physicalDesc: reagent-physical-desc-funny
+  flavor: sweet
+  color: "#803280"
+  recognizable: true
+
 - type: reagent
   id: Mayo
   name: reagent-name-mayo
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index d29d5f7e4da..978ec717f95 100644
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -88,7 +88,19 @@
   flavor: metallic
   color: "#162581"
   recognizable: true
-  physicalDesc: reagent-physical-desc-ferrous
+  physicalDesc: reagent-physical-desc-metallic
+  slippery: false
+
+- type: reagent
+  parent: Blood
+  id: AmmoniaBlood
+  name: reagent-name-ammonia-blood
+  group: Biological
+  desc: reagent-desc-ammonia-blood
+  flavor: bitter
+  color: "#7a8bf2"
+  recognizable: true
+  physicalDesc: reagent-physical-desc-pungent
   slippery: false
 
 - type: reagent
@@ -183,4 +195,4 @@
   footstepSound:
     collection: FootstepBlood
     params:
-      volume: 6
\ No newline at end of file
+      volume: 6
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index d22e2213ace..25b0e8da809 100644
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -298,3 +298,24 @@
         messages: [ "fresium-effect-frozen"]
         probability: 0.4
 
+- type: reagent
+  id: Laughter
+  name: reagent-name-laughter
+  group: Special
+  desc: reagent-desc-laughter
+  physicalDesc: reagent-physical-desc-funny
+  flavor: funny
+  color: "#FF4DD2"
+  slippery: true #clown juice gotta slip
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:Emote
+        emote: Laugh
+        probability: 0.3
+      - !type:PopupMessage
+        type: Local
+        visualType: Large
+        messages: [ "laughter-effect-control-laughter" ]
+        probability: 0.2
+
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
index 54e518fd787..28de8e7f7d4 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: Shiv
+  id: ShivConstruct
   start: start
   graph:
   - node: start
@@ -14,7 +14,27 @@
     entity: Shiv
 
 - type: constructionGraph
-  id: ReinforcedShiv
+  id: Shiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: GlassShard
+        name: Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: Shiv
+
+- type: constructionGraph
+  id: ReinforcedShivConstruct
   start: start
   graph:
   - node: start
@@ -29,7 +49,27 @@
     entity: ReinforcedShiv
 
 - type: constructionGraph
-  id: PlasmaShiv
+  id: ReinforcedShiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: ReinforcedGlassShard
+        name: Reinforced Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: ReinforcedShiv
+
+- type: constructionGraph
+  id: PlasmaShivConstruct
   start: start
   graph:
   - node: start
@@ -44,7 +84,27 @@
     entity: PlasmaShiv
 
 - type: constructionGraph
-  id: UraniumShiv
+  id: PlasmaShiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: PlasmaGlassShard
+        name: Plasma Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: PlasmaShiv
+
+- type: constructionGraph
+  id: UraniumShivConstruct
   start: start
   graph:
   - node: start
@@ -57,3 +117,23 @@
         doAfter: 1
   - node: icon
     entity: UraniumShiv
+
+- type: constructionGraph
+  id: UraniumShiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: UraniumGlassShard
+        name: Uranium Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: UraniumShiv
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index bdb0c814a4a..1647e98bcea 100644
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -475,7 +475,6 @@
   - sprite: Structures/Piping/Atmospherics/vent.rsi
     state: vent_off
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -497,7 +496,6 @@
   - sprite: Structures/Piping/Atmospherics/vent.rsi
     state: vent_off
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -519,7 +517,6 @@
   - sprite: Structures/Piping/Atmospherics/scrubber.rsi
     state: scrub_off
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -541,7 +538,6 @@
   - sprite: Structures/Piping/Atmospherics/outletinjector.rsi
     state: injector
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 # ATMOS BINARY
@@ -564,7 +560,6 @@
   - sprite: Structures/Piping/Atmospherics/pump.rsi
     state: pumpPressure
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -586,7 +581,6 @@
   - sprite: Structures/Piping/Atmospherics/pump.rsi
     state: pumpVolume
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -608,7 +602,6 @@
   - sprite: Structures/Piping/Atmospherics/pump.rsi
     state: pumpPassiveGate
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -630,7 +623,6 @@
   - sprite: Structures/Piping/Atmospherics/pump.rsi
     state: pumpManualValve
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -652,7 +644,6 @@
   - sprite: Structures/Piping/Atmospherics/pump.rsi
     state: pumpSignalValve
   conditions:
-  - !type:TileNotBlocked {}
   - !type:NoUnstackableInTile
 
 - type: construction
@@ -674,7 +665,6 @@
   - sprite: Structures/Piping/Atmospherics/gascanisterport.rsi
     state: gasCanisterPort
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -695,8 +685,6 @@
     state: pipeStraight
   - sprite: Structures/Piping/Atmospherics/vent.rsi
     state: vent_off
-  conditions:
-    - !type:TileNotBlocked {}
 
 - type: construction
   id: HeatExchanger
@@ -711,8 +699,6 @@
   icon:
     sprite: Structures/Piping/Atmospherics/heatexchanger.rsi
     state: heStraight
-  conditions:
-    - !type:TileNotBlocked {}
 
 # ATMOS TRINARY
 - type: construction
@@ -730,7 +716,6 @@
     state: gasFilter
   mirror: GasFilterFlipped
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -749,7 +734,6 @@
     state: gasFilterF
   mirror: GasFilter
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -767,7 +751,6 @@
     state: gasMixer
   mirror: GasMixerFlipped
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -786,7 +769,6 @@
     state: gasMixerF
   mirror: GasMixer
   conditions:
-    - !type:TileNotBlocked
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -803,7 +785,6 @@
     sprite: Structures/Piping/Atmospherics/pneumaticvalve.rsi
     state: off
   conditions:
-    - !type:TileNotBlocked
     - !type:NoUnstackableInTile
 
 # INTERCOM
diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml
index 868a5cb186e..2efc3f01a41 100644
--- a/Resources/Prototypes/Recipes/Construction/weapons.yml
+++ b/Resources/Prototypes/Recipes/Construction/weapons.yml
@@ -1,3 +1,47 @@
+- type: construction
+  name: glass shiv
+  id: Shiv
+  graph: Shiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A glass shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/shiv.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: reinforced shiv
+  id: ReinforcedShiv
+  graph: ReinforcedShiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A reinforced glass shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/reinforced_shiv.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: plasma shiv
+  id: PlasmaShiv
+  graph: PlasmaShiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A plasma shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/plasma_shiv.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: uranium shiv
+  id: UraniumShiv
+  graph: UraniumShiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A uranium shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/uranium_shiv.rsi, state: icon }
+  objectType: Item
+
 - type: construction
   name: crude spear
   id: Spear
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 28761aa779d..fbaebe6635f 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1703,40 +1703,6 @@
   solids:
     LeavesCannabis: 1
 
-- type: microwaveMealRecipe
-  id: RecipeAloeCream
-  name: aloe cream recipe
-  result: AloeCream
-  time: 10
-  solids:
-    FoodAloe: 1
-
-- type: microwaveMealRecipe
-  id: RecipeMedicatedSuture
-  name: medicated suture recipe
-  result: MedicatedSuture
-  time: 10
-  solids:
-    FoodPoppy: 1
-    Brutepack: 1
-    MaterialCloth1: 1
-  reagents:
-    TranexamicAcid: 50
-    Cryptobiolin: 50
-
-- type: microwaveMealRecipe
-  id: RecipeRegenerativeMesh
-  name: regenerative mesh recipe
-  result: RegenerativeMesh
-  time: 10
-  solids:
-    FoodAloe: 1
-    Ointment: 1
-    MaterialCloth1: 1
-  reagents:
-    Sigynate: 50
-    Dermaline: 50
-
 - type: microwaveMealRecipe
   id: RecipeTrashBakedBananaPeel
   name: baked banana peel recipe
diff --git a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
new file mode 100644
index 00000000000..9d1947f03eb
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
@@ -0,0 +1,33 @@
+- type: microwaveMealRecipe
+  id: RecipeAloeCream
+  name: aloe cream recipe
+  result: AloeCream
+  time: 10
+  solids:
+    FoodAloe: 1
+
+- type: microwaveMealRecipe
+  id: RecipeMedicatedSuture
+  name: medicated suture recipe
+  result: MedicatedSuture
+  time: 10
+  solids:
+    FoodPoppy: 1
+    Brutepack: 1
+    MaterialCloth1: 1
+  reagents:
+    TranexamicAcid: 20
+    Cryptobiolin: 20
+
+- type: microwaveMealRecipe
+  id: RecipeRegenerativeMesh
+  name: regenerative mesh recipe
+  result: RegenerativeMesh
+  time: 10
+  solids:
+    FoodAloe: 1
+    Ointment: 1
+    MaterialCloth1: 1
+  reagents:
+    Sigynate: 20
+    Dermaline: 20
diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/strawhat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
similarity index 100%
rename from Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/strawhat.yml
rename to Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml
index ba4eab57c94..12fbe97e28f 100644
--- a/Resources/Prototypes/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -201,3 +201,16 @@
     sprite: Objects/Materials/materials.rsi
     state: cloth_3
   objectType: Item
+
+- type: construction
+  name: straw hat
+  id: strawHat
+  graph: StrawHat
+  startNode: start
+  targetNode: strawhat
+  category: construction-category-clothing
+  description: A fancy hat for hot days! Not recommended to wear near fires.
+  icon:
+    sprite: Clothing/Head/Hats/straw_hat.rsi
+    state: icon
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index 566e33e3f31..56f09e5c68a 100644
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -474,6 +474,13 @@
   materials:
     Cloth: 300
 
+- type: latheRecipe
+  id: ClothingUniformJumpsuitQMFormal
+  result: ClothingUniformJumpsuitQMFormal
+  completetime: 4
+  materials:
+    Cloth: 300
+
 - type: latheRecipe
   id: ClothingUniformJumpskirtQM
   result: ClothingUniformJumpskirtQM
@@ -979,6 +986,14 @@
     Cloth: 100
     Durathread: 50
 
+- type: latheRecipe
+  id: ClothingHeadHatBeretQM
+  result: ClothingHeadHatBeretQM
+  completetime: 2
+  materials:
+    Cloth: 100
+    Durathread: 50
+
 - type: latheRecipe
   id: ClothingHeadHatBeretCmo
   result: ClothingHeadHatBeretCmo
@@ -987,6 +1002,13 @@
     Cloth: 100
     Durathread: 50
 
+- type: latheRecipe
+  id: ClothingHeadHatBeretMedic
+  result: ClothingHeadHatBeretMedic
+  completetime: 2
+  materials:
+    Cloth: 100
+
 - type: latheRecipe
   id: ClothingHeadHatBeretBrigmedic
   result: ClothingHeadHatBeretBrigmedic
diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml
index a5a7f8b2d8d..d41b5fdce87 100644
--- a/Resources/Prototypes/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/Recipes/Lathes/devices.yml
@@ -76,6 +76,16 @@
     Steel: 100
     Plastic: 200
     Glass: 100
+    
+- type: latheRecipe
+  id: SignallerAdvanced
+  result: RemoteSignallerAdvanced
+  category: Parts
+  completetime: 2
+  materials:
+    Steel: 100
+    Plastic: 200
+    Plasma: 100
 
 - type: latheRecipe
   id: AnomalyLocator
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index a7c294a0df6..84091668e3c 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -102,6 +102,13 @@
     Steel: 100
     Plastic: 50
 
+- type: latheRecipe
+  id: AirTank
+  result: AirTank
+  completetime: 4
+  materials:
+    Steel: 300
+
 - type: latheRecipe
   id: ClothingShoesBootsMagSci
   result: ClothingShoesBootsMagSci
diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
index 818030a3b33..a8ccd5f0455 100644
--- a/Resources/Prototypes/Recipes/Reactions/fun.yml
+++ b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -161,3 +161,13 @@
     Carbon: 3
     Sugar: 2
 
+- type: reaction
+  id: Laughter
+  reactants:
+    JuiceBanana:
+      amount: 1
+    Sugar:
+      amount: 1
+  products:
+    Laughter: 2
+
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index c123d9306f0..a1ca3ea38e2 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -213,7 +213,7 @@
       amount: 1
     Ammonia:
       amount: 1
-    Blood:
+    ZombieBlood:
       amount: 2
   products:
     Ambuzol: 4
@@ -223,11 +223,10 @@
   reactants:
     Ambuzol:
       amount: 5
-    ZombieBlood:
-      amount: 15
+    Omnizine:
+      amount: 5
   products:
-    Blood: 15
-    AmbuzolPlus: 5
+    AmbuzolPlus: 10
 
 - type: reaction
   id: Synaptizine
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 8cbca4f7e10..6946f5fe1d1 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -44,7 +44,8 @@
   tier: 1
   cost: 7500
   recipeUnlocks:
-  - Signaller
+  - Signaller  
+  - SignallerAdvanced
   - SignalTrigger
   - VoiceTrigger
   - TimerTrigger
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 13eccb316ca..0ba629c8c5c 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -35,23 +35,6 @@
   - MechEquipmentGrabberSmall
   - VimHarness
 
-- type: technology
-  id: FoodService
-  name: research-technology-food-service
-  icon:
-    sprite: Structures/Machines/juicer.rsi
-    state: juicer1
-  discipline: CivilianServices
-  tier: 1
-  cost: 7500
-  recipeUnlocks: #remove all of these once we have more kitchen equipment
-  - MicrowaveMachineCircuitboard
-  - ReagentGrinderMachineCircuitboard
-  - ElectricGrillMachineCircuitboard
-  - BoozeDispenserMachineCircuitboard
-  - SodaDispenserMachineCircuitboard
-  - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board to service research.
-
 - type: technology
   id: AudioVisualCommunication
   name: research-technology-audio-visual-communication
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index cfb8d5d61cd..5f5d275521e 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -18,6 +18,7 @@
     components:
     - type: Psionic # Nyano - Summary: Makes the mime psionic.
     - type: MimePowers
+    - type: FrenchAccent
 
 - type: startingGear
   id: MimeGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 84d1cf76be9..e4ae7a7dd50 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -32,7 +32,7 @@
     shoes: ClothingShoesColorBlue
     id: ParamedicPDA
     ears: ClothingHeadsetMedical
-    belt: ClothingBeltParamedicFilled
+    belt: ClothingBeltMedicalEMTFilled
     pocket1: HandheldGPSBasic # DeltaV - Give Paramedics useful tools on spawn
     pocket2: HandheldCrewMonitor # DeltaV - Give Paramedics useful tools on spawn
   innerClothingSkirt: ClothingUniformJumpskirtParamedic
diff --git a/Resources/Prototypes/SoundCollections/bureaucracy.yml b/Resources/Prototypes/SoundCollections/bureaucracy.yml
new file mode 100644
index 00000000000..052b102649f
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/bureaucracy.yml
@@ -0,0 +1,8 @@
+- type: soundCollection
+  id: PaperScribbles
+  files:
+  - /Audio/Items/Paper/paper_scribble1.ogg
+  - /Audio/Items/Paper/paper_scribble2.ogg
+  - /Audio/Items/Paper/paper_scribble3.ogg
+  - /Audio/Items/Paper/paper_scribble4.ogg
+  - /Audio/Items/Paper/paper_scribble5.ogg
diff --git a/Resources/Prototypes/SoundCollections/drink_close_sounds.yml b/Resources/Prototypes/SoundCollections/drink_close_sounds.yml
new file mode 100644
index 00000000000..9da4d281685
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/drink_close_sounds.yml
@@ -0,0 +1,4 @@
+- type: soundCollection
+  id: bottleCloseSounds
+  files:
+  - /Audio/Items/bottle_close1.ogg
diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml
index 93f23d599c8..ef49e9b7cf6 100644
--- a/Resources/Prototypes/Species/slime.yml
+++ b/Resources/Prototypes/Species/slime.yml
@@ -39,7 +39,7 @@
       points: 1
       required: false
     Legs:
-      points: 2
+      points: 4
       required: false
     Arms:
       points: 4
diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml
index 482997a1068..605087a687b 100644
--- a/Resources/Prototypes/Species/vox.yml
+++ b/Resources/Prototypes/Species/vox.yml
@@ -1,12 +1,18 @@
 - type: species
   id: Vox
-  name: Vox
+  name: species-name-vox
   roundStart: false # sad...
   prototype: MobVox
   sprites: MobVoxSprites
   markingLimits: MobVoxMarkingLimits
   dollPrototype: MobVoxDummy
   skinColoration: Hues
+  maleFirstNames: names_vox
+  femaleFirstNames: names_vox
+  naming: First
+  sexes:
+    - Unsexed
+
 
 - type: speciesBaseSprites
   id: MobVoxSprites
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index 5a469823749..01acfd13f84 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -145,6 +145,20 @@
   maxCount: 30
   itemSize: 5
 
+- type: stack
+  id: FloorTileStackShuttleGrey
+  name: grey shuttle tile
+  spawn: FloorTileItemShuttleGrey
+  maxCount: 30
+  itemSize: 5
+
+- type: stack
+  id: FloorTileStackShuttleBlack
+  name: black shuttle tile
+  spawn: FloorTileItemShuttleBlack
+  maxCount: 30
+  itemSize: 5
+
 - type: stack
   id: FloorTileStackEighties
   name: eighties floor tile
diff --git a/Resources/Prototypes/StatusIcon/antag.yml b/Resources/Prototypes/StatusIcon/antag.yml
index a3fb0727227..0a052ce16da 100644
--- a/Resources/Prototypes/StatusIcon/antag.yml
+++ b/Resources/Prototypes/StatusIcon/antag.yml
@@ -23,14 +23,15 @@
   id: MindShieldIcon
   priority: 2
   locationPreference: Right
+  layer: Mod
   icon:
     sprite: Interface/Misc/job_icons.rsi
     state: MindShield
-    
+
 - type: statusIcon
   id: SyndicateFaction
   priority: 0
-  locationPreference: Left 
+  locationPreference: Left
   icon:
     sprite: Interface/Misc/job_icons.rsi
     state: Syndicate
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index b6decddd240..33469c404ae 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -1183,6 +1183,12 @@
   id: FloorShuttleWhite
   name: tiles-white-shuttle-floor
   sprite: /Textures/Tiles/shuttlewhite.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1191,10 +1197,52 @@
   itemDrop: FloorTileItemShuttleWhite
   heatCapacity: 10000
 
+- type: tile
+  id: FloorShuttleGrey
+  name: tiles-grey-shuttle-floor
+  sprite: /Textures/Tiles/shuttlegrey.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemShuttleGrey
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorShuttleBlack
+  name: tiles-black-shuttle-floor
+  sprite: /Textures/Tiles/shuttleblack.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemShuttleBlack
+  heatCapacity: 10000
+
 - type: tile
   id: FloorShuttleBlue
   name: tiles-blue-shuttle-floor
   sprite: /Textures/Tiles/shuttleblue.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1207,6 +1255,12 @@
   id: FloorShuttleOrange
   name: tiles-orange-shuttle-floor
   sprite: /Textures/Tiles/shuttleorange.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1219,6 +1273,12 @@
   id: FloorShuttlePurple
   name: tiles-purple-shuttle-floor
   sprite: /Textures/Tiles/shuttlepurple.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1231,6 +1291,12 @@
   id: FloorShuttleRed
   name: tiles-red-shuttle-floor
   sprite: /Textures/Tiles/shuttlered.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index f6b630e5c00..8df129f7869 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -157,10 +157,14 @@
 
 - type: emoteSounds
   id: UnisexVox
-  sound:
-    path: /Audio/Voice/Vox/shriek1.ogg
-    params:
-      variation: 0.125
+  sounds:
+    Scream:
+      path: /Audio/Voice/Vox/shriek1.ogg
+    Laugh:
+      path: /Audio/Voice/Vox/vox_laugh.ogg
+  params:
+    variation: 0.125
+    # We need vox sounds for the other emotes
 
 - type: emoteSounds
   id: UnisexDiona
diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml
index abe6a831029..eb47b5363b6 100644
--- a/Resources/Prototypes/Voice/speech_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_sounds.yml
@@ -88,6 +88,15 @@
   exclaimSound:
     path: /Audio/Voice/Talk/slime_exclaim.ogg
 
+- type: speechSounds
+  id: Vox
+  saySound:
+    path: /Audio/Voice/Talk/vox.ogg
+  askSound:
+    path: /Audio/Voice/Talk/vox_ask.ogg
+  exclaimSound:
+    path: /Audio/Voice/Talk/vox_exclaim.ogg
+
 - type: speechSounds
   id: Arachnid
   saySound:
@@ -105,7 +114,7 @@
     path: /Audio/Animals/cat_meow.ogg
   exclaimSound:
     path: /Audio/Animals/cat_meow.ogg
-    
+
 - type: speechSounds
   id: Dog
   saySound:
@@ -113,4 +122,4 @@
   askSound:
     path: /Audio/Animals/dog_bark3.ogg
   exclaimSound:
-    path: /Audio/Animals/dog_bark2.ogg
\ No newline at end of file
+    path: /Audio/Animals/dog_bark2.ogg
diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml
index b849a32a548..1cdda32ece1 100644
--- a/Resources/Prototypes/Voice/speech_verbs.yml
+++ b/Resources/Prototypes/Voice/speech_verbs.yml
@@ -74,6 +74,13 @@
   - chat-speech-verb-slime-2
   - chat-speech-verb-slime-3
 
+- type: speechVerb
+  id: Vox
+  speechVerbStrings:
+    - chat-speech-verb-vox-1
+    - chat-speech-verb-vox-2
+    - chat-speech-verb-vox-3
+
 - type: speechVerb
   id: Plant
   speechVerbStrings:
diff --git a/Resources/Prototypes/XenoArch/artifact_triggers.yml b/Resources/Prototypes/XenoArch/artifact_triggers.yml
index 57d1173fe3e..b16a9de8dea 100644
--- a/Resources/Prototypes/XenoArch/artifact_triggers.yml
+++ b/Resources/Prototypes/XenoArch/artifact_triggers.yml
@@ -112,7 +112,7 @@
     groups:
       Acidic: [ Touch ]
     reactions:
-    - reagents: [ Blood ]
+    - reagents: [ Blood, CopperBlood, InsectBlood, Slime, AmmoniaBlood, ZombieBlood ]
       methods: [ Touch ]
       effects:
       - !type:ActivateArtifact
diff --git a/Resources/Prototypes/audio.yml b/Resources/Prototypes/audio.yml
index abe0068b728..b5ab41091b6 100644
--- a/Resources/Prototypes/audio.yml
+++ b/Resources/Prototypes/audio.yml
@@ -7,6 +7,15 @@
   rules: NearMorgue
   priority: 4
 
+- type: ambientMusic
+  id: SpookyFog
+  sound:
+    params:
+      volume: -12
+    collection: AmbienceSpookyFog
+  rules: NearSpookyFog
+  priority: 5
+
 - type: ambientMusic
   id: Holy
   sound:
@@ -196,6 +205,24 @@
     - /Audio/Ambience/ambiruin6.ogg
     - /Audio/Ambience/ambiruin7.ogg
 
+- type: soundCollection
+  id: AmbienceSpookyFog
+  files:
+    - /Audio/Ambience/spookyspace1.ogg
+    - /Audio/Ambience/spookyspace2.ogg
+    - /Audio/Ambience/ambimo2.ogg
+    - /Audio/Ambience/ambilava1.ogg
+    - /Audio/Ambience/ambilava2.ogg
+    - /Audio/Ambience/ambiruin2.ogg
+    - /Audio/Ambience/ambiruin3.ogg
+    - /Audio/Ambience/ambiruin4.ogg
+    - /Audio/Ambience/ambiruin5.ogg
+    - /Audio/Ambience/ambiruin6.ogg
+    - /Audio/Ambience/ambiruin7.ogg
+    - /Audio/Ambience/ambidanger.ogg
+    - /Audio/Ambience/ambidanger2.ogg
+    - /Audio/Ambience/ambimine.ogg
+
 ## Background noise on station, separate to ambient music.
 - type: soundCollection
   id: AmbienceStation
@@ -263,6 +290,16 @@
       components:
         - type: Morgue
       range: 3
+      
+- type: rules
+  id: NearSpookyFog
+  rules:
+    - !type:NearbyEntitiesRule
+      count: 5
+      whitelist:
+        tags:
+          - SpookyFog
+      range: 4
 
 - type: rules
   id: OnMapGrid
diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml
index 207378f71e0..235584dd636 100644
--- a/Resources/Prototypes/holidays.yml
+++ b/Resources/Prototypes/holidays.yml
@@ -24,12 +24,6 @@
   beginDay: 2
   beginMonth: February
 
-- type: holiday
-  id: TravisScottDay
-  name: holiday-name-travis-scott-day
-  beginDay: 10
-  beginMonth: February
-
 - type: holiday
   id: ValentinesDay
   name: holiday-name-valentines-day
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index f9b207ba6ec..3b2dcbe3749 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1052,6 +1052,9 @@
 - type: Tag
   id: Soup
 
+- type: Tag
+  id: SpookyFog
+
 - type: Tag
   id: Spray
 
@@ -1160,6 +1163,9 @@
 - type: Tag
   id: WallmountSubstationElectronics
 
+- type: Tag
+  id: WeaponAntiqueLaser
+
 - type: Tag
   id: WeaponPistolCHIMPUpgradeKit
 
@@ -1169,6 +1175,9 @@
 - type: Tag
   id: WetFloorSign
 
+- type: Tag
+  id: Wheat
+
 - type: Tag
   id: WhitelistChameleon
 
diff --git a/Resources/Prototypes/typing_indicator.yml b/Resources/Prototypes/typing_indicator.yml
index 3a0484fc0b3..7271770ef50 100644
--- a/Resources/Prototypes/typing_indicator.yml
+++ b/Resources/Prototypes/typing_indicator.yml
@@ -34,6 +34,11 @@
   typingState: spider0
   offset: 0, 0.125
 
+- type: typingIndicator
+  id: vox
+  typingState: vox0
+  offset: -0.125, 0.125
+
 - type: typingIndicator
   id: lizard
   typingState: lizard0
diff --git a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml
index d56da3813db..7a09a1647d2 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml
@@ -24,7 +24,7 @@ These medications tend to have specific use cases.
 <GuideReagentEmbed Reagent="Phalanximine"/>
 <GuideReagentEmbed Reagent="Tricordrazine"/>
 <GuideReagentEmbed Reagent="TranexamicAcid"/>
-<GuideReagentEmbed Reagent="Romerol"/>
+<GuideReagentEmbed Reagent="Ambuzol"/>
 <GuideReagentEmbed Reagent="Oculine"/>
 
 # All Medications
diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/emt.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..34698f72858
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/emt.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/icon.png b/Resources/Textures/Clothing/Belt/emt.rsi/icon.png
new file mode 100644
index 00000000000..80abde93823
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/emt.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-left.png
new file mode 100644
index 00000000000..460be7e4849
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-right.png
new file mode 100644
index 00000000000..7222bcf7b3d
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Belt/emt.rsi/meta.json
similarity index 64%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json
rename to Resources/Textures/Clothing/Belt/emt.rsi/meta.json
index a470e009443..8f6acfe1245 100644
--- a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/emt.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": "Drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-HELMET",
+      "name": "equipped-BELT",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..8175d93dc5e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/icon.png
new file mode 100644
index 00000000000..608a155cfdc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-left.png
new file mode 100644
index 00000000000..84d21a6738c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-right.png
new file mode 100644
index 00000000000..aee4b59f97a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json
rename to Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..13f8eb2afdb
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png
new file mode 100644
index 00000000000..46b5ac16fb4
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png
new file mode 100644
index 00000000000..fe6d00e15c3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png
new file mode 100644
index 00000000000..6af0e0514df
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json
similarity index 82%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json
rename to Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json
index 8089773135c..e1197010d7c 100644
--- a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by MagnusCrowe (Github) for SS14",
+  "copyright": "Sprited by Hülle#2562 (Discord), resprite by icekot8",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png
new file mode 100644
index 00000000000..c9197282c65
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..b03816eeb68
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png
new file mode 100644
index 00000000000..ee1997cc965
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png
new file mode 100644
index 00000000000..4c59df75503
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png
new file mode 100644
index 00000000000..1f8ff310244
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
similarity index 80%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json
rename to Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
index 86b28c561a8..8591b0feabb 100644
--- a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/beret_qm.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, repaletted for Space Station 14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, recoloured by Hanzdegloker",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-hamster",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png
similarity index 100%
rename from Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png
rename to Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/icon.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/meta.json
new file mode 100644
index 00000000000..a3cde84524c
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Adrian16199",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+    {
+    "name": "icon"
+    },
+    {
+    "name": "equipped-HELMET",
+    "directions": 4
+    },
+    {
+    "name": "equipped-HELMET-hamster",
+    "directions": 4
+    },
+    {
+    "name": "inhand-left",
+    "directions": 4
+    },
+    {
+    "name": "inhand-right",
+    "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
index b3513bb5cd0..adf7e7620a5 100644
--- a/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json
deleted file mode 100644
index b3513bb5cd0..00000000000
--- a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-NC-SA-3.0",
-  "copyright": "Taken from civstation at commit https://github.com/Civ13/Civ13/commit/ec52cbb95d59b717d4d8c480b35ac133e5b58088#diff-fba188fb2db5d16e5d41985147336a8f96085f761b903e016fffd869b63e497d",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
index a470e009443..a29360acd8b 100644
--- a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
index a470e009443..a29360acd8b 100644
--- a/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e009443..00000000000
--- a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 00000000000..f5372ea5a3b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json
index 83a38bf11b9..81d3b938b96 100644
--- a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json
@@ -10,21 +10,40 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET-hamster",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET-hamster",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json
index a470e009443..a29360acd8b 100644
--- a/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json
index a470e009443..a29360acd8b 100644
--- a/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json
index a470e009443..a29360acd8b 100644
--- a/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e009443..00000000000
--- a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json
index a470e009443..a29360acd8b 100644
--- a/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e009443..00000000000
--- a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json
index a470e009443..a29360acd8b 100644
--- a/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e009443..00000000000
--- a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png
index 79b4d66da04..2f7a32ae935 100644
Binary files a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 00000000000..5a4e035e636
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
index 2b73b340e68..b60639b2654 100644
--- a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
@@ -10,21 +10,40 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET-hamster",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET-hamster",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 00000000000..140bf71b782
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
index ade65863af2..3fb7add363e 100644
--- a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
@@ -10,21 +10,40 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET-hamster",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET-hamster",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e009443..00000000000
--- a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
index a470e009443..a29360acd8b 100644
--- a/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e009443..00000000000
--- a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
index a470e009443..a29360acd8b 100644
--- a/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e009443..00000000000
--- a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
index a470e009443..a29360acd8b 100644
--- a/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e009443..00000000000
--- a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
index a470e009443..a29360acd8b 100644
--- a/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e009443..00000000000
--- a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png
index d1a348ddd1b..7edf356ec60 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png
index 790650960e5..9acfc278c02 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
index 7c12f7cbe98..8ffa6e2e94c 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
index aac288256a1..accf74dc8f6 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
index bbcef071e2e..45e0f9141cb 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Original sec jumpsuit from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, jumpskirt sprite made by Flareguy for SS14. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING-monkey.png
index e326d766b1d..8615d18b044 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png
index 81d1e1a0ea3..77471c7dc44 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png
index 5cf98e48d2d..b2a0093c517 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..3fa68c11d46
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png
new file mode 100644
index 00000000000..63325952266
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png
new file mode 100644
index 00000000000..e5c39a74eb8
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png
new file mode 100644
index 00000000000..014ac5f9ec6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json
similarity index 64%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json
index a470e009443..7f5c61326f2 100644
--- a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.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": "Spritework done by Hanzdegloker",
   "size": {
     "x": 32,
     "y": 32
@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-HELMET",
+      "name": "equipped-INNERCLOTHING",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_box.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_box.png
new file mode 100644
index 00000000000..62be184b022
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_box.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_ne.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_ne.png
new file mode 100644
index 00000000000..2c8159eaddb
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_ne.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_nw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_nw.png
new file mode 100644
index 00000000000..e7ab801e6d9
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_nw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_se.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_se.png
new file mode 100644
index 00000000000..01df5da7acb
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_se.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_sw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_sw.png
new file mode 100644
index 00000000000..83845e0e9d2
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_sw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_e.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_e.png
new file mode 100644
index 00000000000..732f84b783a
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_e.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_n.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_n.png
new file mode 100644
index 00000000000..1f74d877583
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_n.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_s.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_s.png
new file mode 100644
index 00000000000..389a21bd817
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_s.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_w.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_w.png
new file mode 100644
index 00000000000..579c886902a
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_w.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_e.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_e.png
new file mode 100644
index 00000000000..6adb13bdfe6
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_e.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_n.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_n.png
new file mode 100644
index 00000000000..c5f88dc6d23
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_n.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_s.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_s.png
new file mode 100644
index 00000000000..899702c4e46
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_s.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_w.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_w.png
new file mode 100644
index 00000000000..46082f3a697
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_w.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json b/Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
index 4ab9b3f38a6..9b9e0cdfbee 100644
--- a/Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
+++ b/Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
@@ -10,6 +10,45 @@
 	{
       "name": "fulltile_overlay"
     },
+    {
+      "name": "brick_box"
+    },
+    {
+      "name": "brick_corner_ne"
+    },
+    {
+      "name": "brick_corner_nw"
+    },
+    {
+      "name": "brick_corner_se"
+    },
+    {
+      "name": "brick_corner_sw"
+    },
+    {
+      "name": "brick_end_e"
+    },
+    {
+      "name": "brick_end_n"
+    },
+    {
+      "name": "brick_end_s"
+    },
+    {
+      "name": "brick_end_w"
+    },
+    {
+      "name": "brick_line_e"
+    },
+    {
+      "name": "brick_line_n"
+    },
+    {
+      "name": "brick_line_s"
+    },
+    {
+      "name": "brick_line_w"
+    },
     {
       "name": "halftile_overlay"
     },
@@ -82,6 +121,57 @@
     {
       "name": "minitile_diagonal_b"
     },
+    {
+      "name": "minitile_box"
+    },
+    {
+      "name": "minitile_corner_ne"
+    },
+    {
+      "name": "minitile_corner_nw"
+    },
+    {
+      "name": "minitile_corner_se"
+    },
+    {
+      "name": "minitile_corner_sw"
+    },
+    {
+      "name": "minitile_end_e"
+    },
+    {
+      "name": "minitile_end_n"
+    },
+    {
+      "name": "minitile_end_s"
+    },
+    {
+      "name": "minitile_end_w"
+    },
+    {
+      "name": "minitile_inner_ne"
+    },
+    {
+      "name": "minitile_inner_nw"
+    },
+    {
+      "name": "minitile_inner_se"
+    },
+    {
+      "name": "minitile_inner_sw"
+    },
+    {
+      "name": "minitile_line_e"
+    },
+    {
+      "name": "minitile_line_n"
+    },
+    {
+      "name": "minitile_line_s"
+    },
+    {
+      "name": "minitile_line_w"
+    },
     {
       "name": "mono"
     },
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_box.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_box.png
new file mode 100644
index 00000000000..ed71d7326d9
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_box.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_ne.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_ne.png
new file mode 100644
index 00000000000..8028a4feb30
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_ne.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_nw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_nw.png
new file mode 100644
index 00000000000..bed2504456d
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_nw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_se.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_se.png
new file mode 100644
index 00000000000..d649e41fe4c
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_se.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_sw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_sw.png
new file mode 100644
index 00000000000..3a66d0d68e6
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_sw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_e.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_e.png
new file mode 100644
index 00000000000..9cde05e2d55
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_e.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_n.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_n.png
new file mode 100644
index 00000000000..47e7f3fbfea
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_n.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_s.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_s.png
new file mode 100644
index 00000000000..10fe0971b82
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_s.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_w.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_w.png
new file mode 100644
index 00000000000..168e3836a92
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_w.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_ne.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_ne.png
new file mode 100644
index 00000000000..f5788a11368
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_ne.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_nw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_nw.png
new file mode 100644
index 00000000000..4003f8205fc
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_nw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_se.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_se.png
new file mode 100644
index 00000000000..9de3dc0ba5d
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_se.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_sw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_sw.png
new file mode 100644
index 00000000000..45c5eaf9f86
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_sw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_e.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_e.png
new file mode 100644
index 00000000000..48b8a5f4a13
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_e.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_n.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_n.png
new file mode 100644
index 00000000000..586f1bd1a1b
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_n.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_s.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_s.png
new file mode 100644
index 00000000000..836e504a839
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_s.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_w.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_w.png
new file mode 100644
index 00000000000..a51a5909744
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_w.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/meta.json
deleted file mode 100644
index 1885732f2b5..00000000000
--- a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Adrian16199",
-  "size": {
-    "x": 32,
-    "y": 32
-    },
-   "states": [
-    {
-      "name": "icon"
-    },
-   {
-     "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-     "name": "equipped-HELMET-hamster",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Effects/speech.rsi/felinid0.png b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid0.png
similarity index 100%
rename from Resources/Textures/Effects/speech.rsi/felinid0.png
rename to Resources/Textures/DeltaV/Effects/speech.rsi/felinid0.png
diff --git a/Resources/Textures/Effects/speech.rsi/felinid1.png b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid1.png
similarity index 100%
rename from Resources/Textures/Effects/speech.rsi/felinid1.png
rename to Resources/Textures/DeltaV/Effects/speech.rsi/felinid1.png
diff --git a/Resources/Textures/Effects/speech.rsi/felinid2.png b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid2.png
similarity index 100%
rename from Resources/Textures/Effects/speech.rsi/felinid2.png
rename to Resources/Textures/DeltaV/Effects/speech.rsi/felinid2.png
diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json b/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json
new file mode 100644
index 00000000000..1d4b09fbffe
--- /dev/null
+++ b/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Felinid sprites made by Adrian16199 (Github)",
+    "states": [
+        {
+            "name": "felinid0",
+            "delays": [
+                [
+                    0.2,
+                    0.3,
+                    0.3,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "felinid1"
+        },
+        {
+            "name": "felinid2"
+        }
+    ]
+}
diff --git a/Resources/Textures/Effects/optionsvisualizertest.rsi/both.png b/Resources/Textures/Effects/optionsvisualizertest.rsi/both.png
new file mode 100644
index 00000000000..76237f5076f
Binary files /dev/null and b/Resources/Textures/Effects/optionsvisualizertest.rsi/both.png differ
diff --git a/Resources/Textures/Effects/optionsvisualizertest.rsi/meta.json b/Resources/Textures/Effects/optionsvisualizertest.rsi/meta.json
new file mode 100644
index 00000000000..e7f749513dc
--- /dev/null
+++ b/Resources/Textures/Effects/optionsvisualizertest.rsi/meta.json
@@ -0,0 +1 @@
+{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-4.0","copyright":"Discord pjb","states":[{"name":"none"},{"name":"both"},{"name":"motion"},{"name":"test"}]}
diff --git a/Resources/Textures/Effects/optionsvisualizertest.rsi/motion.png b/Resources/Textures/Effects/optionsvisualizertest.rsi/motion.png
new file mode 100644
index 00000000000..edbbd526365
Binary files /dev/null and b/Resources/Textures/Effects/optionsvisualizertest.rsi/motion.png differ
diff --git a/Resources/Textures/Effects/optionsvisualizertest.rsi/none.png b/Resources/Textures/Effects/optionsvisualizertest.rsi/none.png
new file mode 100644
index 00000000000..2f2dc7b3ff8
Binary files /dev/null and b/Resources/Textures/Effects/optionsvisualizertest.rsi/none.png differ
diff --git a/Resources/Textures/Effects/optionsvisualizertest.rsi/test.png b/Resources/Textures/Effects/optionsvisualizertest.rsi/test.png
new file mode 100644
index 00000000000..0078fd489c9
Binary files /dev/null and b/Resources/Textures/Effects/optionsvisualizertest.rsi/test.png differ
diff --git a/Resources/Textures/Effects/speech.rsi/meta.json b/Resources/Textures/Effects/speech.rsi/meta.json
index f500bf943db..98dd3b20607 100644
--- a/Resources/Textures/Effects/speech.rsi/meta.json
+++ b/Resources/Textures/Effects/speech.rsi/meta.json
@@ -412,22 +412,16 @@
         {
             "name": "spider2"
         },
-        {
-            "name": "felinid0",
-            "delays":[
+                {
+            "name": "vox0",
+            "delays": [
                 [
-                    0.2,
                     0.3,
                     0.3,
-                    0.5
+                    0.3,
+                    0.4
                 ]
             ]
-        },
-        {
-            "name": "felinid1"
-        },
-        {
-            "name": "felinid2"
         }
     ]
 }
diff --git a/Resources/Textures/Effects/speech.rsi/vox0.png b/Resources/Textures/Effects/speech.rsi/vox0.png
new file mode 100644
index 00000000000..d4640b8f351
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/vox0.png differ
diff --git a/Resources/Textures/Effects/spookysmoke.rsi/meta.json b/Resources/Textures/Effects/spookysmoke.rsi/meta.json
new file mode 100644
index 00000000000..13da3020fce
--- /dev/null
+++ b/Resources/Textures/Effects/spookysmoke.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/81b3a082ccdfb425f36bbed6e5bc1f0faed346ec/icons/effects/chemsmoke.dmi, edit by TheShuEd (github)",
+  "size": {
+    "x": 96,
+    "y": 96
+  },
+  "states": [
+    {
+      "name": "spookysmoke",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "spookysmoke_static"
+    }
+  ]
+}
diff --git a/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke.png b/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke.png
new file mode 100644
index 00000000000..dde84beaf94
Binary files /dev/null and b/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke.png differ
diff --git a/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke_static.png b/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke_static.png
new file mode 100644
index 00000000000..a817fe76e29
Binary files /dev/null and b/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke_static.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png
index 3049f3e50fb..d3df5fe6277 100644
Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index bf919198f59..df37d244cfe 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon made by Psychpsyo (Github)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi and edited by Golinth (Github)",
 
     "size": {
         "x": 8,
diff --git a/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt b/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt
index 52cb3f1dc90..7d7777fa101 100644
--- a/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt
+++ b/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt
@@ -1,2 +1,3 @@
 Note:
-Only png and jpgs files are supported, and you need a prototype in Resources/Prototypes/lobbyscreens.yml
+PNG, JPEG and WebP is supported. Please prefer a lossy WebP compression since lobby art is big.
+You also need to put a prototype in Resources/Prototypes/lobbyscreens.yml
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/icon.png b/Resources/Textures/Mobs/Animals/nymph.rsi/icon.png
new file mode 100644
index 00000000000..f1b6a792307
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/nymph.rsi/icon.png differ
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json b/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
new file mode 100644
index 00000000000..c6bb6e0ac4e
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
@@ -0,0 +1,63 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/ParadiseSS13/Paradise/commit/f367d7de199969a5fb5054de44faa5618092f487",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "nymph",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "nymph_dead"
+    },
+    {
+      "name": "nymph_sleep",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nymph.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph.png
new file mode 100644
index 00000000000..fe79c893d14
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph.png differ
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_dead.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_dead.png
new file mode 100644
index 00000000000..c3371bf949f
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_dead.png differ
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_sleep.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_sleep.png
new file mode 100644
index 00000000000..4e2055d74ad
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_sleep.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index 927d2ec6e44..c0bf805c386 100644
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -4,7 +4,7 @@
       "x": 32,
       "y": 32
     },
-    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven is drawn by Ubaser, doublebun_long by Emisse",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -758,6 +758,10 @@
       {
         "name": "uneven",
         "directions": 4
+      },
+      {
+        "name": "tailed",
+        "directions": 4
       }
     ]
   }
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png
new file mode 100644
index 00000000000..f24abb81e32
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png differ
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
index c3bfd498d69..0a323f7f65d 100644
--- a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
@@ -22,6 +22,10 @@
     {
         "name": "scar_top_surgery_long",
         "directions": 4
+    },
+    {
+        "name": "scar_chest",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png
new file mode 100644
index 00000000000..9a1cc56c5ea
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_foot.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_foot.png
new file mode 100644
index 00000000000..07b01cd4986
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_foot.png differ
diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_leg.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_leg.png
index 1bf51eaacf3..6e1a06bf1ca 100644
Binary files a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_leg.png and b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_leg.png differ
diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_foot.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_foot.png
new file mode 100644
index 00000000000..86d07d6341c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_foot.png differ
diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_leg.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_leg.png
index 6308e23f8a6..2fef261bd81 100644
Binary files a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_leg.png and b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_leg.png differ
diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/slime_parts.rsi/meta.json
index e3137407bd0..0db3ae1bccf 100644
--- a/Resources/Textures/Mobs/Customization/slime_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/slime_parts.rsi/meta.json
@@ -30,6 +30,14 @@
     {
       "name": "gradient_l_leg",
       "directions": 4
+    },
+    {
+      "name": "gradient_r_foot",
+      "directions": 4
+    },
+    {
+      "name": "gradient_l_foot",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_10.png
new file mode 100644
index 00000000000..c790ff58668
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png
index 43c92d9fa43..2dff27f8512 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_30.png
new file mode 100644
index 00000000000..05419cc533b
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_40.png
deleted file mode 100644
index 404f932b64e..00000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_50.png
new file mode 100644
index 00000000000..d2ed2552d4d
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_70.png
new file mode 100644
index 00000000000..ea8be7c02d4
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_10.png
new file mode 100644
index 00000000000..7d3230bd1fd
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_20.png
index 21662209921..3cd1057e53b 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_30.png
new file mode 100644
index 00000000000..7b9f239f131
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_40.png
deleted file mode 100644
index 33f624d503a..00000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_50.png
new file mode 100644
index 00000000000..80674395302
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_70.png
new file mode 100644
index 00000000000..bc46dd32c03
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_10.png
new file mode 100644
index 00000000000..1c44d9234dd
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_20.png
index 1bcf2e505a1..1547ab27d7f 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_30.png
new file mode 100644
index 00000000000..7100559ec6d
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_40.png
deleted file mode 100644
index 8429e7fb181..00000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_50.png
new file mode 100644
index 00000000000..943a05f24da
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_70.png
new file mode 100644
index 00000000000..124c71636b8
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_10.png
new file mode 100644
index 00000000000..97e84cef5a6
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_20.png
index 2670821090f..0443a6b2ed0 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_30.png
new file mode 100644
index 00000000000..cb476f3cda2
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_40.png
deleted file mode 100644
index 680ec3009a5..00000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_50.png
new file mode 100644
index 00000000000..78ede1ae66f
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_70.png
new file mode 100644
index 00000000000..9e97b1b6289
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_10.png
new file mode 100644
index 00000000000..af40a70a94e
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_20.png
index 2e4a031f151..4323b32ff6c 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_30.png
new file mode 100644
index 00000000000..f21b66c8f68
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_40.png
deleted file mode 100644
index f68f0c4f15f..00000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_50.png
new file mode 100644
index 00000000000..8d6e9336589
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_70.png
new file mode 100644
index 00000000000..64113f8faca
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_10.png
new file mode 100644
index 00000000000..dfb9e2ddd2b
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_20.png
index 44aae3c0bfb..e0f52111460 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_30.png
new file mode 100644
index 00000000000..5e6a6e43905
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_40.png
deleted file mode 100644
index ef4dbcb08b8..00000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_50.png
new file mode 100644
index 00000000000..1b646f052c5
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_70.png
new file mode 100644
index 00000000000..77cb758ddad
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json b/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json
index f9a902aa4dd..68ad07d2bd7 100644
--- a/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json
+++ b/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json
@@ -1,21 +1,39 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi",
+	"copyright": "Drawn by Ubaser.",
 	"size": {"x": 32, "y": 32},
 	"states": [
+		{"name": "Head_Brute_10", "directions": 4},
+		{"name": "LArm_Brute_10", "directions": 4},
+		{"name": "LLeg_Brute_10", "directions": 4},
+		{"name": "RArm_Brute_10", "directions": 4},
+		{"name": "RLeg_Brute_10", "directions": 4},
+		{"name": "Chest_Brute_10", "directions": 4},
 		{"name": "Head_Brute_20", "directions": 4},
 		{"name": "LArm_Brute_20", "directions": 4},
 		{"name": "LLeg_Brute_20", "directions": 4},
 		{"name": "RArm_Brute_20", "directions": 4},
 		{"name": "RLeg_Brute_20", "directions": 4},
 		{"name": "Chest_Brute_20", "directions": 4},
-		{"name": "Head_Brute_40", "directions": 4},
-		{"name": "LArm_Brute_40", "directions": 4},
-		{"name": "LLeg_Brute_40", "directions": 4},
-		{"name": "RArm_Brute_40", "directions": 4},
-		{"name": "RLeg_Brute_40", "directions": 4},
-		{"name": "Chest_Brute_40", "directions": 4},
+		{"name": "Head_Brute_30", "directions": 4},
+		{"name": "LArm_Brute_30", "directions": 4},
+		{"name": "LLeg_Brute_30", "directions": 4},
+		{"name": "RArm_Brute_30", "directions": 4},
+		{"name": "RLeg_Brute_30", "directions": 4},
+		{"name": "Chest_Brute_30", "directions": 4},
+		{"name": "Head_Brute_50", "directions": 4},
+		{"name": "LArm_Brute_50", "directions": 4},
+		{"name": "LLeg_Brute_50", "directions": 4},
+		{"name": "RArm_Brute_50", "directions": 4},
+		{"name": "RLeg_Brute_50", "directions": 4},
+		{"name": "Chest_Brute_50", "directions": 4},
+		{"name": "Head_Brute_70", "directions": 4},
+		{"name": "LArm_Brute_70", "directions": 4},
+		{"name": "LLeg_Brute_70", "directions": 4},
+		{"name": "RArm_Brute_70", "directions": 4},
+		{"name": "RLeg_Brute_70", "directions": 4},
+		{"name": "Chest_Brute_70", "directions": 4},
 		{"name": "Head_Brute_100", "directions": 4},
 		{"name": "LArm_Brute_100", "directions": 4},
 		{"name": "LLeg_Brute_100", "directions": 4},
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_10.png
new file mode 100644
index 00000000000..bb29391fa06
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png
index 2ca0dc67f15..c4058b6b224 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_50.png
new file mode 100644
index 00000000000..5a68c6fd861
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_70.png
new file mode 100644
index 00000000000..2ca0dc67f15
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_10.png
new file mode 100644
index 00000000000..f91dae519af
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_100.png
index 36b91148162..753e8c5cbf6 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_50.png
new file mode 100644
index 00000000000..90d69223b6d
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_70.png
new file mode 100644
index 00000000000..36b91148162
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_10.png
new file mode 100644
index 00000000000..bc8f7bf9cae
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_100.png
index 2dc53776594..cfac53ac3bc 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_50.png
new file mode 100644
index 00000000000..7c8da637caf
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_70.png
new file mode 100644
index 00000000000..2dc53776594
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_10.png
new file mode 100644
index 00000000000..70b91d88244
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_100.png
index c18e5545414..4a55dd5b725 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_50.png
new file mode 100644
index 00000000000..a84ef88da87
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_70.png
new file mode 100644
index 00000000000..c18e5545414
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_10.png
new file mode 100644
index 00000000000..96b96b566bf
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_100.png
index 77e463d02f2..45d10bff5c5 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_50.png
new file mode 100644
index 00000000000..1d0c791e388
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_70.png
new file mode 100644
index 00000000000..77e463d02f2
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_10.png
new file mode 100644
index 00000000000..5f5d390792b
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_100.png
index 978e01358f9..1541b5c78fe 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_50.png
new file mode 100644
index 00000000000..efe3ad8b539
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_70.png
new file mode 100644
index 00000000000..978e01358f9
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json b/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json
index a3df1421642..3649a05cc1a 100644
--- a/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json
+++ b/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json
@@ -1,21 +1,39 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi",
+	"copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi, 100 drawn by Ubaser.",
 	"size": {"x": 32, "y": 32},
 	"states": [
+		{"name": "Head_Burn_10", "directions": 4},
+		{"name": "LArm_Burn_10", "directions": 4},
+		{"name": "LLeg_Burn_10", "directions": 4},
+		{"name": "RArm_Burn_10", "directions": 4},
+		{"name": "RLeg_Burn_10", "directions": 4},
+		{"name": "Chest_Burn_10", "directions": 4},
 		{"name": "Head_Burn_20", "directions": 4},
 		{"name": "LArm_Burn_20", "directions": 4},
 		{"name": "LLeg_Burn_20", "directions": 4},
 		{"name": "RArm_Burn_20", "directions": 4},
 		{"name": "RLeg_Burn_20", "directions": 4},
 		{"name": "Chest_Burn_20", "directions": 4},
-		{"name": "Head_Burn_40", "directions": 4},
-		{"name": "LArm_Burn_40", "directions": 4},
-		{"name": "LLeg_Burn_40", "directions": 4},
-		{"name": "RArm_Burn_40", "directions": 4},
-		{"name": "RLeg_Burn_40", "directions": 4},
-		{"name": "Chest_Burn_40", "directions": 4},
+		{"name": "Head_Burn_30", "directions": 4},
+		{"name": "LArm_Burn_30", "directions": 4},
+		{"name": "LLeg_Burn_30", "directions": 4},
+		{"name": "RArm_Burn_30", "directions": 4},
+		{"name": "RLeg_Burn_30", "directions": 4},
+		{"name": "Chest_Burn_30", "directions": 4},
+		{"name": "Head_Burn_50", "directions": 4},
+		{"name": "LArm_Burn_50", "directions": 4},
+		{"name": "LLeg_Burn_50", "directions": 4},
+		{"name": "RArm_Burn_50", "directions": 4},
+		{"name": "RLeg_Burn_50", "directions": 4},
+		{"name": "Chest_Burn_50", "directions": 4},
+		{"name": "Head_Burn_70", "directions": 4},
+		{"name": "LArm_Burn_70", "directions": 4},
+		{"name": "LLeg_Burn_70", "directions": 4},
+		{"name": "RArm_Burn_70", "directions": 4},
+		{"name": "RLeg_Burn_70", "directions": 4},
+		{"name": "Chest_Burn_70", "directions": 4},
 		{"name": "Head_Burn_100", "directions": 4},
 		{"name": "LArm_Burn_100", "directions": 4},
 		{"name": "LLeg_Burn_100", "directions": 4},
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
index 2828b13ddba..4bc62a96b2d 100644
--- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "nuclearbomb_deployed"
     },
+    {
+      "name": "nuclearbomb_deployed_unlit"
+    },
     {
       "name": "nukefestive",
       "delays": [
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
index fa39a744cdd..4a01cf2d68f 100644
Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png differ
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed_unlit.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed_unlit.png
new file mode 100644
index 00000000000..bcc758ba58b
Binary files /dev/null and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed_unlit.png differ
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
index ac5c5d9654f..d7e07d88802 100644
Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png differ
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
index ee674e57dba..b59fac42b86 100644
Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png differ
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
index fc6d09bffac..cefaeebebfd 100644
--- a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
@@ -2,7 +2,7 @@
     "version": 1,
 
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/354d9635460c296dc7dce23ab39481dc4de6dc00",
+    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/354d9635460c296dc7dce23ab39481dc4de6dc00, signaller2 created by TheShuEd",
 
     "size": {
         "x": 32,
@@ -12,6 +12,10 @@
         {
             "name": "signaller",
             "directions": 1
+        },
+        {
+            "name": "signaller2",
+            "directions": 1
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png b/Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png
new file mode 100644
index 00000000000..799a7be6ea9
Binary files /dev/null and b/Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_medical.png b/Resources/Textures/Objects/Misc/books.rsi/book_medical.png
new file mode 100644
index 00000000000..7152cfe51c6
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/book_medical.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_science.png b/Resources/Textures/Objects/Misc/books.rsi/book_science.png
new file mode 100644
index 00000000000..47047c958a0
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/book_science.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_security.png b/Resources/Textures/Objects/Misc/books.rsi/book_security.png
new file mode 100644
index 00000000000..fb1a4028e8f
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/book_security.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/meta.json b/Resources/Textures/Objects/Misc/books.rsi/meta.json
index daa28bac2aa..514e4075822 100644
--- a/Resources/Textures/Objects/Misc/books.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/books.rsi/meta.json
@@ -101,6 +101,15 @@
     },
     {
       "name": "book_fish"
+    },
+    {
+      "name": "book_science"
+    },
+    {
+      "name": "book_medical"
+    },
+    {
+      "name": "book_security"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/eight.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/eight.png
new file mode 100644
index 00000000000..71c38d8d78a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/eight.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/five.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/five.png
new file mode 100644
index 00000000000..a6576009303
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/five.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/four.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/four.png
new file mode 100644
index 00000000000..b8d7147896b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/four.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-left.png
new file mode 100644
index 00000000000..c093a11b0c6
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-right.png
new file mode 100644
index 00000000000..f0bc7094896
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/meta.json b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/meta.json
new file mode 100644
index 00000000000..4beec91793c
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified sprites made originally by tgstation @ https://github.com/tgstation/tgstation/commit/da42afcbaeaa04e5ba288ade027c011efb3ef0ab, Skarlet and Psychosyo. Modified by moomoobeef.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "one"
+    },
+    {
+      "name": "two"
+    },
+    {
+      "name": "three"
+    },
+    {
+      "name": "four"
+    },
+    {
+      "name": "five"
+    },
+    {
+      "name": "six"
+    },
+    {
+      "name": "seven"
+    },
+    {
+      "name": "eight"
+    },
+    {
+      "name": "nine"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/nine.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/nine.png
new file mode 100644
index 00000000000..a81db9fae74
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/nine.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/one.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/one.png
new file mode 100644
index 00000000000..22967c91b80
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/one.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/seven.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/seven.png
new file mode 100644
index 00000000000..eefe30609ef
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/seven.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/six.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/six.png
new file mode 100644
index 00000000000..7596aca7371
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/six.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/three.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/three.png
new file mode 100644
index 00000000000..f827e378a6c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/three.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/two.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/two.png
new file mode 100644
index 00000000000..7309c2ff9b9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/two.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png
new file mode 100644
index 00000000000..ded6b2eb773
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/harvest.png
new file mode 100644
index 00000000000..602809f9005
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json
new file mode 100644
index 00000000000..2799387216e
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856 seed modified by potato1234_x (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce.png
new file mode 100644
index 00000000000..e4fd37ff960
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png
new file mode 100644
index 00000000000..a4ad791bb1a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png
new file mode 100644
index 00000000000..1c710f40db2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png
new file mode 100644
index 00000000000..157a081b35d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png
new file mode 100644
index 00000000000..311098b975a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/icon-cart.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/icon-cart.png
new file mode 100644
index 00000000000..950afc95948
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/icon-cart.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
index db10fa1c5c9..28617ac255b 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
@@ -55,6 +55,9 @@
             "name": "cart_plunger",
             "directions": 4
         },
+        {
+            "name": "icon-cart"
+        },
         {
             "name": "cart_water-1",
             "directions": 4,
diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
index 79d08e485b9..e4f039ada9b 100644
--- a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
@@ -3,6 +3,7 @@
 	"license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93 and Taken from tgstation at https://github.com/tgstation/tgstation/blob/623290915c2292b56da11048deb62d758e1e3fb4/icons/obj/bloodpack.dmi, Blood pack redone by Ubaser",
   "copyright": "Taken from https://github.com/tgstation/tgstation/blob/a3568da5634e756d0849480104afda402c6f1c3c/icons/obj/medical/stack_medical.dmi",
+  "copyright": "Tourniquet Sprite by PoorMansDreams",
 	"size": {
 		"x": 32,
 		"y": 32
@@ -25,6 +26,9 @@
 		{
 			"name": "gauze"
 		},
+        {
+            "name": "tourniquet"
+        },
 		{
 			"name": "morphine"
 		},
diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet.png
new file mode 100644
index 00000000000..fce355eb9ef
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet.png differ
diff --git a/Resources/Textures/Objects/Specific/Security/barrier.rsi/deployed.png b/Resources/Textures/Objects/Specific/Security/barrier.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Security/barrier.rsi/deployed.png
rename to Resources/Textures/Objects/Specific/Security/barrier.rsi/locked.png
diff --git a/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json b/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json
index 8142924b683..5cd7cffb035 100644
--- a/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json
@@ -11,7 +11,7 @@
             "name": "idle"
         },
         {
-            "name": "deployed",
+            "name": "locked",
             "delays": [
                 [
                     0.1,
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png b/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
new file mode 100644
index 00000000000..5146156969b
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 47c69de0277..23868a906f4 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser.",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef.",
   "size": {
     "x": 32,
     "y": 32
@@ -73,6 +73,9 @@
         {
             "name": "disk"
         },
+        {
+            "name": "evidence_markers"
+        },
         {
             "name": "flashbang"
         },
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-BACKPACK.png
index 5481a4fcd45..4b7e877c752 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon-on.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon-on.png
index 8f7ae047c4a..a208328cde3 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon-on.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon-on.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon.png
index fe5a89a6f0e..520fea9edea 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-left.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-left.png
index cfa34df1c27..b5cb0af78b6 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-left.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-right.png
index ede83bd77da..447706bb91a 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-right.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json
index 8011c87a0e0..2fcae77e7b2 100644
--- a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455",
+  "copyright": "Drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-BACKPACK.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-BACKPACK.png
index 5481a4fcd45..c1cbd4967bc 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-BACKPACK.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png
index 14d2f9ef849..f548ef7ace9 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png and b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png
index e17ee0500b9..e3c0948112e 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png and b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index 05aeba33fd5..9fc66d78b90 100644
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -195,6 +195,12 @@
     {
       "name": "shuttlered"
     },
+    {
+      "name": "shuttlegrey"
+    },
+    {
+      "name": "shuttleblack"
+    },
     {
       "name": "carpetclown"
     },
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblack.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblack.png
new file mode 100644
index 00000000000..008eeb40e74
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblack.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png
index 8fc34f39126..4fc4076aee3 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlegrey.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlegrey.png
new file mode 100644
index 00000000000..4fd7069afe6
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlegrey.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png
index 517da853365..3433d217e27 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png
index c9459da1e8d..297822ee7f1 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png
index e4f073d6dc2..024fef68f1b 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png
index fcc482b34b2..ba8440cd33a 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/snow.png b/Resources/Textures/Objects/Tiles/tile.rsi/snow.png
index 8742892b236..385e2d59ac2 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/snow.png and b/Resources/Textures/Objects/Tiles/tile.rsi/snow.png differ
diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json b/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
index c1929a1efe3..e79ca362989 100644
--- a/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "/tg/station, 'icons/obj/device.dmi', commit 2b8b045d",
+	"copyright": "/tg/station, 'icons/obj/device.dmi' commit 2b8b045d, redrawn by Ubaser.",
 	"size": { "x": 32, "y": 32 },
 	"states": [
 		{ "name": "tray-on" , "delays": [[0.1, 1.0]]},
diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png
index d4a6da02cd4..9ca7ff2ca4c 100644
Binary files a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png and b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png differ
diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png
index 5f9c84afd85..5c4ba77cfed 100644
Binary files a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png and b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
index 023731bcb32..eb500042405 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
@@ -10,6 +10,9 @@
         {
             "name": "base"
         },
+        {
+            "name": "tip"
+        },
         {
             "name": "base-spent"
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/tip.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/tip.png
new file mode 100644
index 00000000000..78ff6a8dc18
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/tip.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/lock.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/lock.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/locked.png
diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json
index 0456b99ffab..5b5b51257ac 100644
--- a/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json
@@ -34,7 +34,7 @@
       ]
     },
     {
-      "name": "lock",
+      "name": "locked",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/core.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/core.png
new file mode 100644
index 00000000000..d37b98aa15a
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/core.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/meta.json
new file mode 100644
index 00000000000..94ffa2be6eb
--- /dev/null
+++ b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by TheShuEd (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "core"
+    },
+    {
+      "name": "pulse",
+      "delays": [
+        [
+          0.15625,
+          0.15625,
+          0.15625,
+          0.15625
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/pulse.png
new file mode 100644
index 00000000000..c9e239e5158
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/pulse.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/anom.png b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/anom.png
new file mode 100644
index 00000000000..d8a74d7f9cc
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/anom.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/meta.json
new file mode 100644
index 00000000000..4f02c929a9d
--- /dev/null
+++ b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by TheShuEd (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "anom",
+      "delays": [
+        [
+          0.25625,
+          0.25625,
+          0.25625
+        ]
+      ]
+    },
+    {
+      "name": "pulse",
+      "delays": [
+        [
+          0.15625,
+          0.15625,
+          0.15625,
+          0.15625,
+          0.15625,
+          0.15625
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/pulse.png
new file mode 100644
index 00000000000..81a8c923780
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/pulse.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-locked.png b/Resources/Textures/Structures/Storage/canister.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/canister.rsi/can-locked.png
rename to Resources/Textures/Structures/Storage/canister.rsi/locked.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
index 7f9dfe23402..95d67cc8ae1 100644
--- a/Resources/Textures/Structures/Storage/canister.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
@@ -23,10 +23,10 @@
       "name": "can-connector"
     },
     {
-      "name": "can-locked"
+      "name": "locked"
     },
     {
-      "name": "can-unlocked"
+      "name": "unlocked"
     },
     {
       "name": "can-o0",
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-unlocked.png b/Resources/Textures/Structures/Storage/canister.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/canister.rsi/can-unlocked.png
rename to Resources/Textures/Structures/Storage/canister.rsi/unlocked.png
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_12.png b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_12.png
new file mode 100644
index 00000000000..cce6fe0ba3c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_12.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_4.png b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_4.png
new file mode 100644
index 00000000000..08b6f664490
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_4.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_8.png b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_8.png
new file mode 100644
index 00000000000..6d980d1c67c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_8.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/caplaser.png b/Resources/Textures/Structures/Storage/glassbox.rsi/caplaser.png
new file mode 100644
index 00000000000..4af9023cd0c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/caplaser.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glass-4.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glass-4.png
new file mode 100644
index 00000000000..d321eb7fb12
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glass-4.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glass-up.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glass-up.png
new file mode 100644
index 00000000000..39a32dfef5c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glass-up.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glass.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glass.png
new file mode 100644
index 00000000000..1737ee03bda
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glass.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-empty-open.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-empty-open.png
new file mode 100644
index 00000000000..3a3bf591ca5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-empty-open.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-closed.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-closed.png
new file mode 100644
index 00000000000..b558cf5212c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-closed.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-open.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-open.png
new file mode 100644
index 00000000000..48db8e88e59
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-open.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox.png
new file mode 100644
index 00000000000..3a3bf591ca5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/locked.png b/Resources/Textures/Structures/Storage/glassbox.rsi/locked.png
new file mode 100644
index 00000000000..f5739c80587
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/meta.json b/Resources/Textures/Structures/Storage/glassbox.rsi/meta.json
new file mode 100644
index 00000000000..5ce653f37b1
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/glassbox.rsi/meta.json
@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/0129a094635aac51e00fdc7aa3b4248affc1f49d Sprite modified and updated by Nimfar11 (Github), Shatter resprite by KREKS",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "glass"
+    },
+    {
+      "name": "DamageOverlay_4"
+    },
+    {
+      "name": "DamageOverlay_8"
+    },
+    {
+      "name": "DamageOverlay_12"
+    },
+    {
+      "name": "glass-4"
+    },
+    {
+      "name": "glass-up"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "caplaser"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "glassbox"
+    },
+    {
+      "name": "glassbox-empty-open"
+    },
+    {
+      "name": "glassbox-filled-closed"
+    },
+    {
+      "name": "glassbox-filled-open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/unlocked.png b/Resources/Textures/Structures/Storage/glassbox.rsi/unlocked.png
new file mode 100644
index 00000000000..1c929003394
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/unlocked.png differ
diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml
index 3616d5a7ec4..e9795a358bc 100644
--- a/Resources/Textures/Tiles/attributions.yml
+++ b/Resources/Textures/Tiles/attributions.yml
@@ -66,9 +66,9 @@
   copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae"
   source: "https://github.com/tgstation/tgstation/"
 
-- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png"]
+- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png", "shuttlegrey.png", "shuttleblack.png"]
   license: "CC-BY-SA-3.0"
-  copyright: "paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris"
+  copyright: "Modified by Flareguy for Space Station 14. Unmodified sprite from paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris"
   source: "https://github.com/ParadiseSS13/Paradise"
 
 - files: ["deprecated.png"]
diff --git a/Resources/Textures/Tiles/shuttleblack.png b/Resources/Textures/Tiles/shuttleblack.png
new file mode 100644
index 00000000000..e5dc3ff666f
Binary files /dev/null and b/Resources/Textures/Tiles/shuttleblack.png differ
diff --git a/Resources/Textures/Tiles/shuttleblue.png b/Resources/Textures/Tiles/shuttleblue.png
index da848dec986..8a57cf8b0a1 100644
Binary files a/Resources/Textures/Tiles/shuttleblue.png and b/Resources/Textures/Tiles/shuttleblue.png differ
diff --git a/Resources/Textures/Tiles/shuttlegrey.png b/Resources/Textures/Tiles/shuttlegrey.png
new file mode 100644
index 00000000000..337fef7d30d
Binary files /dev/null and b/Resources/Textures/Tiles/shuttlegrey.png differ
diff --git a/Resources/Textures/Tiles/shuttleorange.png b/Resources/Textures/Tiles/shuttleorange.png
index 46f562b506c..0e42ad3467d 100644
Binary files a/Resources/Textures/Tiles/shuttleorange.png and b/Resources/Textures/Tiles/shuttleorange.png differ
diff --git a/Resources/Textures/Tiles/shuttlepurple.png b/Resources/Textures/Tiles/shuttlepurple.png
index 3e05a9676db..2236948d382 100644
Binary files a/Resources/Textures/Tiles/shuttlepurple.png and b/Resources/Textures/Tiles/shuttlepurple.png differ
diff --git a/Resources/Textures/Tiles/shuttlered.png b/Resources/Textures/Tiles/shuttlered.png
index 49b6665dd27..732cf385d64 100644
Binary files a/Resources/Textures/Tiles/shuttlered.png and b/Resources/Textures/Tiles/shuttlered.png differ
diff --git a/Resources/Textures/Tiles/shuttlewhite.png b/Resources/Textures/Tiles/shuttlewhite.png
index 1e2dd5d0d5e..1308a78d9e4 100644
Binary files a/Resources/Textures/Tiles/shuttlewhite.png and b/Resources/Textures/Tiles/shuttlewhite.png differ
diff --git a/Resources/clientCommandPerms.yml b/Resources/clientCommandPerms.yml
index f18dd0f81b1..99e0fea0c5a 100644
--- a/Resources/clientCommandPerms.yml
+++ b/Resources/clientCommandPerms.yml
@@ -39,6 +39,7 @@
     - replay_set_time
     - replay_stop
     - replay_load
+    - saveconfig
 
 - Flags: DEBUG
   Commands:
@@ -52,7 +53,7 @@
     - hidemechanisms
     - showmechanisms
     - menuvis
-    - togglehealthoverlay
+    - showhealthbars
     - toggledecals
     - nodevis
     - nodevisfilter
diff --git a/RobustToolbox b/RobustToolbox
index 9e0fc7017c4..ef0bc1a2e48 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 9e0fc7017c4740b6bc8302cb724dc7c3b60b3299
+Subproject commit ef0bc1a2e4878eedc24dd6fedc0631be56aca072