diff --git a/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs b/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs
index 845be2e429..b366ef6207 100644
--- a/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs
+++ b/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs
@@ -1,22 +1,16 @@
 using System.Linq;
 using Content.Shared.AlertLevel;
 using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Shared.Utility;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.AlertLevel;
 
 public sealed partial class AlertLevelDisplaySystem : EntitySystem
 {
     [Dependency] private SpriteSystem _sprite = default!;
+    [Dependency] private SharedAppearanceSystem _appearance = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<AlertLevelDisplayComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
-
+    [SubscribeLocalEvent]
     private void OnAppearanceChange(EntityUid uid, AlertLevelDisplayComponent alertLevelDisplay, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
@@ -25,24 +19,19 @@ public sealed partial class AlertLevelDisplaySystem : EntitySystem
         }
         var layer = _sprite.LayerMapReserve((uid, args.Sprite), AlertLevelDisplay.Layer);
 
-        if (args.AppearanceData.TryGetValue(AlertLevelDisplay.Powered, out var poweredObject))
+        if (_appearance.TryGetData<bool>(uid, AlertLevelDisplay.Powered, out var powered, component: args.Component))
         {
-            _sprite.LayerSetVisible((uid, args.Sprite), layer, poweredObject is true);
+            _sprite.LayerSetVisible((uid, args.Sprite), layer, powered);
         }
 
-        if (!args.AppearanceData.TryGetValue(AlertLevelDisplay.CurrentLevel, out var level))
+        if (!_appearance.TryGetData<ProtoId<AlertLevelPrototype>>(uid, AlertLevelDisplay.CurrentLevel, out var level, component: args.Component))
         {
             _sprite.LayerSetRsiState((uid, args.Sprite), layer, alertLevelDisplay.AlertVisuals.Values.First());
             return;
         }
 
-        if (alertLevelDisplay.AlertVisuals.TryGetValue((string)level, out var visual))
-        {
-            _sprite.LayerSetRsiState((uid, args.Sprite), layer, visual);
-        }
-        else
-        {
-            _sprite.LayerSetRsiState((uid, args.Sprite), layer, alertLevelDisplay.AlertVisuals.Values.First());
-        }
+        _sprite.LayerSetRsiState((uid, args.Sprite),
+            layer,
+            alertLevelDisplay.AlertVisuals.GetValueOrDefault(level) ?? alertLevelDisplay.AlertVisuals.Values.First());
     }
 }
diff --git a/Content.Client/Audio/Midi/MidiFileCollectionManager.cs b/Content.Client/Audio/Midi/MidiFileCollectionManager.cs
index 9f84fad30b..0f8308ed8b 100644
--- a/Content.Client/Audio/Midi/MidiFileCollectionManager.cs
+++ b/Content.Client/Audio/Midi/MidiFileCollectionManager.cs
@@ -15,7 +15,7 @@ public sealed partial class MidiFileCollectionManager : IPostInjectInit
     /// <summary>
     /// Directory path to use inside UserData for storing MIDIs.
     /// </summary>
-    private static readonly ResPath UserMidiDirectory = new("/UserMidis/");
+    public static readonly ResPath UserMidiDirectory = new("/UserMidis/");
 
     private const string SawmillCategory = "midifilecollection";
 
diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
index 7d2874bd11..7b39ad514b 100644
--- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
+++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
@@ -80,6 +80,10 @@ public sealed partial class SolutionContainerVisualsSystem : VisualizerSystem<So
                 changeColor = reagentProto.MetamorphicChangeColor;
                 fillSprite = reagentProto.MetamorphicSprite ?? fillSprite;
             }
+            else if (reagentProto?.MetamorphicSprite == null)
+                // The reagent has no metamorphic sprite, but the default one
+                // will still be used. So we set the fill to visible.
+                SpriteSystem.LayerSetVisible(ent, fillLayer, true);
             else
                 SpriteSystem.LayerSetVisible(ent, fillLayer, false);
         }
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
index 17248a8cce..9366e3ad12 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
@@ -1,97 +1,109 @@
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
+using Content.Shared.AlertLevel;
 using Content.Shared.Communications;
+using Content.Shared.Station;
 using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
-using Robust.Shared.Timing;
+using Robust.Shared.Prototypes;
 
-namespace Content.Client.Communications.UI
+namespace Content.Client.Communications.UI;
+
+public sealed partial class CommunicationsConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
 {
-    public sealed partial class CommunicationsConsoleBoundUserInterface : BoundUserInterface
+    [Dependency] private IConfigurationManager _cfg = default!;
+    [Dependency] private SharedStationSystem _station = default!;
+    [Dependency] private AlertLevelSystem _alertLevel = default!;
+
+    [ViewVariables]
+    private CommunicationsConsoleMenu? _menu;
+
+    protected override void Open()
     {
-        [Dependency] private IConfigurationManager _cfg = default!;
+        base.Open();
 
-        [ViewVariables]
-        private CommunicationsConsoleMenu? _menu;
+        _menu = this.CreateWindow<CommunicationsConsoleMenu>();
+        _menu.OnAnnounce += AnnounceButtonPressed;
+        _menu.OnBroadcast += BroadcastButtonPressed;
+        _menu.OnAlertLevel += AlertLevelSelected;
+        _menu.OnEmergencyLevel += EmergencyShuttleButtonPressed;
+    }
 
-        public CommunicationsConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    public void AlertLevelSelected(ProtoId<AlertLevelPrototype> level)
+    {
+        if (_menu!.AlertLevelSelectable)
         {
+            // TODO: This does not work until the console UI is predicted and uses component states.
+            // Also someone decided to send BUI states regularly in an update loop, so this just gets randomly bulldozed until the message reaches the server.
+            // _menu.CurrentAlertLevel = level;
+            // _menu.AlertLevelSelectable = false;
+            // _menu.AlertLevelButton.Disabled = true;
+            SendMessage(new CommunicationsConsoleSelectAlertLevelMessage(level));
         }
+    }
 
-        protected override void Open()
+    public void EmergencyShuttleButtonPressed()
+    {
+        if (_menu!.CountdownStarted)
+            RecallShuttle();
+        else
+            CallShuttle();
+    }
+
+    public void AnnounceButtonPressed(string message)
+    {
+        var maxLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength);
+        var msg = SharedChatSystem.SanitizeAnnouncement(message, maxLength);
+        SendMessage(new CommunicationsConsoleAnnounceMessage(msg));
+    }
+
+    public void BroadcastButtonPressed(string message)
+    {
+        SendMessage(new CommunicationsConsoleBroadcastMessage(message));
+    }
+
+    public void CallShuttle()
+    {
+        SendMessage(new CommunicationsConsoleCallEmergencyShuttleMessage());
+    }
+
+    public void RecallShuttle()
+    {
+        SendMessage(new CommunicationsConsoleRecallEmergencyShuttleMessage());
+    }
+
+    // TODO: Use component states and update in an AfterAutoHandleState subscription
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not CommunicationsConsoleInterfaceState commsState)
+            return;
+
+        var stationUid = _station.GetOwningStation(Owner);
+
+        if (!EntMan.TryGetComponent<AlertLevelComponent>(stationUid, out var alertComp))
+            return;
+
+        if (_menu != null)
         {
-            base.Open();
+            _menu.CanAnnounce = commsState.CanAnnounce;
+            _menu.CanBroadcast = commsState.CanBroadcast;
+            _menu.CanCall = commsState.CanCall;
+            _menu.CountdownStarted = commsState.CountdownStarted;
+            _menu.CountdownEnd = commsState.ExpectedCountdownEnd;
 
-            _menu = this.CreateWindow<CommunicationsConsoleMenu>();
-            _menu.OnAnnounce += AnnounceButtonPressed;
-            _menu.OnBroadcast += BroadcastButtonPressed;
-            _menu.OnAlertLevel += AlertLevelSelected;
-            _menu.OnEmergencyLevel += EmergencyShuttleButtonPressed;
-        }
+            _menu.CurrentAlertLevel = alertComp.CurrentAlertLevel;
+            _menu.SelectableAlertLevels = _alertLevel.GetSelectableAlertLevels((stationUid.Value, alertComp));
+            _menu.AlertLevelSelectable = _alertLevel.CanChangeAlertLevel((stationUid.Value, alertComp));
 
-        public void AlertLevelSelected(string level)
-        {
-            if (_menu!.AlertLevelSelectable)
-            {
-                _menu.CurrentLevel = level;
-                SendMessage(new CommunicationsConsoleSelectAlertLevelMessage(level));
-            }
-        }
+            _menu.UpdateCountdown();
+            _menu.UpdateAlertLevels();
 
-        public void EmergencyShuttleButtonPressed()
-        {
-            if (_menu!.CountdownStarted)
-                RecallShuttle();
-            else
-                CallShuttle();
-        }
-
-        public void AnnounceButtonPressed(string message)
-        {
-            var maxLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength);
-            var msg = SharedChatSystem.SanitizeAnnouncement(message, maxLength);
-            SendMessage(new CommunicationsConsoleAnnounceMessage(msg));
-        }
-
-        public void BroadcastButtonPressed(string message)
-        {
-            SendMessage(new CommunicationsConsoleBroadcastMessage(message));
-        }
-
-        public void CallShuttle()
-        {
-            SendMessage(new CommunicationsConsoleCallEmergencyShuttleMessage());
-        }
-
-        public void RecallShuttle()
-        {
-            SendMessage(new CommunicationsConsoleRecallEmergencyShuttleMessage());
-        }
-
-        protected override void UpdateState(BoundUserInterfaceState state)
-        {
-            base.UpdateState(state);
-
-            if (state is not CommunicationsConsoleInterfaceState commsState)
-                return;
-
-            if (_menu != null)
-            {
-                _menu.CanAnnounce = commsState.CanAnnounce;
-                _menu.CanBroadcast = commsState.CanBroadcast;
-                _menu.CanCall = commsState.CanCall;
-                _menu.CountdownStarted = commsState.CountdownStarted;
-                _menu.AlertLevelSelectable = commsState.AlertLevels != null && !float.IsNaN(commsState.CurrentAlertDelay) && commsState.CurrentAlertDelay <= 0;
-                _menu.CurrentLevel = commsState.CurrentAlert;
-                _menu.CountdownEnd = commsState.ExpectedCountdownEnd;
-
-                _menu.UpdateCountdown();
-                _menu.UpdateAlertLevels(commsState.AlertLevels, _menu.CurrentLevel);
-                _menu.AlertLevelButton.Disabled = !_menu.AlertLevelSelectable;
-                _menu.EmergencyShuttleButton.Disabled = !_menu.CanCall;
-                _menu.AnnounceButton.Disabled = !_menu.CanAnnounce;
-                _menu.BroadcastButton.Disabled = !_menu.CanBroadcast;
-            }
+            _menu.AlertLevelButton.Disabled = !_menu.AlertLevelSelectable;
+            _menu.EmergencyShuttleButton.Disabled = !_menu.CanCall;
+            _menu.AnnounceButton.Disabled = !_menu.CanAnnounce;
+            _menu.BroadcastButton.Disabled = !_menu.CanBroadcast;
         }
     }
 }
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
index 6aa938b2c6..106a3093b9 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
@@ -1,10 +1,12 @@
 using System.Globalization;
 using Content.Client.UserInterface.Controls;
+using Content.Shared.AlertLevel;
 using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
 using Robust.Shared.Timing;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Communications.UI
@@ -19,13 +21,15 @@ namespace Content.Client.Communications.UI
         public bool CanAnnounce;
         public bool CanBroadcast;
         public bool CanCall;
-        public bool AlertLevelSelectable;
         public bool CountdownStarted;
-        public string CurrentLevel = string.Empty;
         public TimeSpan? CountdownEnd;
 
+        public ProtoId<AlertLevelPrototype>? CurrentAlertLevel;
+        public List<ProtoId<AlertLevelPrototype>> SelectableAlertLevels = new();
+        public bool AlertLevelSelectable;
+
         public event Action? OnEmergencyLevel;
-        public event Action<string>? OnAlertLevel;
+        public event Action<ProtoId<AlertLevelPrototype>>? OnAlertLevel;
         public event Action<string>? OnAnnounce;
         public event Action<string>? OnBroadcast;
 
@@ -61,7 +65,7 @@ namespace Content.Client.Communications.UI
             AlertLevelButton.OnItemSelected += args =>
             {
                 var metadata = AlertLevelButton.GetItemMetadata(args.Id);
-                if (metadata != null && metadata is string cast)
+                if (metadata != null && metadata is ProtoId<AlertLevelPrototype> cast)
                 {
                     OnAlertLevel?.Invoke(cast);
                 }
@@ -78,41 +82,32 @@ namespace Content.Client.Communications.UI
         {
             base.FrameUpdate(args);
             UpdateCountdown();
+            // TODO: Countdown for alert level delay
         }
 
-        // The current alert could make levels unselectable, so we need to ensure that the UI reacts properly.
-        // If the current alert is unselectable, the only item in the alerts list will be
-        // the current alert. Otherwise, it will be the list of alerts, with the current alert
-        // selected.
-        public void UpdateAlertLevels(List<string>? alerts, string currentAlert)
+        public void UpdateAlertLevels()
         {
             AlertLevelButton.Clear();
 
-            if (alerts == null)
+            if (CurrentAlertLevel == null)
+                return;
+
+            if (!AlertLevelSelectable)
             {
-                var name = currentAlert;
-                if (_loc.TryGetString($"alert-level-{currentAlert}", out var locName))
-                {
-                    name = locName;
-                }
+                // selection is locked, only show the current alert
+                var name = _loc.GetString($"alert-level-{CurrentAlertLevel}");
                 AlertLevelButton.AddItem(name);
-                AlertLevelButton.SetItemMetadata(AlertLevelButton.ItemCount - 1, currentAlert);
+                AlertLevelButton.SetItemMetadata(AlertLevelButton.ItemCount - 1, CurrentAlertLevel);
             }
             else
             {
-                foreach (var alert in alerts)
+                foreach (var alert in SelectableAlertLevels)
                 {
-                    var name = alert;
-                    if (_loc.TryGetString($"alert-level-{alert}", out var locName))
-                    {
-                        name = locName;
-                    }
+                    var name = _loc.GetString($"alert-level-{alert}");
                     AlertLevelButton.AddItem(name);
                     AlertLevelButton.SetItemMetadata(AlertLevelButton.ItemCount - 1, alert);
-                    if (alert == currentAlert)
-                    {
+                    if (alert == CurrentAlertLevel)
                         AlertLevelButton.Select(AlertLevelButton.ItemCount - 1);
-                    }
                 }
             }
         }
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index b40593389b..d2404cc5a4 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -111,7 +111,6 @@ namespace Content.Client.Entry
 
             _prototypeManager.RegisterIgnore("utilityQuery");
             _prototypeManager.RegisterIgnore("utilityCurvePreset");
-            _prototypeManager.RegisterIgnore("accent");
             _prototypeManager.RegisterIgnore("gasReaction");
             _prototypeManager.RegisterIgnore("seed"); // Seeds prototypes are server-only.
             _prototypeManager.RegisterIgnore("objective");
diff --git a/Content.Client/Instruments/UI/BandMenu.xaml b/Content.Client/Instruments/UI/BandMenu.xaml
deleted file mode 100644
index 620f38fa97..0000000000
--- a/Content.Client/Instruments/UI/BandMenu.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<DefaultWindow Title="{Loc 'instruments-component-band-menu'}" MinSize="250 350" xmlns="https://spacestation14.io"
-               xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <BoxContainer Orientation="Vertical" Align="Center" HorizontalExpand="true" VerticalExpand="true">
-        <ItemList Name="BandList" SelectMode="Button" Margin="3 3 3 3"
-                  HorizontalExpand="true" VerticalExpand="true" SizeFlagsStretchRatio="8"/>
-        <Button Name="RefreshButton" Text="{Loc 'instrument-component-band-refresh'}" TextAlign="Center"
-                HorizontalExpand="true" Margin="5 5 5 5" SizeFlagsStretchRatio="1"/>
-    </BoxContainer>
-</DefaultWindow>
diff --git a/Content.Client/Instruments/UI/BandMenu.xaml.cs b/Content.Client/Instruments/UI/BandMenu.xaml.cs
deleted file mode 100644
index 26cd1369e5..0000000000
--- a/Content.Client/Instruments/UI/BandMenu.xaml.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Timing;
-
-namespace Content.Client.Instruments.UI;
-
-[GenerateTypedNameReferences]
-public sealed partial class BandMenu : DefaultWindow
-{
-    private readonly InstrumentBoundUserInterface _owner;
-
-    public EntityUid? Master;
-
-    public BandMenu(InstrumentBoundUserInterface owner)
-    {
-        RobustXamlLoader.Load(this);
-
-        _owner = owner;
-        BandList.OnItemSelected += OnItemSelected;
-        RefreshButton.OnPressed += OnRefreshPressed;
-    }
-
-    private void OnRefreshPressed(BaseButton.ButtonEventArgs obj)
-    {
-        _owner.RefreshBands();
-    }
-
-    private void OnItemSelected(ItemList.ItemListSelectedEventArgs args)
-    {
-        _owner.Instruments.SetMaster(_owner.Owner, (EntityUid)args.ItemList[args.ItemIndex].Metadata!);
-        BandList.Clear();
-        Timer.Spawn(0, Close);
-    }
-
-    public void Populate((NetEntity, string)[] nearby, IEntityManager entManager)
-    {
-        BandList.Clear();
-
-        foreach (var (nent, name) in nearby)
-        {
-            var uid = entManager.GetEntity(nent);
-            var item = BandList.AddItem(name, null, true, uid);
-            item.Selected = Master == uid;
-        }
-    }
-}
diff --git a/Content.Client/Instruments/UI/BandMidiSource.xaml b/Content.Client/Instruments/UI/BandMidiSource.xaml
new file mode 100644
index 0000000000..649ea1de14
--- /dev/null
+++ b/Content.Client/Instruments/UI/BandMidiSource.xaml
@@ -0,0 +1,7 @@
+<ui:BandMidiSource xmlns="https://spacestation14.io"
+                   xmlns:ui="clr-namespace:Content.Client.Instruments.UI"
+                   Orientation="Vertical">
+    <Label Text="{Loc 'instruments-component-band-title-label'}" />
+    <ItemList Name="BandList" SelectMode="Button" HorizontalExpand="True" VerticalExpand="True" />
+    <Button Name="RefreshButton" Text="{Loc 'instruments-component-band-refresh'}" HorizontalExpand="True" />
+</ui:BandMidiSource>
diff --git a/Content.Client/Instruments/UI/BandMidiSource.xaml.cs b/Content.Client/Instruments/UI/BandMidiSource.xaml.cs
new file mode 100644
index 0000000000..7a04700302
--- /dev/null
+++ b/Content.Client/Instruments/UI/BandMidiSource.xaml.cs
@@ -0,0 +1,59 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Instruments.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class BandMidiSource : InstrumentMidiSourceBase
+{
+    /// <summary>
+    /// Raised when the list of currently available bands should be refreshed.
+    /// </summary>
+    public event Action? RefreshBandRequest;
+
+    /// <summary>
+    /// Raised when a band should be joined.
+    /// </summary>
+    public event Action<EntityUid>? JoinBandRequest;
+
+    public override string ButtonName => Loc.GetString("instruments-component-menu-band-midi-source-button");
+
+    public BandMidiSource()
+    {
+        RobustXamlLoader.Load(this);
+
+        RefreshButton.OnPressed += OnRefreshPressed;
+        BandList.OnItemSelected += OnBandItemSelected;
+    }
+
+    protected override void VisibilityChanged(bool newVisible)
+    {
+        if (newVisible)
+            RefreshBandRequest?.Invoke();
+    }
+
+    private void OnRefreshPressed(BaseButton.ButtonEventArgs _)
+    {
+        RefreshBandRequest?.Invoke();
+    }
+
+    private void OnBandItemSelected(ItemList.ItemListSelectedEventArgs args)
+    {
+        var instrumentEntity = (EntityUid)args.ItemList[args.ItemIndex].Metadata!;
+        JoinBandRequest?.Invoke(instrumentEntity);
+    }
+
+    /// <summary>
+    /// Replaces the current list of available bands with the passed one.
+    /// </summary>
+    /// <param name="entities">List of available entities for band joining.</param>
+    public void Populate(IEnumerable<(EntityUid, string)> entities)
+    {
+        BandList.Clear();
+        foreach (var tuple in entities)
+        {
+            BandList.AddItem(tuple.Item2, null, true, tuple.Item1);
+        }
+    }
+}
diff --git a/Content.Client/Instruments/UI/ChannelItem.xaml b/Content.Client/Instruments/UI/ChannelItem.xaml
new file mode 100644
index 0000000000..737d3b88c8
--- /dev/null
+++ b/Content.Client/Instruments/UI/ChannelItem.xaml
@@ -0,0 +1,19 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" HorizontalExpand="True">
+    <PanelContainer Name="ItemPanel">
+        <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat BackgroundColor="#00000044" />
+        </PanelContainer.PanelOverride>
+        <BoxContainer Orientation="Horizontal">
+            <Label Name="ChannelNumberLabel" Align="Right" HorizontalAlignment="Left" MinWidth="30" />
+            <controls:VSpacer Spacing="10" />
+            <Label Name="ChannelNameLabel" HorizontalAlignment="Center" />
+            <controls:VSpacer HorizontalExpand="True" />
+            <controls:SwitchButton Name="ChannelEnableSwitchButton"
+                                   HorizontalAlignment="Right"
+                                   OnStateText=""
+                                   OffStateText="" />
+        </BoxContainer>
+    </PanelContainer>
+</Control>
diff --git a/Content.Client/Instruments/UI/ChannelItem.xaml.cs b/Content.Client/Instruments/UI/ChannelItem.xaml.cs
new file mode 100644
index 0000000000..0a451136eb
--- /dev/null
+++ b/Content.Client/Instruments/UI/ChannelItem.xaml.cs
@@ -0,0 +1,71 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Input;
+
+namespace Content.Client.Instruments.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class ChannelItem : Control
+{
+    /// <summary>
+    /// Raised when a channel is toggled by the user.
+    /// </summary>
+    public event Action<int, bool>? SwitchFilteredChannel;
+
+    /// <summary>
+    ///  MIDI channel ID this item is assigned to.
+    /// </summary>
+    public int ChannelId
+    {
+        get;
+        set
+        {
+            field = value;
+            ChannelNumberLabel.Text = value.ToString();
+        }
+    }
+
+    /// <summary>
+    /// UI state (on/off) of this channel item.
+    /// </summary>
+    public bool ChannelState
+    {
+        get => ChannelEnableSwitchButton.Pressed;
+        set => ChannelEnableSwitchButton.Pressed = value;
+    }
+
+    /// <summary>
+    /// Name of this channel item in the UI.
+    /// </summary>
+    public string? ChannelName
+    {
+        get => ChannelNameLabel.Text;
+        set => ChannelNameLabel.Text = value;
+    }
+
+    public ChannelItem()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        ChannelEnableSwitchButton.OnPressed += OnChannelEnableSwitchButtonPressed;
+        MouseFilter = MouseFilterMode.Stop;
+    }
+
+    protected override void KeyBindUp(GUIBoundKeyEventArgs args)
+    {
+        base.KeyBindUp(args);
+        if (args.Function != EngineKeyFunctions.UIClick)
+            return;
+
+        ChannelState = !ChannelState;
+        SwitchFilteredChannel?.Invoke(ChannelId, ChannelState);
+    }
+
+    private void OnChannelEnableSwitchButtonPressed(BaseButton.ButtonEventArgs obj)
+    {
+        SwitchFilteredChannel?.Invoke(ChannelId, ChannelState);
+    }
+}
diff --git a/Content.Client/Instruments/UI/ChannelsControl.xaml b/Content.Client/Instruments/UI/ChannelsControl.xaml
new file mode 100644
index 0000000000..b3c69d660a
--- /dev/null
+++ b/Content.Client/Instruments/UI/ChannelsControl.xaml
@@ -0,0 +1,27 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <BoxContainer Orientation="Vertical">
+        <ScrollContainer MinHeight="90">
+            <BoxContainer Orientation="Vertical" Name="ChannelsContainer" SeparationOverride="3" />
+        </ScrollContainer>
+        <controls:HSpacer Spacing="10" />
+        <GridContainer Columns="5" HSeparationOverride="1" VSeparationOverride="1">
+            <!-- Name display selector -->
+            <Label Text="{Loc 'instruments-component-channels-name-display-selector-label'}" />
+            <controls:VSpacer Spacing="10" />
+            <Button Name="TrackSelectorButton"
+                    Text="{Loc 'instruments-component-channels-name-display-selector-track-button'}"
+                    HorizontalExpand="true"
+                    StyleClasses="OpenBoth" />
+            <Button Name="ProgramSelectorButton"
+                    Text="{Loc 'instruments-component-channels-name-display-selector-program-button'}"
+                    Pressed="True"
+                    HorizontalExpand="true"
+                    StyleClasses="OpenBoth" />
+            <Button Name="InstrumentSelectorButton"
+                    Text="{Loc 'instruments-component-channels-name-display-selector-instrument-button'}"
+                    HorizontalExpand="true"
+                    StyleClasses="OpenBoth" />
+        </GridContainer>
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Instruments/UI/ChannelsControl.xaml.cs b/Content.Client/Instruments/UI/ChannelsControl.xaml.cs
new file mode 100644
index 0000000000..3ae8292b6d
--- /dev/null
+++ b/Content.Client/Instruments/UI/ChannelsControl.xaml.cs
@@ -0,0 +1,116 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Audio.Midi;
+
+namespace Content.Client.Instruments.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class ChannelsControl : Control
+{
+    /// <summary>
+    /// Raised when a channel is toggled.
+    /// </summary>
+    public event Action<int, bool>? SwitchFilteredChannel;
+
+    /// <summary>
+    /// Raised when a selector button is pressed in order to display different channel names.
+    /// </summary>
+    public event Action? ChannelsUpdateRequest;
+
+    public ChannelsControl()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        TrackSelectorButton.OnPressed += OnSelectorButtonPressed;
+        InstrumentSelectorButton.OnPressed += OnSelectorButtonPressed;
+        ProgramSelectorButton.OnPressed += OnSelectorButtonPressed;
+
+        var group = new ButtonGroup();
+        TrackSelectorButton.Group = group;
+        InstrumentSelectorButton.Group = group;
+        ProgramSelectorButton.Group = group;
+
+        InitChannels();
+    }
+
+    protected override void VisibilityChanged(bool newVisible)
+    {
+        if (newVisible)
+            ChannelsUpdateRequest?.Invoke();
+    }
+
+    private void OnSelectorButtonPressed(BaseButton.ButtonEventArgs obj)
+    {
+        ChannelsUpdateRequest?.Invoke();
+    }
+
+    private void OnChannelSwitched(int id, bool state)
+    {
+        SwitchFilteredChannel?.Invoke(id, state);
+    }
+
+    private void InitChannels()
+    {
+        for (var i = 0; i < RobustMidiEvent.MaxChannels; i++)
+        {
+            var item = new ChannelItem
+            {
+                ChannelId = i,
+            };
+            ChannelsContainer.AddChild(item);
+            item.SwitchFilteredChannel += OnChannelSwitched;
+        }
+    }
+
+    /// <summary>
+    /// Replaces the current list of channels with the passed one.
+    /// </summary>
+    /// <remarks>
+    /// Calling this method overrides the toggle state of all channel items. Ensure to pass correct values.
+    /// </remarks>
+    /// <param name="channels">List of channels consisting of their index, display name and state.</param>
+    public void SetChannels(MidiChannelInfo[] channels)
+    {
+        TrackSelectorButton.Disabled = true;
+        InstrumentSelectorButton.Disabled = true;
+        ProgramSelectorButton.Disabled = true;
+
+        for (var i = 0; i < RobustMidiEvent.MaxChannels; i++)
+        {
+            if (i >= ChannelsContainer.ChildCount || i < 0)
+                return;
+
+            if (ChannelsContainer.Children[i] is not ChannelItem cItem)
+                return;
+
+            cItem.ChannelName = "";
+            cItem.ChannelState = false;
+            cItem.Visible = false;
+
+            if (i >= channels.Length)
+                continue;
+
+            var channel = channels[i];
+
+            if (channel.TrackName.Length > 0)
+                TrackSelectorButton.Disabled = false;
+            if (channel.InstrumentName.Length > 0)
+                InstrumentSelectorButton.Disabled = false;
+            if (channel.ProgramName.Length > 0)
+                ProgramSelectorButton.Disabled = false;
+
+            if (TrackSelectorButton.Pressed)
+                cItem.ChannelName = channel.TrackName;
+            if (InstrumentSelectorButton.Pressed)
+                cItem.ChannelName = channel.InstrumentName;
+            if (ProgramSelectorButton.Pressed)
+                cItem.ChannelName = channel.ProgramName;
+
+            cItem.ChannelState = channel.FilterState;
+            cItem.Visible = true;
+        }
+    }
+}
diff --git a/Content.Client/Instruments/UI/ChannelsMenu.xaml b/Content.Client/Instruments/UI/ChannelsMenu.xaml
deleted file mode 100644
index f902cad4d0..0000000000
--- a/Content.Client/Instruments/UI/ChannelsMenu.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<DefaultWindow Title="{Loc 'instruments-component-channels-menu'}" MinSize="250 350" xmlns="https://spacestation14.io"
-               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
-    <BoxContainer Orientation="Vertical" HorizontalExpand="true" VerticalExpand="true" Align="Center">
-        <ItemList Name="ChannelList" SelectMode="Multiple" Margin="3 3 3 3" HorizontalExpand="true" VerticalExpand="true" SizeFlagsStretchRatio="8"/>
-        <BoxContainer Orientation="Horizontal" HorizontalExpand="true" VerticalExpand="true" Align="Center"
-                      SizeFlagsStretchRatio="1">
-            <Button Name="AllButton" Text="{Loc 'instruments-component-channels-all-button'}" HorizontalExpand="true" VerticalExpand="true" SizeFlagsStretchRatio="1"/>
-            <Button Name="ClearButton" Text="{Loc 'instruments-component-channels-clear-button'}" HorizontalExpand="true" VerticalExpand="true" SizeFlagsStretchRatio="1"/>
-        </BoxContainer>
-        <controls:SwitchButton Name="DisplayTrackNames"
-                Text="{Loc 'instruments-component-channels-track-names-toggle'}"
-                Margin="0 5 0 0" />
-    </BoxContainer>
-</DefaultWindow>
diff --git a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs
deleted file mode 100644
index 513c07d9a5..0000000000
--- a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using Content.Shared.Instruments;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Audio.Midi;
-using Robust.Shared.Utility;
-
-namespace Content.Client.Instruments.UI;
-
-[GenerateTypedNameReferences]
-public sealed partial class ChannelsMenu : DefaultWindow
-{
-    [Dependency] private IEntityManager _entityManager = null!;
-
-    private readonly InstrumentBoundUserInterface _owner;
-
-    public ChannelsMenu(InstrumentBoundUserInterface owner) : base()
-    {
-        RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-        _owner = owner;
-
-        ChannelList.OnItemSelected += OnItemSelected;
-        ChannelList.OnItemDeselected += OnItemDeselected;
-        AllButton.OnPressed += OnAllPressed;
-        ClearButton.OnPressed += OnClearPressed;
-        DisplayTrackNames.OnPressed += OnDisplayTrackNamesPressed;
-    }
-
-    protected override void EnteredTree()
-    {
-        base.EnteredTree();
-
-        _owner.Instruments.OnChannelsUpdated += UpdateChannelList;
-    }
-
-    private void OnDisplayTrackNamesPressed(BaseButton.ButtonEventArgs obj)
-    {
-        Populate();
-    }
-
-    private void UpdateChannelList()
-    {
-        Populate(); // This is kind of in-efficent because we don't filter for which instrument updated its channels, but idc
-    }
-
-    protected override void ExitedTree()
-    {
-        base.ExitedTree();
-
-        _owner.Instruments.OnChannelsUpdated -= UpdateChannelList;
-    }
-
-    private void OnItemSelected(ItemList.ItemListSelectedEventArgs args)
-    {
-        _owner.Instruments.SetFilteredChannel(_owner.Owner, (int)ChannelList[args.ItemIndex].Metadata!, false);
-    }
-
-    private void OnItemDeselected(ItemList.ItemListDeselectedEventArgs args)
-    {
-        _owner.Instruments.SetFilteredChannel(_owner.Owner, (int)ChannelList[args.ItemIndex].Metadata!, true);
-    }
-
-    private void OnAllPressed(BaseButton.ButtonEventArgs obj)
-    {
-        foreach (var item in ChannelList)
-        {
-            // TODO: Make this efficient jfc
-            item.Selected = true;
-        }
-    }
-
-    private void OnClearPressed(BaseButton.ButtonEventArgs obj)
-    {
-        foreach (var item in ChannelList)
-        {
-            // TODO: Make this efficient jfc
-            item.Selected = false;
-        }
-    }
-
-    /// <summary>
-    /// Walks up the tree of instrument masters to find the truest master of them all.
-    /// </summary>
-    private ActiveInstrumentComponent ResolveActiveInstrument(InstrumentComponent? comp)
-    {
-        comp ??= _entityManager.GetComponent<InstrumentComponent>(_owner.Owner);
-
-        var instrument = new Entity<InstrumentComponent>(_owner.Owner, comp);
-
-        while (true)
-        {
-            if (instrument.Comp.Master == null)
-                break;
-
-            instrument = new Entity<InstrumentComponent>((EntityUid)instrument.Comp.Master,
-                _entityManager.GetComponent<InstrumentComponent>((EntityUid)instrument.Comp.Master));
-        }
-
-        return _entityManager.GetComponent<ActiveInstrumentComponent>(instrument.Owner);
-    }
-
-    public void Populate()
-    {
-        ChannelList.Clear();
-        var instrument = _entityManager.GetComponent<InstrumentComponent>(_owner.Owner);
-        var activeInstrument = ResolveActiveInstrument(instrument);
-
-        for (int i = 0; i < RobustMidiEvent.MaxChannels; i++)
-        {
-            var label = _owner.Loc.GetString("instrument-component-channel-name",
-                ("number", i));
-            if (activeInstrument != null
-                && activeInstrument.Tracks.TryGetValue(i, out var resolvedMidiChannel)
-                && resolvedMidiChannel != null)
-            {
-                if (DisplayTrackNames.Pressed)
-                {
-                    label = resolvedMidiChannel switch
-                    {
-                        { TrackName: not null, InstrumentName: not null } =>
-                            Loc.GetString("instruments-component-channels-multi",
-                                ("channel", i),
-                                ("name", resolvedMidiChannel.TrackName),
-                                ("other", resolvedMidiChannel.InstrumentName)),
-                        { TrackName: not null } =>
-                            Loc.GetString("instruments-component-channels-single",
-                            ("channel", i),
-                            ("name", resolvedMidiChannel.TrackName)),
-                        _ => label,
-                    };
-                }
-                else
-                {
-                    label = resolvedMidiChannel switch
-                    {
-                        { ProgramName: not null } =>
-                            Loc.GetString("instruments-component-channels-single",
-                                ("channel", i),
-                                ("name", resolvedMidiChannel.ProgramName)),
-                        _ => label,
-                    };
-                }
-            }
-
-            var item = ChannelList.AddItem(label, null, true, i);
-
-            item.Selected = !instrument?.FilteredChannels[i] ?? false;
-        }
-    }
-}
diff --git a/Content.Client/Instruments/UI/FileMidiSource.xaml b/Content.Client/Instruments/UI/FileMidiSource.xaml
new file mode 100644
index 0000000000..55e708df3a
--- /dev/null
+++ b/Content.Client/Instruments/UI/FileMidiSource.xaml
@@ -0,0 +1,38 @@
+<ui:FileMidiSource xmlns="https://spacestation14.io"
+                   xmlns:ui="clr-namespace:Content.Client.Instruments.UI"
+                   HorizontalExpand="True"
+                   Orientation="Vertical">
+
+    <!-- Track list -->
+    <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="0 0 0 20">
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+            <LineEdit Name="FilterBar" PlaceHolder="{Loc 'instruments-component-menu-files-filter'}"
+                      HorizontalExpand="True" />
+        </BoxContainer>
+        <ItemList Name="TrackList" SelectMode="Single" VerticalExpand="True" />
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+            <Button Name="AddButton" Text="{Loc 'instruments-component-menu-files-add-button'}" HorizontalExpand="True"
+                    StyleClasses="OpenRight" />
+            <Button Name="RemoveButton" Text="{Loc 'instruments-component-menu-files-remove-button'}" Disabled="True"
+                    HorizontalExpand="True" StyleClasses="OpenLeft" />
+        </BoxContainer>
+    </BoxContainer>
+
+    <!-- Current track label -->
+    <Label Name="CurrentTrackLabel" MinHeight="24" />
+
+    <!-- Track position -->
+    <Slider Name="PlaybackSlider" HorizontalExpand="True" />
+
+    <!-- Track controls -->
+    <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+        <Button Name="PlayButton" Text="{Loc 'instruments-component-menu-play-stop-button'}" ToggleMode="True"
+                Margin="0 0 20 0" />
+        <Button Name="LoopButton" Text="{Loc 'instruments-component-menu-loop-button'}" ToggleMode="True"
+                StyleClasses="OpenRight" />
+        <Button Name="ShuffleButton" Text="{Loc 'instruments-component-menu-shuffle-button'}" ToggleMode="True"
+                StyleClasses="OpenLeft" />
+        <BoxContainer HorizontalExpand="True" />
+        <Label Name="TimeLabel" Text="--:--/--:--" Align="Right" />
+    </BoxContainer>
+</ui:FileMidiSource>
diff --git a/Content.Client/Instruments/UI/FileMidiSource.xaml.cs b/Content.Client/Instruments/UI/FileMidiSource.xaml.cs
new file mode 100644
index 0000000000..caf0e852b0
--- /dev/null
+++ b/Content.Client/Instruments/UI/FileMidiSource.xaml.cs
@@ -0,0 +1,463 @@
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using Content.Client.Audio.Midi;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Input;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.Controls.BaseButton;
+using Range = Robust.Client.UserInterface.Controls.Range;
+
+namespace Content.Client.Instruments.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class FileMidiSource : InstrumentMidiSourceBase
+{
+    private const double RecoveryGracePeriod = 2.0;
+
+    [Dependency] private IRobustRandom _random = default!;
+    [Dependency] private MidiFileCollectionManager _midiCollection = default!;
+    [Dependency] private IFileDialogManager _dialogs = default!;
+    [Dependency] private IUserInterfaceManager _userInterfaceManager = default!;
+
+    /// <summary>
+    /// Raised when MIDI data should be played.
+    /// </summary>
+    public event Action<byte[]>? StartPlayingRequest;
+
+    /// <summary>
+    /// Raised when any currently playing MIDI track should be stopped.
+    /// </summary>
+    public event Action? StopPlayingRequest;
+
+    /// <summary>
+    /// Raised when the track position on the currently playing MIDI track should change.
+    /// </summary>
+    public event Action<int>? TrackPositionChangeRequest;
+
+    /// <summary>
+    /// Raised when looping MIDI tracks is toggled.
+    /// </summary>
+    public event Action<bool>? LoopingToggled;
+
+    private readonly List<ResPath> _loadedTracks = [];
+    private bool _isMidiFileDialogueWindowOpen;
+    private bool _selectedInternally;
+    private float _timeSinceLastRecoverAttempt;
+
+    /// <summary>
+    /// The Instrument playing the tracks. This is needed for the UI to read out current track time.
+    /// on <see cref="FrameUpdate" />.
+    /// </summary>
+    public Entity<InstrumentComponent> Instrument;
+
+    private bool IsShuffle => ShuffleButton.Pressed;
+    private string CurrentFilter => FilterBar.Text;
+
+    /// <inheritdoc />
+    public override string ButtonName => Loc.GetString("instruments-component-menu-file-midi-source-button");
+
+    /// <summary>
+    /// Controls if MIDI should currently be played. This is connected to the play button.
+    /// </summary>
+    public bool IsPlaying
+    {
+        get => PlayButton.Pressed;
+        set => PlayButton.Pressed = value;
+    }
+
+    public FileMidiSource()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        CurrentTrackLabel.Text = string.Empty;
+
+        _midiCollection.MidiFileAdded += AddTrack;
+        _midiCollection.MidiFileRemoved += RemoveTrack;
+        _midiCollection.MidiFilesReset += ReloadTrackList;
+
+        FilterBar.OnTextChanged += OnFilterBarTextChanged;
+        TrackList.OnItemSelected += OnTrackListItemSelected;
+        TrackList.OnItemDeselected += OnTrackListItemDeselected;
+        AddButton.OnPressed += OnAddButtonPressed;
+        RemoveButton.OnPressed += OnRemoveButtonPressed;
+        PlayButton.OnToggled += OnPlayButtonToggled;
+        LoopButton.OnToggled += OnLoopButtonToggled;
+        ShuffleButton.OnPressed += OnShuffleButtonPressed;
+        PlaybackSlider.OnValueChanged += OnPlaybackSliderValueChanged;
+        PlaybackSlider.OnKeyBindUp += OnPlaybackSliderKeyBindUp;
+
+        RemoveButton.TooltipSupplier = SupplyFileManagementTooltip;
+        ReloadTrackList();
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (PlaybackSlider.Grabbed)
+            return;
+
+        // Disable the playback button when nothing is selected and playing.
+        PlayButton.Disabled = !TrackList.GetSelected().Any() && !Instrument.Comp.IsRendererAlive;
+
+        if (!Instrument.Comp.IsMidiOpen)
+        {
+            ResetTrackIndicators();
+            PlaybackSlider.Disabled = true;
+
+            // My patience with the InstrumentSystem ran out, the system will be asked to play tracks until it behaves.
+            if (!IsPlaying)
+                return;
+
+            _timeSinceLastRecoverAttempt += args.DeltaSeconds;
+            if (!(_timeSinceLastRecoverAttempt > RecoveryGracePeriod))
+                return;
+
+            _timeSinceLastRecoverAttempt = 0;
+            ReplayCurrentTrack();
+        }
+        else if (Instrument.Comp.IsRendererAlive)
+        {
+            PlaybackSlider.Disabled = false;
+            PlaybackSlider.MaxValue = Instrument.Comp.PlayerTotalTick;
+            PlaybackSlider.SetValueWithoutEvent(Instrument.Comp.PlayerTick);
+            // TODO: SequencerTimeScale does not return the actual ticks/seconds, find solution.
+            var totalTime =
+                TimeSpan.FromSeconds(Math.Ceiling(Instrument.Comp.PlayerTotalTick /
+                                                  Instrument.Comp.Renderer!.SequencerTimeScale));
+            var currentTime =
+                TimeSpan.FromSeconds(Math.Ceiling(Instrument.Comp.PlayerTick /
+                                                  Instrument.Comp.Renderer!.SequencerTimeScale));
+            TimeLabel.Text = totalTime.Hours < 1
+                ? Loc.GetString(
+                    "instruments-component-menu-files-track-playtime-seconds-minutes",
+                    ("currentMinutes", currentTime.ToString("mm")),
+                    ("currentSeconds", currentTime.ToString("ss")),
+                    ("totalMinutes", totalTime.ToString("mm")),
+                    ("totalSeconds", totalTime.ToString("ss")))
+                : Loc.GetString(
+                    "instruments-component-menu-files-track-playtime-seconds-minutes-hours",
+                    ("currentHours", currentTime.ToString("hh")),
+                    ("currentMinutes", currentTime.ToString("mm")),
+                    ("currentSeconds", currentTime.ToString("ss")),
+                    ("totalHours", totalTime.ToString("hh")),
+                    ("totalMinutes", totalTime.ToString("mm")),
+                    ("totalSeconds", totalTime.ToString("ss")));
+        }
+    }
+
+    public override void Disable()
+    {
+        base.Disable();
+        TrackList.ClearSelected();
+        IsPlaying = false;
+        StopPlayingRequest?.Invoke();
+        CurrentTrackLabel.Text = string.Empty;
+    }
+
+    private void OnFilterBarTextChanged(LineEdit.LineEditEventArgs obj)
+    {
+        FilterTrackList();
+    }
+
+    private void OnTrackListItemSelected(ItemList.ItemListSelectedEventArgs obj)
+    {
+        UpdateFileRemoveButton();
+        if (!_selectedInternally)
+        {
+            IsPlaying = false;
+            StopPlaying();
+        }
+        else
+        {
+            PlayTrackListItem(obj.ItemIndex);
+        }
+    }
+
+    private void OnTrackListItemDeselected(ItemList.ItemListDeselectedEventArgs obj)
+    {
+        RemoveButton.Disabled = true;
+    }
+
+    private async void OnAddButtonPressed(ButtonEventArgs obj)
+    {
+        try
+        {
+            if (_isMidiFileDialogueWindowOpen)
+                return;
+
+            var filters = new FileDialogFilters(new FileDialogFilters.Group("mid", "midi"));
+
+            // TODO: Once the file dialogue manager can handle focusing or closing windows, improve this logic to close
+            //  or focus the previously-opened window.
+            _isMidiFileDialogueWindowOpen = true;
+            var (stream, name) = await _dialogs.GetFileAndName(filters, FileAccess.Read);
+            await using (stream)
+            {
+                // did the instrument menu get closed while waiting for the user to select a file?
+                if (Disposed)
+                    return;
+
+                if (stream == null)
+                    return;
+
+                if (name != null)
+                    await _midiCollection.AddMidiFile(new ResPath(name), stream);
+            }
+        }
+        catch
+        {
+            _userInterfaceManager.Popup(Loc.GetString("instruments-component-menu-files-error"));
+        }
+        finally
+        {
+            _isMidiFileDialogueWindowOpen = false;
+        }
+    }
+
+    private void OnRemoveButtonPressed(ButtonEventArgs obj)
+    {
+        if (TryGetSelectedTrackPath(out var trackPath) && trackPath is { } resPath)
+            _midiCollection.RemoveMidiFile(resPath);
+        UpdateFileRemoveButton();
+    }
+
+    private void OnPlayButtonToggled(ButtonToggledEventArgs obj)
+    {
+        UpdateFileRemoveButton();
+        if (PlayButton.Pressed)
+        {
+            if (!TryGetSelectedTrack(out var track))
+                return;
+
+            StartPlaying(track);
+        }
+        else
+        {
+            StopPlaying();
+        }
+    }
+
+    private void OnLoopButtonToggled(ButtonToggledEventArgs obj)
+    {
+        if (LoopButton.Pressed && ShuffleButton.Pressed)
+            ShuffleButton.Pressed = false;
+
+        LoopingToggled?.Invoke(LoopButton.Pressed);
+    }
+
+    private void OnShuffleButtonPressed(ButtonEventArgs obj)
+    {
+        if (ShuffleButton.Pressed && LoopButton.Pressed)
+        {
+            LoopingToggled?.Invoke(false);
+            LoopButton.Pressed = false;
+        }
+
+        if (obj.Button.Pressed && !TrackList.GetSelected().Any())
+            TrackList[_random.Next(0, TrackList.Count)].Selected = true;
+    }
+
+    private void OnPlaybackSliderValueChanged(Range _)
+    {
+        // Do not seek while still grabbing.
+        if (PlaybackSlider.Grabbed)
+            return;
+
+        TrackPositionChangeRequest?.Invoke((int)Math.Ceiling(PlaybackSlider.Value));
+    }
+
+    private void OnPlaybackSliderKeyBindUp(GUIBoundKeyEventArgs obj)
+    {
+        if (obj.Function != EngineKeyFunctions.UIClick)
+            return;
+
+        TrackPositionChangeRequest?.Invoke((int)Math.Ceiling(PlaybackSlider.Value));
+    }
+
+    private Tooltip? SupplyFileManagementTooltip(Control? sender)
+    {
+        if (sender is not Button { Disabled: true })
+            return null;
+
+        var tooltipText = Loc.GetString("instruments-component-menu-files-file-remove-disabled-info");
+        var tooltip = new Tooltip();
+        tooltip.SetMessage(FormattedMessage.FromUnformatted(tooltipText));
+        return tooltip;
+    }
+
+    private void UpdateFileRemoveButton()
+    {
+        RemoveButton.Disabled = !TrackList.GetSelected().Any() || IsPlaying;
+    }
+
+    private void ResetTrackIndicators()
+    {
+        PlaybackSlider.MaxValue = 1;
+        PlaybackSlider.SetValueWithoutEvent(0);
+        CurrentTrackLabel.Text = string.Empty;
+        TimeLabel.Text = "--.--/--.--";
+    }
+
+    private void PlayTrackListItem(int index)
+    {
+        if (index >= TrackList.Count || index < 0)
+            return;
+
+        if (TrackList[index] is not { } item)
+            return;
+
+        StartPlaying(item);
+    }
+
+    private void StopPlaying()
+    {
+        StopPlayingRequest?.Invoke();
+        ResetTrackIndicators();
+        UpdateFileRemoveButton();
+    }
+
+    private void StartPlaying(ItemList.Item item)
+    {
+        if (item.Metadata is not ResPath resPath)
+            return;
+
+        if (item.Text == null)
+            return;
+
+        _timeSinceLastRecoverAttempt = 0;
+        var midiData = _midiCollection.GetMidiData(resPath);
+        StartPlayingRequest?.Invoke(midiData);
+        CurrentTrackLabel.Text = item.Text;
+        UpdateFileRemoveButton();
+    }
+
+    private void FilterTrackList()
+    {
+        var filterString = CurrentFilter.Trim().ToLowerInvariant();
+        TrackList.Clear();
+
+        foreach (var track in _loadedTracks)
+        {
+            var trackName = track.FilenameWithoutExtension.Trim().ToLowerInvariant();
+            if (trackName.Contains(filterString))
+                TrackList.AddItem(track.FilenameWithoutExtension, null, true, track);
+        }
+    }
+
+    private bool TryGetSelectedTrackPath([NotNullWhen(true)] out ResPath? trackPath)
+    {
+        trackPath = null;
+        if (!TryGetSelectedTrack(out var item) || item.Metadata is not ResPath resPath)
+            return false;
+
+        trackPath = resPath;
+        return true;
+    }
+
+    private bool TryGetSelectedTrack([NotNullWhen(true)] out ItemList.Item? item)
+    {
+        return TrackList.GetSelected().TryFirstOrDefault(out item);
+    }
+
+    private void AddTrack(ResPath trackPath)
+    {
+        _loadedTracks.Add(trackPath);
+        FilterTrackList();
+    }
+
+    private void RemoveTrack(ResPath trackPath)
+    {
+        _loadedTracks.Remove(trackPath);
+        FilterTrackList();
+    }
+
+    private void ReloadTrackList()
+    {
+        _loadedTracks.Clear();
+        _loadedTracks.AddRange(_midiCollection.GetMidiFiles());
+        FilterTrackList();
+    }
+
+    private void ReplayCurrentTrack()
+    {
+        if (!TryGetSelectedTrack(out var track))
+            return;
+
+        StartPlaying(track);
+    }
+
+    /// <summary>
+    /// Selects the next MIDI track from the list according to shuffle and filter settings.
+    /// </summary>
+    /// <remarks>Selecting another track causes its playback if <see cref="IsPlaying" /> is true.</remarks>
+    public void SelectNextTrack()
+    {
+        // Only proceed if file panel is active.
+        if (!Enabled)
+            return;
+
+        // Only proceed if the play button is pressed.
+        if (!IsPlaying)
+            return;
+
+        // List is empty, return
+        if (TrackList.Count == 0)
+            return;
+
+        _selectedInternally = true;
+        try
+        {
+            if (IsShuffle)
+            {
+                var randomIndex = _random.Next(0, TrackList.Count);
+                var randomTrack = TrackList[randomIndex];
+                if (randomTrack.Selected)
+                {
+                    // Try going one up or down if we roll the already selected track.
+                    if (TrackList.Count - 1 > randomIndex)
+                        TrackList[randomIndex + 1].Selected = true;
+                    else if (randomIndex > 0)
+                        TrackList[randomIndex - 1].Selected = true;
+                    else
+                        randomTrack.Selected = true;
+                }
+                else
+                {
+                    randomTrack.Selected = true;
+                }
+            }
+            else
+            {
+                if (!TryGetSelectedTrack(out var item))
+                {
+                    TrackList[0].Selected = true;
+                    return;
+                }
+
+                for (var i = 0; i < TrackList.Count - 1; i++)
+                {
+                    if (TrackList[i] != item)
+                        continue;
+                    TrackList[i + 1].Selected = true;
+                    return;
+                }
+
+                TrackList[0].Selected = false;
+                TrackList[0].Selected = true;
+            }
+        }
+        finally
+        {
+            _selectedInternally = false;
+        }
+    }
+}
diff --git a/Content.Client/Instruments/UI/InputMidiSource.xaml b/Content.Client/Instruments/UI/InputMidiSource.xaml
new file mode 100644
index 0000000000..a0086e7763
--- /dev/null
+++ b/Content.Client/Instruments/UI/InputMidiSource.xaml
@@ -0,0 +1,6 @@
+<ui:InputMidiSource xmlns="https://spacestation14.io"
+                    xmlns:ui="clr-namespace:Content.Client.Instruments.UI"
+                    Orientation="Vertical">
+    <Label Text="{Loc 'instruments-component-menu-input-notice-label'}" Align="Center" HorizontalExpand="True"
+           VerticalExpand="True" />
+</ui:InputMidiSource>
diff --git a/Content.Client/Instruments/UI/InputMidiSource.xaml.cs b/Content.Client/Instruments/UI/InputMidiSource.xaml.cs
new file mode 100644
index 0000000000..88d06dd0f6
--- /dev/null
+++ b/Content.Client/Instruments/UI/InputMidiSource.xaml.cs
@@ -0,0 +1,38 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Instruments.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class InputMidiSource : InstrumentMidiSourceBase
+{
+    /// <summary>
+    /// Raised when MIDI Input via system hardware should be opened.
+    /// </summary>
+    public event Action? OpenInputRequest;
+
+    /// <summary>
+    /// Raised when MIDI Input should be closed.
+    /// </summary>
+    public event Action? CloseInputRequest;
+
+    /// <inheritdoc />
+    public override string ButtonName => Loc.GetString("instruments-component-menu-input-midi-source-button");
+
+    public InputMidiSource()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public override void Enable()
+    {
+        base.Enable();
+        OpenInputRequest?.Invoke();
+    }
+
+    public override void Disable()
+    {
+        base.Disable();
+        CloseInputRequest?.Invoke();
+    }
+}
diff --git a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
index fc932825e8..e12f2e4e53 100644
--- a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
+++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
@@ -1,115 +1,324 @@
+using Content.Client.Interactable;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Instruments;
 using Content.Shared.Instruments.UI;
-using Content.Shared.Interaction;
 using Robust.Client.Audio.Midi;
-using Robust.Client.Player;
 using Robust.Client.UserInterface;
+using Robust.Shared.Audio.Midi;
+using Robust.Shared.Containers;
+using Robust.Shared.Utility;
 
-namespace Content.Client.Instruments.UI
+namespace Content.Client.Instruments.UI;
+
+public sealed partial class InstrumentBoundUserInterface : BoundUserInterface
 {
-    public sealed partial class InstrumentBoundUserInterface : BoundUserInterface
+    private const int MaxSearchDepth = 16;
+    private const string SawmillCategory = "instrumentui";
+
+    [Dependency] private IMidiManager _midiManager = default!;
+    [Dependency] private ILocalizationManager _loc = default!;
+    [Dependency] private ILogManager _logManager = default!;
+    [Dependency] private InstrumentSystem _instruments = default!;
+    [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!;
+    [Dependency] private InteractionSystem _interactionSystem = default!;
+    [Dependency] private SharedContainerSystem _sharedContainerSystem = default!;
+    private readonly ISawmill _sawmill = default!;
+
+    private readonly FileMidiSource _fileSource = new();
+    private readonly BandMidiSource _bandSource = new();
+    private readonly InputMidiSource _inputSource = new();
+
+    private readonly ChannelsControl _channelsControl = new();
+    private readonly MidiCollectionUtilsControl _midiCollectionUtilsControl = new();
+
+    private InstrumentMenu? _instrumentMenu;
+
+    public InstrumentBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
-        public IEntityManager Entities => EntMan;
-        [Dependency] public IMidiManager MidiManager = default!;
-        [Dependency] public IFileDialogManager FileDialogManager = default!;
-        [Dependency] public ILocalizationManager Loc = default!;
+        _sawmill = _logManager.GetSawmill(SawmillCategory);
+    }
 
-        public readonly InstrumentSystem Instruments;
-        public readonly ActionBlockerSystem ActionBlocker;
-        public readonly SharedInteractionSystem Interactions;
+    protected override void Open()
+    {
+        base.Open();
 
-        [ViewVariables] private InstrumentMenu? _instrumentMenu;
-        [ViewVariables] private BandMenu? _bandMenu;
-        [ViewVariables] private ChannelsMenu? _channelsMenu;
+        var instrument = EntMan.GetComponent<InstrumentComponent>(Owner);
 
-        public InstrumentBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        instrument.OnMidiPlaybackEnded += OnMidiPlaybackEnded;
+
+        _instruments.OnChannelsUpdated += OnChannelsUpdated;
+
+        _fileSource.StartPlayingRequest += OnStartPlayingRequest;
+        _fileSource.StopPlayingRequest += OnStopPlayingRequest;
+        _fileSource.LoopingToggled += OnLoopToggledRequest;
+        _fileSource.TrackPositionChangeRequest += OnTrackPositionChangeRequest;
+        _fileSource.Instrument = (Owner, instrument);
+
+        _bandSource.RefreshBandRequest += OnRefreshBandsRequest;
+        _bandSource.JoinBandRequest += OnSetBandMasterRequest;
+
+        _inputSource.OpenInputRequest += OnOpenInputRequest;
+        _inputSource.CloseInputRequest += OnCloseInputRequest;
+
+        _channelsControl.ChannelsUpdateRequest += OnChannelsUpdateRequest;
+        _channelsControl.SwitchFilteredChannel += OnSwitchFilteredChannel;
+
+        _instrumentMenu = this.CreateWindow<InstrumentMenu>();
+
+        if (EntMan.TryGetComponent<MetaDataComponent>(Owner, out var metaData))
+            _instrumentMenu.Title = metaData.EntityName;
+
+        _instrumentMenu.SetMidiAvailability(_midiManager.IsAvailable);
+        _instrumentMenu.SetInstrument((Owner, instrument));
+
+        // Initialize sources and switch to the (probably) most used one.
+        // Add additional concrete InstrumentMidiSourceBase types here.
+        _instrumentMenu.SetupSources(_fileSource, _bandSource, _inputSource);
+        _instrumentMenu.SwitchMode(_fileSource);
+
+        // Initialize controls used to configure various system parameters.
+        // Append any additional configuration controls here.
+        _instrumentMenu.AddConfigurationControl(
+            _loc.GetString("instruments-component-menu-channels-label"),
+            _channelsControl);
+        _instrumentMenu.AddConfigurationControl(
+            _loc.GetString("instruments-component-midi-file-collection-label"),
+            _midiCollectionUtilsControl);
+    }
+
+    protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+    {
+        if (message is not InstrumentBandResponseBuiMessage bandRx)
+            return;
+
+        var entities = new List<(EntityUid, string)>();
+        foreach (var netEnt in bandRx.Nearby)
         {
-            IoCManager.InjectDependencies(this);
-
-            Instruments = Entities.System<InstrumentSystem>();
-            ActionBlocker = Entities.System<ActionBlockerSystem>();
-            Interactions = Entities.System<SharedInteractionSystem>();
+            entities.Add((EntMan.GetEntity(netEnt.Item1), netEnt.Item2));
         }
 
-        protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+        _bandSource.Populate(entities);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+            return;
+
+        _fileSource.StartPlayingRequest -= OnStartPlayingRequest;
+        _fileSource.StopPlayingRequest -= OnStopPlayingRequest;
+        _fileSource.LoopingToggled -= OnLoopToggledRequest;
+        _fileSource.TrackPositionChangeRequest -= OnTrackPositionChangeRequest;
+
+        _bandSource.RefreshBandRequest -= OnRefreshBandsRequest;
+        _bandSource.JoinBandRequest -= OnSetBandMasterRequest;
+
+        _inputSource.OpenInputRequest -= OnOpenInputRequest;
+        _inputSource.CloseInputRequest -= OnCloseInputRequest;
+
+        if (!EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
+            return;
+
+        _fileSource.Instrument = (Owner, instrument);
+        instrument.OnMidiPlaybackEnded -= OnMidiPlaybackEnded;
+    }
+
+    private void OnSwitchFilteredChannel(int channelIndex, bool state)
+    {
+        _instruments.SetFilteredChannel(Owner, channelIndex, !state);
+    }
+
+    private void OnChannelsUpdateRequest()
+    {
+        UpdateChannels();
+    }
+
+    private void OnChannelsUpdated()
+    {
+        UpdateChannels();
+    }
+
+    private void OnMidiPlaybackEnded()
+    {
+        _fileSource.SelectNextTrack();
+    }
+
+    private void OnSetBandMasterRequest(EntityUid ent)
+    {
+        if (!PlayCheck())
+            return;
+
+        _instruments.SetMaster(Owner, ent);
+    }
+
+    private void OnRefreshBandsRequest()
+    {
+        SendMessage(new InstrumentBandRequestBuiMessage());
+    }
+
+    private void OnLoopToggledRequest(bool toggled)
+    {
+        if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrumentComp))
         {
-            if (message is InstrumentBandResponseBuiMessage bandRx)
-                _bandMenu?.Populate(bandRx.Nearby, EntMan);
+            instrumentComp.LoopMidi = toggled;
         }
 
-        protected override void Open()
+        _instruments.UpdateRenderer(Owner);
+    }
+
+    private void OnTrackPositionChangeRequest(int value)
+    {
+        _instruments.SetPlayerTick(Owner, value);
+    }
+
+    private void OnOpenInputRequest()
+    {
+        if (!PlayCheck())
+            return;
+
+        if (!EntMan.TryGetComponent<InstrumentComponent>(Owner, out var instrument))
+            return;
+
+        _instruments.OpenInput(Owner, instrument);
+    }
+
+    private void OnCloseInputRequest()
+    {
+        if (!EntMan.TryGetComponent<InstrumentComponent>(Owner, out var instrument))
+            return;
+
+        _instruments.CloseInput(Owner, false, instrument);
+    }
+
+    private void OnStopPlayingRequest()
+    {
+        if (!EntMan.TryGetComponent<InstrumentComponent>(Owner, out var instrument))
+            return;
+
+        _instruments.CloseMidi(Owner, false, instrument);
+    }
+
+    private void OnStartPlayingRequest(byte[] trackData)
+    {
+        try
         {
-            base.Open();
-
-            _instrumentMenu = this.CreateWindow<InstrumentMenu>();
-            _instrumentMenu.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
-
-            _instrumentMenu.OnOpenBand += OpenBandMenu;
-            _instrumentMenu.OnOpenChannels += OpenChannelsMenu;
-            _instrumentMenu.OnCloseChannels += CloseChannelsMenu;
-            _instrumentMenu.OnCloseBands += CloseBandMenu;
-
-            _instrumentMenu.SetMIDI(MidiManager.IsAvailable);
-
-            if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
-            {
-                _instrumentMenu.SetInstrument((Owner, instrument));
-            }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
+            if (!EntMan.TryGetComponent<InstrumentComponent>(Owner, out var instrument))
                 return;
 
-            if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
-            {
-                _instrumentMenu?.RemoveInstrument(instrument);
-            }
+            // Close any song that is already playing.
+            if (instrument.IsMidiOpen)
+                _instruments.CloseMidi(Owner, false, instrument);
 
-            _bandMenu?.Dispose();
-            _channelsMenu?.Dispose();
+            if (!_fileSource.IsPlaying)
+                return;
+
+            if (!PlayCheck())
+                return;
+
+            if (!_instruments.OpenMidi(Owner, trackData, instrument))
+                _fileSource.IsPlaying = false;
         }
-
-        public void RefreshBands()
+        catch (Exception e)
         {
-            SendMessage(new InstrumentBandRequestBuiMessage());
-        }
-
-        public void OpenBandMenu()
-        {
-            _bandMenu ??= new BandMenu(this);
-
-            if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
-            {
-                _bandMenu.Master = instrument.Master;
-            }
-
-            // Refresh cache...
-            RefreshBands();
-
-            _bandMenu.OpenCenteredLeft();
-        }
-
-        public void CloseBandMenu()
-        {
-            if(_bandMenu?.IsOpen ?? false)
-                _bandMenu.Close();
-        }
-
-        public void OpenChannelsMenu()
-        {
-            _channelsMenu ??= new ChannelsMenu(this);
-            _channelsMenu.Populate();
-            _channelsMenu.OpenCenteredRight();
-        }
-
-        public void CloseChannelsMenu()
-        {
-            if(_channelsMenu?.IsOpen ?? false)
-                _channelsMenu.Close();
+            _sawmill.Error($"Failed to play next midi track: {e.Message}");
+            _fileSource.IsPlaying = false;
         }
     }
+
+    private bool PlayCheck()
+    {
+        if (!EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
+            return false;
+
+        var localEntity = PlayerManager.LocalEntity;
+
+        // If we don't have a player or controlled entity, we return.
+        if (localEntity == null)
+            return false;
+
+        // By default, allow an instrument to play itself and skip all other checks
+        if (localEntity == Owner)
+            return true;
+
+        // If we're a handheld instrument, we might be in a container. Get it just in case.
+        _sharedContainerSystem.TryGetContainingContainer((Owner, null, null), out var conMan);
+
+        // If the instrument is handheld, and we're not holding it, we return.
+        if (instrument.Handheld && (conMan == null || conMan.Owner != localEntity))
+            return false;
+
+        if (!_actionBlockerSystem.CanInteract(localEntity.Value, Owner))
+            return false;
+
+        if (!_interactionSystem.InRangeUnobstructed(localEntity.Value, Owner))
+            return false;
+
+        return true;
+    }
+
+    /// <summary>
+    /// Walks up the tree of instrument masters to find the truest master of them all.
+    /// </summary>
+    private ActiveInstrumentComponent? ResolveActiveInstrument(InstrumentComponent comp)
+    {
+        var instrument = new Entity<InstrumentComponent>(Owner, comp);
+
+        for (var i = 0; i < MaxSearchDepth; i++)
+        {
+            if (instrument.Comp.Master is not { } master)
+                break;
+
+            if (!EntMan.TryGetComponent<InstrumentComponent>(master, out var masterComp))
+                break;
+
+            instrument = new Entity<InstrumentComponent>(master, masterComp);
+        }
+
+        return EntMan.GetComponentOrNull<ActiveInstrumentComponent>(instrument.Owner);
+    }
+
+    private void UpdateChannels()
+    {
+        if (!EntMan.TryGetComponent<InstrumentComponent>(Owner, out var instrument))
+            return;
+
+        List<MidiChannelInfo> channelSettings = [];
+
+        var activeInstrument = ResolveActiveInstrument(instrument);
+
+        for (var i = 0; i < RobustMidiEvent.MaxChannels; i++)
+        {
+            var trackName = "";
+            var instrumentName = "";
+            var programName = "";
+            if (activeInstrument != null
+                && activeInstrument.Tracks.TryGetValue(i, out var resolvedMidiChannel)
+                && resolvedMidiChannel != null)
+            {
+                trackName = resolvedMidiChannel.TrackName ?? "";
+                instrumentName = resolvedMidiChannel.InstrumentName ?? "";
+                programName = resolvedMidiChannel.ProgramName ?? "";
+                var state = !instrument?.FilteredChannels[i] ?? false;
+                channelSettings.Add(new MidiChannelInfo(i, trackName, instrumentName, programName, state));
+            }
+        }
+
+        _channelsControl.SetChannels(channelSettings.ToArray());
+    }
 }
+
+/// <summary>
+/// Simple DTO for relaying MIDI channel information
+/// </summary>
+/// <param name="Id">MIDI channel ID</param>
+/// <param name="TrackName">MIDI channel track name</param>
+/// <param name="ProgramName">MIDI channel track name</param>
+/// <param name="InstrumentName">MIDI channel track name</param>
+/// <param name="FilterState">MIDI channel filter state</param>
+public readonly record struct MidiChannelInfo(
+    int Id,
+    string TrackName,
+    string ProgramName,
+    string InstrumentName,
+    bool FilterState);
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml b/Content.Client/Instruments/UI/InstrumentMenu.xaml
index 691e3ce502..f9f024de95 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml
@@ -1,38 +1,39 @@
-<DefaultWindow xmlns="https://spacestation14.io"
-            xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <BoxContainer Orientation="Vertical" SeparationOverride="5">
-        <BoxContainer Orientation="Horizontal" VerticalExpand="True">
-            <Button Name="InputButton" ToggleMode="True" Text="{Loc 'instruments-component-menu-input-button'}" TextAlign="Center"
-                    HorizontalExpand="True" SizeFlagsStretchRatio="1" />
-            <Control HorizontalExpand="True" SizeFlagsStretchRatio="0.5" />
-            <Button Name="BandButton" Text="{Loc 'instruments-component-menu-band-button'}" TextAlign="Center" HorizontalExpand="True"
-                    SizeFlagsStretchRatio="1"/>
-            <Control HorizontalExpand="True" SizeFlagsStretchRatio="0.5" />
-            <Button Name="FileButton" Text="{Loc 'instruments-component-menu-play-button'}" TextAlign="Center" HorizontalExpand="True"
-                    SizeFlagsStretchRatio="1" />
-        </BoxContainer>
-        <BoxContainer Orientation="Horizontal" VerticalExpand="True">
-            <Button Name="LoopButton" ToggleMode="True" Text="{Loc 'instruments-component-menu-loop-button'}" TextAlign="Center" HorizontalExpand="True"
-                    SizeFlagsStretchRatio="1" />
-            <Control HorizontalExpand="True" SizeFlagsStretchRatio="0.5" />
-            <Button Name="ChannelsButton" Text="{Loc 'instruments-component-menu-channels-button'}" TextAlign="Center" HorizontalExpand="True"
-                    SizeFlagsStretchRatio="1"/>
-            <Control HorizontalExpand="True" SizeFlagsStretchRatio="0.5" />
-            <Button Name="StopButton" Text="{Loc 'instruments-component-menu-stop-button'}" TextAlign="Center" HorizontalExpand="True"
-                    SizeFlagsStretchRatio="1" />
-        </BoxContainer>
-        <BoxContainer Orientation="Horizontal" VerticalExpand="True">
-            <Control HorizontalExpand="True" SizeFlagsStretchRatio="0.125" />
-            <Slider Name="PlaybackSlider" HorizontalExpand="True" />
-            <Control HorizontalExpand="True" SizeFlagsStretchRatio="0.125" />
-        </BoxContainer>
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      MinSize="480 270"
+                      SetSize="500 500">
+    <BoxContainer Orientation="Vertical" Margin="1,0,0,5" SeparationOverride="10">
+        <TabContainer Name="MainTabContainer" VerticalExpand="True">
+            <BoxContainer Name="InstrumentContainer" Orientation="Horizontal" VerticalExpand="True"
+                          SeparationOverride="10">
+                <BoxContainer Orientation="Vertical" VerticalExpand="True">
+                    <BoxContainer Name="MidiSourceButtonsBoxContainer" Orientation="Vertical">
+                        <Label Text="{Loc 'instruments-component-menu-midi-source-button'}" />
+                    </BoxContainer>
+                    <BoxContainer Orientation="Vertical" VerticalExpand="True">
+                        <SpriteView Name="InstrumentSpriteView" Stretch="Fill" VerticalExpand="True" />
+                    </BoxContainer>
+                </BoxContainer>
+                <BoxContainer Name="MidiSourcesContainer" VerticalExpand="True" HorizontalExpand="True" />
+            </BoxContainer>
+            <ScrollContainer Name="ConfigScrollContainer" HScrollEnabled="False" HorizontalExpand="True"
+                             VerticalExpand="True">
+                <BoxContainer
+                    Name="ConfigurationItemsContainer"
+                    Orientation="Vertical"
+                    VerticalExpand="True"
+                    HorizontalExpand="True" />
+            </ScrollContainer>
+        </TabContainer>
     </BoxContainer>
+
     <PanelContainer Name="UnavailableOverlay" Visible="False" MouseFilter="Stop">
         <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#000000E5" />
+            <gfx:StyleBoxFlat BackgroundColor="#000000F5" />
         </PanelContainer.PanelOverride>
         <Label VerticalAlignment="Center" HorizontalAlignment="Center" Align="Center"
                StyleClasses="LabelBig"
                Text="{Loc instruments-component-menu-no-midi-support}" />
     </PanelContainer>
-</DefaultWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
index 7cd6a41fdf..995d5e95c1 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
@@ -1,283 +1,144 @@
-using System.IO;
-using System.Numerics;
-using System.Threading.Tasks;
-using Content.Client.Interactable;
-using Content.Shared.ActionBlocker;
+using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
-using Robust.Client.Player;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Containers;
-using Robust.Shared.Input;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using static Robust.Client.UserInterface.Controls.BaseButton;
-using Range = Robust.Client.UserInterface.Controls.Range;
 
-namespace Content.Client.Instruments.UI
+namespace Content.Client.Instruments.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class InstrumentMenu : FancyWindow
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class InstrumentMenu : DefaultWindow
+    private InstrumentMidiSourceBase? _currentMode;
+
+    public InstrumentMenu()
     {
-        [Dependency] private IEntityManager _entManager = default!;
-        [Dependency] private IFileDialogManager _dialogs = default!;
-        [Dependency] private IPlayerManager _player = default!;
+        RobustXamlLoader.Load(this);
 
-        private bool _isMidiFileDialogueWindowOpen;
-
-        public event Action? OnOpenBand;
-        public event Action? OnOpenChannels;
-        public event Action? OnCloseBands;
-        public event Action? OnCloseChannels;
-
-        public EntityUid Entity;
-
-        public InstrumentMenu()
+        var styleBox = new StyleBoxFlat
         {
-            RobustXamlLoader.Load(this);
-            IoCManager.InjectDependencies(this);
+            BorderThickness = new Thickness(0),
+            Padding = new Thickness(10),
+        };
 
-            InputButton.OnToggled += MidiInputButtonOnOnToggled;
-            BandButton.OnPressed += BandButtonOnPressed;
-            BandButton.OnToggled += BandButtonOnToggled;
-            FileButton.OnPressed += MidiFileButtonOnOnPressed;
-            LoopButton.OnToggled += MidiLoopButtonOnOnToggled;
-            ChannelsButton.OnPressed += ChannelsButtonOnPressed;
-            StopButton.OnPressed += MidiStopButtonOnPressed;
-            PlaybackSlider.OnValueChanged += PlaybackSliderSeek;
-            PlaybackSlider.OnKeyBindUp += PlaybackSliderKeyUp;
+        MainTabContainer.PanelStyleBoxOverride = styleBox;
+        MainTabContainer.SetTabTitle(0, Loc.GetString("instruments-component-menu-play-tab-title"));
+        MainTabContainer.SetTabTitle(1, Loc.GetString("instruments-component-menu-config-tab-title"));
+    }
 
-            MinSize = SetSize = new Vector2(400, 150);
-        }
+    protected override void ExitedTree()
+    {
+        base.ExitedTree();
+        _currentMode?.Disable();
+    }
 
-        public void SetInstrument(Entity<InstrumentComponent> entity)
+    /// <summary>
+    /// Registers the passed midi source controls as children of this instrument menu and creates a button
+    /// for each one on the left hand side of the menu.
+    /// </summary>
+    /// <param name="sources">The sources to be registered</param>
+    public void SetupSources(params InstrumentMidiSourceBase[] sources)
+    {
+        var group = new ButtonGroup();
+        for (var i = 0; i < sources.Length; i++)
         {
-            Entity = entity;
-            var component = entity.Comp;
-            component.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded;
-            LoopButton.Disabled = !component.IsMidiOpen;
-            LoopButton.Pressed = component.LoopMidi;
-            ChannelsButton.Disabled = !component.IsRendererAlive;
-            StopButton.Disabled = !component.IsMidiOpen;
-            PlaybackSlider.MouseFilter = component.IsMidiOpen ? MouseFilterMode.Pass : MouseFilterMode.Ignore;
-        }
+            var source = sources[i];
+            var button = new Button();
+            button.Text = source.ButtonName;
+            button.Group = group;
+            button.OnPressed += _ => { SwitchMode(source); };
+            MidiSourceButtonsBoxContainer.Children.Add(button);
+            MidiSourcesContainer.Children.Add(source);
+            source.VerticalExpand = true;
+            source.HorizontalExpand = true;
+            source.Visible = false;
 
-        public void RemoveInstrument(InstrumentComponent component)
-        {
-            component.OnMidiPlaybackEnded -= InstrumentOnMidiPlaybackEnded;
-        }
-
-        public void SetMIDI(bool available)
-        {
-            UnavailableOverlay.Visible = !available;
-        }
-
-        private void BandButtonOnPressed(ButtonEventArgs obj)
-        {
-            if (!PlayCheck())
-                return;
-
-            OnOpenBand?.Invoke();
-        }
-
-        private void BandButtonOnToggled(ButtonToggledEventArgs obj)
-        {
-            if (obj.Pressed)
-                return;
-
-            if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
+            // Set nicer style classes depending on button position.
+            if (i == 0)
             {
-                _entManager.System<InstrumentSystem>().SetMaster(Entity, instrument.Master);
+                button.Pressed = true;
+                button.StyleClasses.Add("OpenLeft");
             }
-        }
-
-        private void ChannelsButtonOnPressed(ButtonEventArgs obj)
-        {
-            OnOpenChannels?.Invoke();
-        }
-
-        private void InstrumentOnMidiPlaybackEnded()
-        {
-            MidiPlaybackSetButtonsDisabled(true);
-        }
-
-        public void MidiPlaybackSetButtonsDisabled(bool disabled)
-        {
-            if (disabled)
+            else if (i == sources.Length - 1)
             {
-                OnCloseChannels?.Invoke();
-            }
-
-            LoopButton.Disabled = disabled;
-            StopButton.Disabled = disabled;
-
-            // Whether to allow the slider to receive events..
-            PlaybackSlider.MouseFilter = !disabled ? MouseFilterMode.Pass : MouseFilterMode.Ignore;
-        }
-
-        private async void MidiFileButtonOnOnPressed(ButtonEventArgs obj)
-        {
-            if (_isMidiFileDialogueWindowOpen)
-                return;
-
-            OnCloseBands?.Invoke();
-
-            var filters = new FileDialogFilters(new FileDialogFilters.Group("mid", "midi"));
-
-            // TODO: Once the file dialogue manager can handle focusing or closing windows, improve this logic to close
-            // or focus the previously-opened window.
-            _isMidiFileDialogueWindowOpen = true;
-
-            await using var file = await _dialogs.OpenFile(filters, FileAccess.Read);
-
-            _isMidiFileDialogueWindowOpen = false;
-
-            // did the instrument menu get closed while waiting for the user to select a file?
-            if (Disposed)
-                return;
-
-            // The following checks are only in place to prevent players from playing MIDI songs locally.
-            // There are equivalents for these checks on the server.
-
-            if (file == null)
-                return;
-
-            if (!PlayCheck())
-                return;
-
-            if (!_entManager.TryGetComponent<InstrumentComponent>(Entity, out var instrument))
-            {
-                return;
-            }
-
-            if (!_entManager.System<InstrumentSystem>()
-                    .OpenMidi(Entity,
-                        file.CopyToArray(),
-                    instrument))
-            {
-                return;
-            }
-
-            MidiPlaybackSetButtonsDisabled(false);
-            if (InputButton.Pressed)
-                InputButton.Pressed = false;
-        }
-
-        private void MidiInputButtonOnOnToggled(ButtonToggledEventArgs obj)
-        {
-            OnCloseBands?.Invoke();
-
-            if (obj.Pressed)
-            {
-                if (!PlayCheck())
-                    return;
-
-                MidiStopButtonOnPressed(null);
-
-                if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
-                    _entManager.System<InstrumentSystem>().OpenInput(Entity, instrument);
+                button.StyleClasses.Add("OpenRight");
             }
             else
             {
-                _entManager.System<InstrumentSystem>().CloseInput(Entity, false);
-                OnCloseChannels?.Invoke();
+                button.StyleClasses.Add("OpenBoth");
             }
         }
-
-        private bool PlayCheck()
-        {
-            // TODO all of these checks should also be done server-side.
-            if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
-                return false;
-
-            var localEntity = _player.LocalEntity;
-
-            // If we don't have a player or controlled entity, we return.
-            if (localEntity == null)
-                return false;
-
-            // By default, allow an instrument to play itself and skip all other checks
-            if (localEntity == Entity)
-                return true;
-
-            var container = _entManager.System<SharedContainerSystem>();
-            // If we're a handheld instrument, we might be in a container. Get it just in case.
-            container.TryGetContainingContainer((Entity, null, null), out var conMan);
-
-            // If the instrument is handheld and we're not holding it, we return.
-            if (instrument.Handheld && (conMan == null || conMan.Owner != localEntity))
-                return false;
-
-            if (!_entManager.System<ActionBlockerSystem>().CanInteract(localEntity.Value, Entity))
-                return false;
-
-            // We check that we're in range unobstructed just in case.
-            return _entManager.System<InteractionSystem>().InRangeUnobstructed(localEntity.Value, Entity);
-        }
-
-        private void MidiStopButtonOnPressed(ButtonEventArgs? obj)
-        {
-            MidiPlaybackSetButtonsDisabled(true);
-
-            _entManager.System<InstrumentSystem>().CloseMidi(Entity, false);
-            OnCloseChannels?.Invoke();
-        }
-
-        private void MidiLoopButtonOnOnToggled(ButtonToggledEventArgs obj)
-        {
-            var instrument = _entManager.System<InstrumentSystem>();
-
-            if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrumentComp))
-            {
-                instrumentComp.LoopMidi = obj.Pressed;
-            }
-
-            instrument.UpdateRenderer(Entity);
-        }
-
-        private void PlaybackSliderSeek(Range _)
-        {
-            // Do not seek while still grabbing.
-            if (PlaybackSlider.Grabbed)
-                return;
-
-            _entManager.System<InstrumentSystem>().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value));
-        }
-
-        private void PlaybackSliderKeyUp(GUIBoundKeyEventArgs args)
-        {
-            if (args.Function != EngineKeyFunctions.UIClick)
-                return;
-
-            _entManager.System<InstrumentSystem>().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value));
-        }
-
-        protected override void FrameUpdate(FrameEventArgs args)
-        {
-            base.FrameUpdate(args);
-
-            if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
-                return;
-
-            var hasMaster = instrument.Master != null;
-            BandButton.ToggleMode = hasMaster;
-            BandButton.Pressed = hasMaster;
-            BandButton.Disabled = instrument.IsMidiOpen || instrument.IsInputOpen;
-            ChannelsButton.Disabled = !instrument.IsRendererAlive;
-
-            if (!instrument.IsMidiOpen)
-            {
-                PlaybackSlider.MaxValue = 1;
-                PlaybackSlider.SetValueWithoutEvent(0);
-                return;
-            }
-
-            if (PlaybackSlider.Grabbed)
-                return;
-
-            PlaybackSlider.MaxValue = instrument.PlayerTotalTick;
-            PlaybackSlider.SetValueWithoutEvent(instrument.PlayerTick);
-        }
+    }
+
+    /// <summary>
+    /// Takes the given control and registers it as an option for the configuration tab control.
+    /// </summary>
+    /// <param name="name">The string to display on the tab header for this configuration.</param>
+    /// <param name="ctrl">The control used for this configuration.</param>
+    public void AddConfigurationControl(string name, Control ctrl)
+    {
+        var formatted = new FormattedMessage();
+        var styleBox = new StyleBoxFlat
+        {
+            BorderColor = Color.FromHex("#3D4059"),
+            BorderThickness = new Thickness(2),
+        };
+
+        var panel = new PanelContainer
+        {
+            PanelOverride = styleBox,
+            Margin = new Thickness(0, 0, 0, 10),
+        };
+
+        var header = new RichTextLabel
+        {
+            StyleClasses = { StyleClass.LabelKeyText },
+            Margin = new Thickness(10, 0, 0, 0),
+        };
+
+        ctrl.VerticalExpand = true;
+        ctrl.Margin = new Thickness(5);
+
+        formatted.AddMarkupOrThrow($"[bold]{name}[/bold]");
+        header.SetMessage(formatted, Color.FromHex("#A88B5E"));
+
+        panel.AddChild(ctrl);
+
+        ConfigurationItemsContainer.AddChild(header);
+        ConfigurationItemsContainer.AddChild(panel);
+    }
+
+    /// <summary>
+    /// Disables & hides the currently active source control, then enables & shows the given one.
+    /// </summary>
+    /// <param name="source">The source control to enable.</param>
+    /// <remarks>The given source must be registered first using the <see cref="SetupSources" /> function.</remarks>
+    public void SwitchMode(InstrumentMidiSourceBase source)
+    {
+        _currentMode?.Disable();
+        _currentMode = source;
+        _currentMode.Enable();
+    }
+
+    /// <summary>
+    /// When true, overlays the menu with a notice that MIDI is currently not available.
+    /// </summary>
+    /// <param name="available">Set to true when MIDI is available.</param>
+    /// <remarks>This should be set to false when MIDI playback is not available on the system.</remarks>
+    public void SetMidiAvailability(bool available)
+    {
+        UnavailableOverlay.Visible = !available;
+    }
+
+    /// <summary>
+    /// Takes an entity with an <see cref="InstrumentComponent" /> and displays its sprite on the left hand side.
+    /// </summary>
+    /// <param name="entity">The entity to display.</param>
+    public void SetInstrument(Entity<InstrumentComponent> entity)
+    {
+        InstrumentSpriteView.SetEntity(entity);
     }
 }
diff --git a/Content.Client/Instruments/UI/InstrumentMidiSourceBase.xaml b/Content.Client/Instruments/UI/InstrumentMidiSourceBase.xaml
new file mode 100644
index 0000000000..aed37590b6
--- /dev/null
+++ b/Content.Client/Instruments/UI/InstrumentMidiSourceBase.xaml
@@ -0,0 +1 @@
+<BoxContainer xmlns="https://spacestation14.io" />
diff --git a/Content.Client/Instruments/UI/InstrumentMidiSourceBase.xaml.cs b/Content.Client/Instruments/UI/InstrumentMidiSourceBase.xaml.cs
new file mode 100644
index 0000000000..afb3b4d274
--- /dev/null
+++ b/Content.Client/Instruments/UI/InstrumentMidiSourceBase.xaml.cs
@@ -0,0 +1,51 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Instruments.UI;
+
+/// <summary>
+/// A type of <see cref="BoxContainer" /> to be added to the <see cref="InstrumentMenu" /> for displaying and handling
+/// all necessary controls regarding a certain type of MIDI input (i.e.: Files, Bands, Hardware input).
+/// Must be initialized and registered to the menu inside <see cref="InstrumentBoundUserInterface" />.
+/// </summary>
+[GenerateTypedNameReferences]
+public abstract partial class InstrumentMidiSourceBase : BoxContainer
+{
+    /// <summary>
+    /// The string to display for the button on the left side of the instrument UI.
+    /// </summary>
+    public virtual string ButtonName { get; } = Loc.GetString("instruments-component-menu-unknown-midi-source-button");
+
+    /// <summary>
+    /// Returns true if this source is currently the active one.
+    /// </summary>
+    protected bool Enabled { get; private set; }
+
+    protected InstrumentMidiSourceBase()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    /// <summary>
+    /// Override if the source requires additional handling to become enabled.
+    /// i.e.: Opening MIDI-Input.
+    /// </summary>
+    [MustCallBase]
+    public virtual void Enable()
+    {
+        Visible = true;
+        Enabled = true;
+    }
+
+    /// <summary>
+    /// Override if the source requires additional handling on being disabled.
+    /// i.e.: Closing MIDI-Input.
+    /// </summary>
+    [MustCallBase]
+    public virtual void Disable()
+    {
+        Enabled = false;
+        Visible = false;
+    }
+}
diff --git a/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml b/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml
new file mode 100644
index 0000000000..83ea995ad6
--- /dev/null
+++ b/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml
@@ -0,0 +1,17 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <BoxContainer Orientation="Vertical">
+        <Label Name="MidiCountLabel" />
+        <BoxContainer Orientation="Horizontal">
+            <Button Name="OpenDirectoryButton"
+                    Text="{Loc 'instruments-component-midi-file-collection-open-dir-button'}" HorizontalExpand="true"
+                    VerticalExpand="true" StyleClasses="OpenRight" />
+            <Button Name="ReloadCollectionButton"
+                    Text="{Loc 'instruments-component-midi-file-collection-reload-button'}" HorizontalExpand="true"
+                    VerticalExpand="true" StyleClasses="OpenBoth" />
+            <controls:ConfirmButton Name="DeleteAllButton"
+                                    Text="{Loc 'instruments-component-midi-file-collection-delete-all-button'}"
+                                    HorizontalExpand="true" VerticalExpand="true" StyleClasses="OpenLeft" />
+        </BoxContainer>
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml.cs b/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml.cs
new file mode 100644
index 0000000000..de76f01626
--- /dev/null
+++ b/Content.Client/Instruments/UI/MidiCollectionUtilsControl.xaml.cs
@@ -0,0 +1,57 @@
+using System.Linq;
+using Content.Client.Audio.Midi;
+using Content.Client.Stylesheets;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.ContentPack;
+
+namespace Content.Client.Instruments.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class MidiCollectionUtilsControl : Control
+{
+    [Dependency] private MidiFileCollectionManager _midiCollection = default!;
+    [Dependency] private IResourceManager _resourceManager = default!;
+
+    public MidiCollectionUtilsControl()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _midiCollection.MidiFileAdded += _ => UpdateCount();
+        _midiCollection.MidiFileRemoved += _ => UpdateCount();
+        _midiCollection.MidiFilesReset += UpdateCount;
+
+        DeleteAllButton.StyleClasses.Add(StyleClass.Negative);
+
+        OpenDirectoryButton.OnPressed += OnOpenDirectoryButtonPressed;
+        ReloadCollectionButton.OnPressed += OnReloadCollectionButtonPressed;
+        DeleteAllButton.OnPressed += OnDeleteAllButtonPressed;
+
+        UpdateCount();
+    }
+
+    private void OnOpenDirectoryButtonPressed(BaseButton.ButtonEventArgs obj)
+    {
+        _resourceManager.UserData.OpenOsWindow(MidiFileCollectionManager.UserMidiDirectory);
+    }
+
+    private void OnReloadCollectionButtonPressed(BaseButton.ButtonEventArgs obj)
+    {
+        _midiCollection.ReloadLibrary();
+    }
+
+    private void OnDeleteAllButtonPressed(BaseButton.ButtonEventArgs obj)
+    {
+        _midiCollection.RemoveAllMidiFiles();
+    }
+
+    private void UpdateCount()
+    {
+        MidiCountLabel.Text = Loc.GetString(
+            "instruments-component-midi-file-collection-size-label",
+            ("count", _midiCollection.GetMidiFiles().Count()));
+    }
+}
diff --git a/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs b/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs
index 76b1c876d3..3faa03512d 100644
--- a/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs
+++ b/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs
@@ -181,7 +181,7 @@ public sealed partial class CryoPodWindow : FancyWindow
         }
 
         // Status checklist
-        const float fallbackTemperatureRequirement = 213;
+        const float fallbackTemperatureRequirement = Atmospherics.T0C;
         var hasTemperatureCheck = (hasGas && hasCorrectTemperature
                 && (lowestTempRequirement != null || msg.GasMix.Temperature < fallbackTemperatureRequirement));
         var hasChemicals = (hasBeaker && !isBeakerEmpty);
diff --git a/Content.Client/Overlays/ScreechShockWaveOverlay.cs b/Content.Client/Overlays/ScreechShockWaveOverlay.cs
index affb7ce8bc..21b80c6e4b 100644
--- a/Content.Client/Overlays/ScreechShockWaveOverlay.cs
+++ b/Content.Client/Overlays/ScreechShockWaveOverlay.cs
@@ -119,6 +119,7 @@ public sealed partial class ScreechShockWaveOverlay : Overlay
         _shader.SetParameter("times", _times);
         _shader.SetParameter("count", _currentCount);
         _shader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+        _shader?.SetParameter("renderScale", args.Viewport.RenderScale * args.Viewport.Eye.Scale);
 
         // finally do the rendering
         var worldHandle = args.WorldHandle;
diff --git a/Content.Client/PDA/PdaMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs
index e653bbd993..caf5e0528e 100644
--- a/Content.Client/PDA/PdaMenu.xaml.cs
+++ b/Content.Client/PDA/PdaMenu.xaml.cs
@@ -3,6 +3,7 @@ using Content.Shared.PDA;
 using Robust.Shared.Utility;
 using Content.Shared.CartridgeLoader;
 using Content.Client.Message;
+using Content.Shared.AlertLevel;
 using Robust.Client.UserInterface;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -18,6 +19,7 @@ namespace Content.Client.PDA
         [Dependency] private IClipboardManager _clipboard = null!;
         [Dependency] private IGameTiming _gameTiming = default!;
         [Dependency] private IEntitySystemManager _entitySystem = default!;
+        private readonly AlertLevelSystem _alert = default!;
         private readonly ClientGameTicker _gameTicker;
 
         public const int HomeView = 0;
@@ -42,6 +44,7 @@ namespace Content.Client.PDA
         public PdaMenu()
         {
             IoCManager.InjectDependencies(this);
+            _alert = _entitySystem.GetEntitySystem<AlertLevelSystem>();
             _gameTicker = _entitySystem.GetEntitySystem<ClientGameTicker>();
             RobustXamlLoader.Load(this);
 
@@ -172,17 +175,14 @@ namespace Content.Client.PDA
             StationTimeLabel.SetMarkup(Loc.GetString("comp-pda-ui-station-time",
                 ("time", stationTime.ToString("hh\\:mm\\:ss"))));
 
-            var alertLevel = state.PdaOwnerInfo.StationAlertLevel;
             var alertColor = state.PdaOwnerInfo.StationAlertColor;
-            var alertLevelKey = alertLevel != null ? $"alert-level-{alertLevel}" : "alert-level-unknown";
-            _alertLevel = Loc.GetString(alertLevelKey);
+            (_alertLevel, _, _instructions) = _alert.AlertLevelData(state.PdaOwnerInfo.StationAlertLevel);
 
             StationAlertLevelLabel.SetMarkup(Loc.GetString(
                 "comp-pda-ui-station-alert-level",
                 ("color", alertColor),
                 ("level", _alertLevel)
             ));
-            _instructions = Loc.GetString($"{alertLevelKey}-instructions");
             StationAlertLevelInstructions.SetMarkup(Loc.GetString(
                 "comp-pda-ui-station-alert-level-instructions",
                 ("instructions", _instructions))
diff --git a/Content.Client/Speech/EntitySystems/DamagedSiliconAccentSystem.cs b/Content.Client/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
new file mode 100644
index 0000000000..36368b62bf
--- /dev/null
+++ b/Content.Client/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Speech.EntitySystems;
+
+namespace Content.Client.Speech.EntitySystems;
+
+public sealed class DamagedSiliconAccentSystem : SharedDamagedSiliconAccentSystem;
diff --git a/Content.Client/Speech/EntitySystems/RatvarianLanguageSystem.cs b/Content.Client/Speech/EntitySystems/RatvarianLanguageSystem.cs
deleted file mode 100644
index f24194a597..0000000000
--- a/Content.Client/Speech/EntitySystems/RatvarianLanguageSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.Speech.EntitySystems;
-
-namespace Content.Client.Speech.EntitySystems;
-
-public sealed class RatvarianLanguageSystem : SharedRatvarianLanguageSystem
-{
-
-}
diff --git a/Content.Client/Speech/EntitySystems/SlurredSystem.cs b/Content.Client/Speech/EntitySystems/SlurredSystem.cs
deleted file mode 100644
index a4bb677edf..0000000000
--- a/Content.Client/Speech/EntitySystems/SlurredSystem.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
-
-namespace Content.Client.Speech.EntitySystems;
-
-public sealed class SlurredSystem : SharedSlurredSystem
-{
-    public override string Accentuate(string message, Entity<SlurredAccentComponent>? ent = null)
-    {
-        return message;
-    }
-}
diff --git a/Content.Client/Speech/EntitySystems/StutteringSystem.cs b/Content.Client/Speech/EntitySystems/StutteringSystem.cs
deleted file mode 100644
index 9c98df4588..0000000000
--- a/Content.Client/Speech/EntitySystems/StutteringSystem.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
-
-namespace Content.Client.Speech.EntitySystems;
-
-public sealed class StutteringSystem : SharedStutteringSystem
-{
-    public override string Accentuate(string message, Entity<StutteringAccentComponent>? ent = null)
-    {
-        return message;
-    }
-}
diff --git a/Content.Client/Suicide/SuicideSystem.cs b/Content.Client/Suicide/SuicideSystem.cs
new file mode 100644
index 0000000000..517180b651
--- /dev/null
+++ b/Content.Client/Suicide/SuicideSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Suicide;
+
+namespace Content.Client.Suicide;
+
+public sealed class SuicideSystem : SharedSuicideSystem;
diff --git a/Content.IntegrationTests/Tests/Body/DetachableOrganSystemTest.cs b/Content.IntegrationTests/Tests/Body/DetachableOrganSystemTest.cs
new file mode 100644
index 0000000000..67d210ccf8
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Body/DetachableOrganSystemTest.cs
@@ -0,0 +1,111 @@
+using System.Linq;
+using Content.IntegrationTests.Fixtures;
+using Content.IntegrationTests.Fixtures.Attributes;
+using Content.Shared.Body;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+
+namespace Content.IntegrationTests.Tests.Body;
+
+[TestFixture]
+[TestOf(typeof(DetachableOrganSystem))]
+public sealed class DetachableOrganSystemTest : GameTest
+{
+    private const string DetachTestOldBody = "DetachTestOldBody";
+    private const string DetachTestNewBody = "DetachTestNewBody";
+    private const string DetachTestGrandParentOrgan = "DetachTestGrandParentOrgan";
+    private const string DetachTestRootOrgan = "DetachTestRootOrgan";
+    private const string DetachTestChildOrgan = "DetachTestChildOrgan";
+    private const string DetachTestSiblingOrgan = "DetachTestSiblingOrgan";
+
+    [TestPrototypes]
+    private const string Prototypes = $@"
+- type: entity
+  id: {DetachTestOldBody}
+  components:
+  - type: Body
+
+- type: entity
+  id: {DetachTestNewBody}
+  components:
+  - type: Body
+
+- type: entity
+  id: {DetachTestGrandParentOrgan}
+  components:
+  - type: Organ
+  - type: ParentOrgan
+  - type: ChildOrgan
+
+- type: entity
+  id: {DetachTestRootOrgan}
+  components:
+  - type: Organ
+  - type: ParentOrgan
+  - type: ChildOrgan
+  - type: DetachableOrgan
+    detachedBody: DetachTestNewBody
+
+- type: entity
+  id: {DetachTestChildOrgan}
+  components:
+  - type: Organ
+  - type: ChildOrgan
+
+- type: entity
+  id: {DetachTestSiblingOrgan}
+  components:
+  - type: Organ
+  - type: ChildOrgan
+";
+
+    [SidedDependency(Side.Server)] private SharedContainerSystem _container = default!;
+    [SidedDependency(Side.Server)] private OrganRelationSystem _organRelation = default!;
+    [SidedDependency(Side.Server)] private DetachableOrganSystem _detachableOrgan = default!;
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void Detach()
+    {
+        var oldBody = SSpawn(DetachTestOldBody);
+        var oldBodyContainer = _container.GetContainer(oldBody, BodyComponent.ContainerID);
+
+        var grandParent = SSpawn(DetachTestGrandParentOrgan);
+        var root = SSpawn(DetachTestRootOrgan);
+        var child = SSpawn(DetachTestChildOrgan);
+        var sibling = SSpawn(DetachTestSiblingOrgan);
+
+        _container.Insert(grandParent, oldBodyContainer, force: true);
+        _container.Insert(root, oldBodyContainer, force: true);
+        _container.Insert(child, oldBodyContainer, force: true);
+        _container.Insert(sibling, oldBodyContainer, force: true);
+
+        _organRelation.Relate(grandParent, root);
+        _organRelation.Relate(grandParent, sibling);
+        _organRelation.Relate(root, child);
+
+        var newBody = _detachableOrgan.Detach(root);
+
+        Assert.That(newBody, Is.Not.Null);
+
+        var newBodyContained = _container.GetContainer(newBody!.Value, BodyComponent.ContainerID).ContainedEntities.ToList();
+        Assert.That(newBodyContained, Is.EquivalentTo(new[] { root, child }));
+
+        var oldBodyContained = oldBodyContainer.ContainedEntities.ToList();
+        Assert.That(oldBodyContained, Is.EquivalentTo(new[] { grandParent, sibling }));
+
+        var grandParentComp = SComp<ParentOrganComponent>(grandParent);
+        Assert.That(grandParentComp.Children, Does.Not.Contain(root));
+        Assert.That(grandParentComp.Children, Does.Contain(sibling));
+
+        Assert.That(SComp<ChildOrganComponent>(root).Parent, Is.Null);
+        Assert.That(SComp<ParentOrganComponent>(root).Children, Does.Contain(child));
+        Assert.That(SComp<ChildOrganComponent>(child).Parent, Is.EqualTo(root));
+
+        Assert.That(SComp<OrganComponent>(root).Body, Is.EqualTo(newBody));
+        Assert.That(SComp<OrganComponent>(child).Body, Is.EqualTo(newBody));
+        Assert.That(SComp<OrganComponent>(grandParent).Body, Is.EqualTo(oldBody));
+        Assert.That(SComp<OrganComponent>(sibling).Body, Is.EqualTo(oldBody));
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Body/InitialBodySpawnTest.cs b/Content.IntegrationTests/Tests/Body/InitialBodySpawnTest.cs
new file mode 100644
index 0000000000..8b1b855125
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Body/InitialBodySpawnTest.cs
@@ -0,0 +1,67 @@
+using System.Linq;
+using Content.IntegrationTests.Fixtures;
+using Content.IntegrationTests.Fixtures.Attributes;
+using Content.Shared.Body;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+
+namespace Content.IntegrationTests.Tests.Body;
+
+[TestFixture]
+[TestOf(typeof(InitialBodySystem))]
+public sealed class InitialBodySpawnTest : GameTest
+{
+    [TestPrototypes]
+    private const string Prototypes = @"
+- type: organCategory
+  id: InitialBodySpawnTestParent
+
+- type: organCategory
+  id: InitialBodySpawnTestChild
+
+- type: entity
+  id: InitialBodySpawnTestBody
+  components:
+  - type: Body
+  - type: InitialBody
+    organs:
+      InitialBodySpawnTestParent: InitialBodySpawnTestParentOrgan
+      InitialBodySpawnTestChild: InitialBodySpawnTestChildOrgan
+    relationships:
+      InitialBodySpawnTestParent: [InitialBodySpawnTestChild]
+
+- type: entity
+  id: InitialBodySpawnTestParentOrgan
+  components:
+  - type: Organ
+  - type: ParentOrgan
+
+- type: entity
+  id: InitialBodySpawnTestChildOrgan
+  components:
+  - type: Organ
+  - type: ChildOrgan
+";
+
+    [SidedDependency(Side.Server)] private SharedContainerSystem _container = default!;
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void SpawningWiresUpOrganRelations()
+    {
+        var body = SSpawn("InitialBodySpawnTestBody");
+
+        var bodyContainer = _container.GetContainer(body, BodyComponent.ContainerID);
+        var contained = bodyContainer.ContainedEntities.ToList();
+        Assert.That(contained, Has.Count.EqualTo(2));
+
+        var parent = contained.Single(SEntMan.HasComponent<ParentOrganComponent>);
+        var child = contained.Single(SEntMan.HasComponent<ChildOrganComponent>);
+
+        var parentComp = SComp<ParentOrganComponent>(parent);
+        var childComp = SComp<ChildOrganComponent>(child);
+
+        Assert.That(parentComp.Children, Does.Contain(child));
+        Assert.That(childComp.Parent, Is.EqualTo(parent));
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Body/InitialBodyValidationTest.cs b/Content.IntegrationTests/Tests/Body/InitialBodyValidationTest.cs
new file mode 100644
index 0000000000..851964e422
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Body/InitialBodyValidationTest.cs
@@ -0,0 +1,179 @@
+using System.Collections.Generic;
+using System.Linq;
+using Content.IntegrationTests.Fixtures;
+using Content.IntegrationTests.Fixtures.Attributes;
+using Content.Shared.Body;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Body;
+
+[TestFixture]
+[TestOf(typeof(InitialBodySystem))]
+public sealed class InitialBodyValidationTest : GameTest
+{
+    [SidedDependency(Side.Server)] private IComponentFactory _componentFactory = default!;
+    [SidedDependency(Side.Server)] private IPrototypeManager _prototype = default!;
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void RelatedOrgansCanBeRelated()
+    {
+        using var scope = Assert.EnterMultipleScope();
+
+        foreach (var proto in _prototype.EnumeratePrototypes<EntityPrototype>())
+        {
+            if (proto.Abstract || Pair.IsTestEntityPrototype(proto.ID))
+                continue;
+
+            if (!proto.TryComp<InitialBodyComponent>(out var initial, _componentFactory))
+                continue;
+
+            if (initial.Relationships is not { } relationships)
+                continue;
+
+            var organs = initial.Organs;
+            foreach (var (parent, children) in relationships)
+            {
+                if (!organs.TryGetValue(parent, out var parentProtoId))
+                    continue;
+
+                var parentProto = _prototype.Index(parentProtoId);
+                if (!parentProto.HasComp<ParentOrganComponent>(_componentFactory))
+                {
+                    Assert.Fail($"{proto.ID}'s parent organ {parent} {parentProtoId} is missing {nameof(ParentOrganComponent)}");
+                }
+
+                foreach (var child in children)
+                {
+                    if (!organs.TryGetValue(child, out var childProtoId))
+                        continue;
+
+                    var childProto = _prototype.Index(childProtoId);
+                    if (!childProto.HasComp<ChildOrganComponent>(_componentFactory))
+                    {
+                        Assert.Fail($"{proto.ID}'s child organ {child} {childProtoId} (child of {parent} {parentProtoId}) is missing {nameof(ChildOrganComponent)}");
+                    }
+                }
+            }
+        }
+    }
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void NoMultipleParents()
+    {
+        using var scope = Assert.EnterMultipleScope();
+
+        foreach (var proto in _prototype.EnumeratePrototypes<EntityPrototype>())
+        {
+            if (proto.Abstract || Pair.IsTestEntityPrototype(proto.ID))
+                continue;
+
+            if (!proto.TryComp<InitialBodyComponent>(out var initial, _componentFactory))
+                continue;
+
+            if (initial.Relationships is not { } relationships)
+                continue;
+
+            var parentOf = new Dictionary<ProtoId<OrganCategoryPrototype>, ProtoId<OrganCategoryPrototype>>();
+            foreach (var (parent, children) in relationships)
+            {
+                foreach (var child in children)
+                {
+                    if (parentOf.TryGetValue(child, out var existingParent))
+                    {
+                        Assert.Fail($"{proto.ID}'s organ category {child} is claimed as a child by both {existingParent} and {parent}");
+                    }
+
+                    parentOf[child] = parent;
+                }
+            }
+        }
+    }
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void InternalChildOrgansAreNotDetachable()
+    {
+        using var scope = Assert.EnterMultipleScope();
+
+        foreach (var proto in _prototype.EnumeratePrototypes<EntityPrototype>())
+        {
+            if (proto.Abstract || Pair.IsTestEntityPrototype(proto.ID))
+                continue;
+
+            if (!proto.HasComp<InternalChildOrganComponent>(_componentFactory))
+                continue;
+
+            if (proto.HasComp<DetachableOrganComponent>(_componentFactory))
+            {
+                Assert.Fail($"{proto.ID} has both {nameof(InternalChildOrganComponent)} and {nameof(DetachableOrganComponent)}. Pick a lane, make your organs internal or detachable, but not both.");
+            }
+        }
+    }
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void NoCyclicalRelationships()
+    {
+        using var scope = Assert.EnterMultipleScope();
+
+        foreach (var proto in _prototype.EnumeratePrototypes<EntityPrototype>())
+        {
+            if (proto.Abstract || Pair.IsTestEntityPrototype(proto.ID))
+                continue;
+
+            if (!proto.TryComp<InitialBodyComponent>(out var initial, _componentFactory))
+                continue;
+
+            if (initial.Relationships is not { } relationships)
+                continue;
+
+            var visited = new HashSet<ProtoId<OrganCategoryPrototype>>();
+            var stack = new List<ProtoId<OrganCategoryPrototype>>();
+
+            foreach (var parent in relationships.Keys)
+            {
+                if (TryFindCycle(parent, relationships, visited, stack, out var cycle))
+                {
+                    Assert.Fail($"{proto.ID} has a cycle in its InitialBodyComponent relationships: {string.Join(" -> ", cycle)}");
+                }
+            }
+        }
+    }
+
+    private static bool TryFindCycle(
+        ProtoId<OrganCategoryPrototype> node,
+        Dictionary<ProtoId<OrganCategoryPrototype>, HashSet<ProtoId<OrganCategoryPrototype>>> relationships,
+        HashSet<ProtoId<OrganCategoryPrototype>> visited,
+        List<ProtoId<OrganCategoryPrototype>> stack,
+        out List<ProtoId<OrganCategoryPrototype>> cycle)
+    {
+        if (stack.Contains(node))
+        {
+            var start = stack.IndexOf(node);
+            cycle = stack.Skip(start).Append(node).ToList();
+            return true;
+        }
+
+        cycle = new List<ProtoId<OrganCategoryPrototype>>();
+
+        if (!visited.Add(node))
+            return false;
+
+        if (!relationships.TryGetValue(node, out var children))
+            return false;
+
+        stack.Add(node);
+
+        foreach (var child in children)
+        {
+            if (TryFindCycle(child, relationships, visited, stack, out cycle))
+                return true;
+        }
+
+        stack.RemoveAt(stack.Count - 1);
+        return false;
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Body/OrganRelationSystemTest.cs b/Content.IntegrationTests/Tests/Body/OrganRelationSystemTest.cs
new file mode 100644
index 0000000000..ee012f9815
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Body/OrganRelationSystemTest.cs
@@ -0,0 +1,93 @@
+using System.Linq;
+using Content.IntegrationTests.Fixtures;
+using Content.IntegrationTests.Fixtures.Attributes;
+using Content.Shared.Body;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+
+namespace Content.IntegrationTests.Tests.Body;
+
+[TestFixture]
+[TestOf(typeof(OrganRelationSystem))]
+public sealed class OrganRelationSystemTest : GameTest
+{
+    [TestPrototypes]
+    private const string Prototypes = @"
+- type: entity
+  id: OrganRelationTestOrgan
+  components:
+  - type: Organ
+  - type: ParentOrgan
+  - type: ChildOrgan
+";
+
+    [SidedDependency(Side.Server)] private OrganRelationSystem _organRelation = default!;
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void RelateAndOrphan()
+    {
+        var parent = SSpawn("OrganRelationTestOrgan");
+        var child = SSpawn("OrganRelationTestOrgan");
+
+        _organRelation.Relate(parent, child);
+
+        var parentComp = SComp<ParentOrganComponent>(parent);
+        var childComp = SComp<ChildOrganComponent>(child);
+
+        Assert.That(parentComp.Children, Does.Contain(child));
+        Assert.That(childComp.Parent, Is.EqualTo(parent));
+
+        _organRelation.Orphan(child);
+
+        Assert.That(parentComp.Children, Does.Not.Contain(child));
+        Assert.That(childComp.Parent, Is.Null);
+    }
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void Traversal()
+    {
+        var grandParent = SSpawn("OrganRelationTestOrgan");
+        var parent = SSpawn("OrganRelationTestOrgan");
+        var child = SSpawn("OrganRelationTestOrgan");
+
+        _organRelation.Relate(grandParent, parent);
+        _organRelation.Relate(parent, child);
+
+        var allChildren = _organRelation.AllChildren(grandParent).Select(e => e.Owner).ToList();
+        Assert.That(allChildren, Is.EquivalentTo(new[] { parent, child }));
+
+        var allParents = _organRelation.AllParents(child).Select(e => e.Owner).ToList();
+        Assert.That(allParents, Is.EquivalentTo(new[] { parent, grandParent }));
+    }
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void ParentDeletion()
+    {
+        var parent = SSpawn("OrganRelationTestOrgan");
+        var child = SSpawn("OrganRelationTestOrgan");
+
+        _organRelation.Relate(parent, child);
+
+        SDeleteNow(parent);
+
+        Assert.That(SEntMan.Deleted(child), Is.False);
+        Assert.That(SComp<ChildOrganComponent>(child).Parent, Is.Null);
+    }
+
+    [Test]
+    [RunOnSide(Side.Server)]
+    public void ChildDeletion()
+    {
+        var parent = SSpawn("OrganRelationTestOrgan");
+        var child = SSpawn("OrganRelationTestOrgan");
+
+        _organRelation.Relate(parent, child);
+
+        SDeleteNow(child);
+
+        Assert.That(SComp<ParentOrganComponent>(parent).Children, Does.Not.Contain(child));
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/EdgeClobbering.cs b/Content.IntegrationTests/Tests/Construction/Interaction/EdgeClobbering.cs
index 9f578148cf..0f8f48663c 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/EdgeClobbering.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/EdgeClobbering.cs
@@ -41,7 +41,8 @@ public sealed class EdgeClobbering : InteractionTest
         var sTarget = SEntMan.GetEntity(Target!.Value);
 
         await InteractUsing(Screw, false);
-        SEntMan.EventBus.RaiseLocalEvent(sTarget, new OnTemperatureChangeEvent(0f, 0f, 0f));
+        var ev = new TemperatureChangedEvent(0f, 0f);
+        SEntMan.EventBus.RaiseLocalEvent(sTarget, ref ev);
         await AwaitDoAfters();
 
         Assert.That(SEntMan.GetComponent<ConstructionComponent>(sTarget).Node, Is.EqualTo("C"));
diff --git a/Content.IntegrationTests/Tests/Materials/ReclaimerLoopTest.cs b/Content.IntegrationTests/Tests/Materials/ReclaimerLoopTest.cs
new file mode 100644
index 0000000000..310401ed59
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Materials/ReclaimerLoopTest.cs
@@ -0,0 +1,89 @@
+using Content.IntegrationTests.Fixtures.Attributes;
+using Content.IntegrationTests.Tests.Interaction;
+using Content.IntegrationTests.Utility;
+using Content.Server.Materials;
+using Content.Shared.Materials;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Materials;
+
+/// <summary>
+/// Tests to prevent Recycler loops, where the product of one recycling can be recycled again.
+/// </summary>
+[TestOf(typeof(MaterialReclaimerSystem))]
+[TestOf(typeof(MaterialReclaimerComponent))]
+public sealed class ReclaimerLoopTest : InteractionTest
+{
+    // ProtoIDs we need
+    private static readonly EntProtoId ApcId = "APCBasic";
+    private static readonly EntProtoId FloorTileId = "FloorTileItemSteel";
+
+    private static readonly string[] Reclaimers = GameDataScrounger.EntitiesWithComponent("MaterialReclaimer");
+
+    [SidedDependency(Side.Server)] private readonly SharedMaterialReclaimerSystem _materialReclaimerSystem = null!;
+
+    [Test]
+    [TestCaseSource(nameof(Reclaimers))]
+    [TestOf(typeof(MaterialReclaimerSystem))]
+    [TestOf(typeof(MaterialReclaimerComponent))]
+    [Description("For every material that a reclaimer can spawn, make sure that it cannot get stuck in a loop of spawning then recycling.")]
+    [TrackingIssue("https://github.com/space-wizards/space-station-14/issues/39691")]
+    public async Task MaterialSpawnLoopTest(string reclaimerId)
+    {
+        // Spawn the reclaimer
+        await SpawnTarget(reclaimerId, PlayerCoords);
+        Assume.That(STarget, Is.Not.Null, "STarget was null, did the reclaimer spawn correctly?");
+
+        var reclaimComp = Comp<MaterialReclaimerComponent>(Target);
+
+        // Power the reclaimer
+        await SpawnEntity(ApcId, SEntMan.GetCoordinates(TargetCoords));
+        await RunTicks(1);
+        // Set reclaimer to enabled
+        await Server.WaitPost(() =>
+        {
+            _materialReclaimerSystem.SetReclaimerEnabled((EntityUid)STarget, true);
+        });
+
+        // Check that reclaimer enabled
+        Assume.That(reclaimComp.Enabled, "The reclaimer did not get or stay enabled");
+
+        // Put a floor tile down
+        await InteractUsing(FloorTileId);
+
+        // Reclaimer can't reclaim materials? Job's done.
+        if (!reclaimComp.ReclaimMaterials)
+            Assert.Ignore("Cannot reclaim materials");
+
+        using (Assert.EnterMultipleScope())
+        {
+            // For each material, assert that it is not recyclable (and would thus cause a recycling loop)
+            foreach (var material in ProtoMan.EnumeratePrototypes<MaterialPrototype>())
+            {
+                var matStack = material.StackEntity;
+                Assert.That(
+                    matStack,
+                    Is.Not.Null,
+                    $"The material, {material.ID}, did not have a stackentity associated with it. You may need to add a stackEntity to its Reagents/Materials yml file.");
+
+                var matInHands = await PlaceInHands(matStack);
+                var matInHandsUid = ToServer(matInHands);
+
+                // Assert we're holding material
+                Assert.That(
+                    HandSys.GetActiveItem((SPlayer, Hands)),
+                    Is.EqualTo(matInHandsUid),
+                    $"The material, {matStack}, never got put in our hands.");
+
+                await Interact();
+
+                // Assert Hands not empty
+                Assert.That(
+                    HandSys.GetActiveItem((SPlayer, Hands)),
+                    Is.Not.Null,
+                    $"The material that should not have been reclaimed, {matStack}, is no longer in our hands. The reclaimer was {reclaimerId}");
+            }
+        }
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Sprite/ItemSpriteTest.cs b/Content.IntegrationTests/Tests/Sprite/ItemSpriteTest.cs
index ca667f2e7a..4c2f0be60e 100644
--- a/Content.IntegrationTests/Tests/Sprite/ItemSpriteTest.cs
+++ b/Content.IntegrationTests/Tests/Sprite/ItemSpriteTest.cs
@@ -29,7 +29,8 @@ public sealed class PrototypeSaveTest : GameTest
     {
         // The only prototypes that should get ignored are those that REQUIRE setup to get a sprite. At that point it is
         // the responsibility of the spawner to ensure that a valid sprite is set.
-        "VirtualItem"
+        "VirtualItem",
+        "DetachedBody"
     };
 
     [Test]
diff --git a/Content.Server/Administration/Commands/OwoifyCommand.cs b/Content.Server/Administration/Commands/OwoifyCommand.cs
index dcb9b4bcce..2acc7fadac 100644
--- a/Content.Server/Administration/Commands/OwoifyCommand.cs
+++ b/Content.Server/Administration/Commands/OwoifyCommand.cs
@@ -1,7 +1,6 @@
-using Content.Server.Speech.EntitySystems;
 using Content.Shared.Administration;
+using Content.Shared.Speech.EntitySystems;
 using Robust.Shared.Console;
-using Robust.Shared.Random;
 
 namespace Content.Server.Administration.Commands;
 
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 3dee9db3a9..a114c5f112 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -13,14 +13,12 @@ using Content.Server.Pointing.Components;
 using Content.Server.Polymorph.Systems;
 using Content.Server.Popups;
 using Content.Server.Roles;
-using Content.Server.Speech.Components;
 using Content.Shared.Speech.Components;
 using Content.Server.Storage.EntitySystems;
 using Content.Server.Tabletop;
 using Content.Shared.Actions;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Components;
-using Content.Shared.Administration.Systems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Body;
diff --git a/Content.Server/AlertLevel/AlertLevelComponent.cs b/Content.Server/AlertLevel/AlertLevelComponent.cs
deleted file mode 100644
index cb45c6b40e..0000000000
--- a/Content.Server/AlertLevel/AlertLevelComponent.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.AlertLevel;
-
-/// <summary>
-/// Alert level component. This is the component given to a station to
-/// signify its alert level state.
-/// </summary>
-[RegisterComponent]
-public sealed partial class AlertLevelComponent : Component
-{
-    /// <summary>
-    /// The current set of alert levels on the station.
-    /// </summary>
-    [ViewVariables]
-    public AlertLevelPrototype? AlertLevels;
-
-    // Once stations are a prototype, this should be used.
-    [DataField("alertLevelPrototype", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<AlertLevelPrototype>))]
-    public string AlertLevelPrototype = default!;
-
-    /// <summary>
-    /// The current level on the station.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)] public string CurrentLevel = string.Empty;
-
-    /// <summary>
-    /// Is current station level can be changed by crew.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)] public bool IsLevelLocked = false;
-
-    [ViewVariables] public float CurrentDelay = 0;
-    [ViewVariables] public bool ActiveDelay;
-
-    /// <summary>
-    /// If the level can be selected on the station.
-    /// </summary>
-    [ViewVariables]
-    public bool IsSelectable
-    {
-        get
-        {
-            if (AlertLevels == null
-                || !AlertLevels.Levels.TryGetValue(CurrentLevel, out var level))
-            {
-                return false;
-            }
-
-            return level.Selectable && !level.DisableSelection && !IsLevelLocked;
-        }
-    }
-}
diff --git a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
index bf45badc76..bc524c565f 100644
--- a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
+++ b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
@@ -17,7 +17,7 @@ public sealed partial class AlertLevelDisplaySystem : EntitySystem
         SubscribeLocalEvent<AlertLevelDisplayComponent, PowerChangedEvent>(OnPowerChanged);
     }
 
-    private void OnAlertChanged(AlertLevelChangedEvent args)
+    private void OnAlertChanged(ref AlertLevelChangedEvent args)
     {
         var query = EntityQueryEnumerator<AlertLevelDisplayComponent, AppearanceComponent>();
         while (query.MoveNext(out var uid, out _, out var appearance))
@@ -33,7 +33,7 @@ public sealed partial class AlertLevelDisplaySystem : EntitySystem
             var stationUid = _stationSystem.GetOwningStation(uid);
             if (stationUid != null && TryComp(stationUid, out AlertLevelComponent? alert))
             {
-                _appearance.SetData(uid, AlertLevelDisplay.CurrentLevel, alert.CurrentLevel, appearance);
+                _appearance.SetData(uid, AlertLevelDisplay.CurrentLevel, alert.CurrentAlertLevel, appearance);
             }
         }
     }
diff --git a/Content.Server/AlertLevel/AlertLevelPrototype.cs b/Content.Server/AlertLevel/AlertLevelPrototype.cs
deleted file mode 100644
index ccf6ff912c..0000000000
--- a/Content.Server/AlertLevel/AlertLevelPrototype.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.AlertLevel;
-
-[Prototype("alertLevels")]
-public sealed partial class AlertLevelPrototype : IPrototype
-{
-    [IdDataField] public string ID { get; private set; } = default!;
-
-    /// <summary>
-    /// Dictionary of alert levels. Keyed by string - the string key is the most important
-    /// part here. Visualizers will use this in order to dictate what alert level to show on
-    /// client side sprites, and localization uses each key to dictate the alert level name.
-    /// </summary>
-    [DataField("levels")] public Dictionary<string, AlertLevelDetail> Levels = new();
-
-    /// <summary>
-    /// Default level that the station is on upon initialization.
-    /// If this isn't in the dictionary, this will default to whatever .First() gives.
-    /// </summary>
-    [DataField("defaultLevel")] public string DefaultLevel { get; private set; } = default!;
-}
-
-/// <summary>
-/// Alert level detail. Does not contain an ID, that is handled by
-/// the Levels field in AlertLevelPrototype.
-/// </summary>
-[DataDefinition]
-public sealed partial class AlertLevelDetail
-{
-    /// <summary>
-    /// What is announced upon this alert level change. Can be a localized string.
-    /// </summary>
-    [DataField("announcement")] public string Announcement { get; private set; } = string.Empty;
-
-    /// <summary>
-    /// Whether this alert level is selectable from a communications console.
-    /// </summary>
-    [DataField("selectable")] public bool Selectable { get; private set; } = true;
-
-    /// <summary>
-    /// If this alert level disables user selection while it is active. Beware -
-    /// setting this while something is selectable will disable selection permanently!
-    /// This should only apply to entities or gamemodes that auto-select an alert level,
-    /// such as a nuclear bomb being set to active.
-    /// </summary>
-    [DataField("disableSelection")] public bool DisableSelection { get; private set; }
-
-    /// <summary>
-    /// The sound that this alert level will play in-game once selected.
-    /// </summary>
-    [DataField("sound")] public SoundSpecifier? Sound { get; private set; }
-
-    /// <summary>
-    /// The color that this alert level will show in-game in chat.
-    /// </summary>
-    [DataField("color")] public Color Color { get; private set; } = Color.White;
-
-    /// <summary>
-    /// The color to turn emergency lights on this station when they are active.
-    /// </summary>
-    [DataField("emergencyLightColor")] public Color EmergencyLightColor { get; private set; } = Color.FromHex("#FF4020");
-
-    /// <summary>
-    /// Will this alert level force emergency lights on for the station that's active?
-    /// </summary>
-    [DataField("forceEnableEmergencyLights")] public bool ForceEnableEmergencyLights { get; private set; } = false;
-
-    /// <summary>
-    /// How long it takes for the shuttle to arrive when called.
-    /// </summary>
-    [DataField("shuttleTime")] public TimeSpan ShuttleTime { get; private set; } = TimeSpan.FromMinutes(5);
-}
-
diff --git a/Content.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs
deleted file mode 100644
index 21284de4bf..0000000000
--- a/Content.Server/AlertLevel/AlertLevelSystem.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-using System.Linq;
-using Content.Server.Chat.Systems;
-using Content.Server.Station.Systems;
-using Content.Shared.CCVar;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.AlertLevel;
-
-public sealed partial class AlertLevelSystem : EntitySystem
-{
-    [Dependency] private IConfigurationManager _cfg = default!;
-    [Dependency] private ChatSystem _chatSystem = default!;
-    [Dependency] private SharedAudioSystem _audio = default!;
-    [Dependency] private StationSystem _stationSystem = default!;
-
-    // Until stations are a prototype, this is how it's going to have to be.
-    public const string DefaultAlertLevelSet = "stationAlerts";
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<StationInitializedEvent>(OnStationInitialize);
-        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypeReload);
-    }
-
-    public override void Update(float time)
-    {
-        var query = EntityQueryEnumerator<AlertLevelComponent>();
-
-        while (query.MoveNext(out var station, out var alert))
-        {
-            if (alert.CurrentDelay <= 0)
-            {
-                if (alert.ActiveDelay)
-                {
-                    RaiseLocalEvent(new AlertLevelDelayFinishedEvent());
-                    alert.ActiveDelay = false;
-                }
-                continue;
-            }
-
-            alert.CurrentDelay -= time;
-        }
-    }
-
-    private void OnStationInitialize(StationInitializedEvent args)
-    {
-        if (!TryComp<AlertLevelComponent>(args.Station, out var alertLevelComponent))
-            return;
-
-        if (!ProtoMan.TryIndex(alertLevelComponent.AlertLevelPrototype, out AlertLevelPrototype? alerts))
-        {
-            return;
-        }
-
-        alertLevelComponent.AlertLevels = alerts;
-
-        var defaultLevel = alertLevelComponent.AlertLevels.DefaultLevel;
-        if (string.IsNullOrEmpty(defaultLevel))
-        {
-            defaultLevel = alertLevelComponent.AlertLevels.Levels.Keys.First();
-        }
-
-        SetLevel(args.Station, defaultLevel, false, false, true);
-    }
-
-    private void OnPrototypeReload(PrototypesReloadedEventArgs args)
-    {
-        if (!args.ByType.TryGetValue(typeof(AlertLevelPrototype), out var alertPrototypes)
-            || !alertPrototypes.Modified.TryGetValue(DefaultAlertLevelSet, out var alertObject)
-            || alertObject is not AlertLevelPrototype alerts)
-        {
-            return;
-        }
-
-        var query = EntityQueryEnumerator<AlertLevelComponent>();
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            comp.AlertLevels = alerts;
-
-            if (!comp.AlertLevels.Levels.ContainsKey(comp.CurrentLevel))
-            {
-                var defaultLevel = comp.AlertLevels.DefaultLevel;
-                if (string.IsNullOrEmpty(defaultLevel))
-                {
-                    defaultLevel = comp.AlertLevels.Levels.Keys.First();
-                }
-
-                SetLevel(uid, defaultLevel, true, true, true);
-            }
-        }
-
-        RaiseLocalEvent(new AlertLevelPrototypeReloadedEvent());
-    }
-
-    public string GetLevel(EntityUid station, AlertLevelComponent? alert = null)
-    {
-        if (!Resolve(station, ref alert))
-        {
-            return string.Empty;
-        }
-
-        return alert.CurrentLevel;
-    }
-
-    public float GetAlertLevelDelay(EntityUid station, AlertLevelComponent? alert = null)
-    {
-        if (!Resolve(station, ref alert))
-        {
-            return float.NaN;
-        }
-
-        return alert.CurrentDelay;
-    }
-
-    /// <summary>
-    /// Get the default alert level for a station entity.
-    /// Returns an empty string if the station has no alert levels defined.
-    /// </summary>
-    /// <param name="station">The station entity.</param>
-    public string GetDefaultLevel(Entity<AlertLevelComponent?> station)
-    {
-        if (!Resolve(station.Owner, ref station.Comp) || station.Comp.AlertLevels == null)
-        {
-            return string.Empty;
-        }
-        return station.Comp.AlertLevels.DefaultLevel;
-    }
-
-    /// <summary>
-    /// Set the alert level based on the station's entity ID.
-    /// </summary>
-    /// <param name="station">Station entity UID.</param>
-    /// <param name="level">Level to change the station's alert level to.</param>
-    /// <param name="playSound">Play the alert level's sound.</param>
-    /// <param name="announce">Say the alert level's announcement.</param>
-    /// <param name="force">Force the alert change. This applies if the alert level is not selectable or not.</param>
-    /// <param name="locked">Will it be possible to change level by crew.</param>
-    public void SetLevel(EntityUid station, string level, bool playSound, bool announce, bool force = false,
-        bool locked = false, MetaDataComponent? dataComponent = null, AlertLevelComponent? component = null)
-    {
-        if (!Resolve(station, ref component, ref dataComponent)
-            || component.AlertLevels == null
-            || !component.AlertLevels.Levels.TryGetValue(level, out var detail)
-            || component.CurrentLevel == level)
-        {
-            return;
-        }
-
-        if (!force)
-        {
-            if (!detail.Selectable
-                || component.CurrentDelay > 0
-                || component.IsLevelLocked)
-            {
-                return;
-            }
-
-            component.CurrentDelay = _cfg.GetCVar(CCVars.GameAlertLevelChangeDelay);
-            component.ActiveDelay = true;
-        }
-
-        component.CurrentLevel = level;
-        component.IsLevelLocked = locked;
-
-        var stationName = dataComponent.EntityName;
-
-        var name = level.ToLower();
-
-        if (Loc.TryGetString($"alert-level-{level}", out var locName))
-        {
-            name = locName.ToLower();
-        }
-
-        // Announcement text. Is passed into announcementFull.
-        var announcement = detail.Announcement;
-
-        if (Loc.TryGetString(detail.Announcement, out var locAnnouncement))
-        {
-            announcement = locAnnouncement;
-        }
-
-        // The full announcement to be spat out into chat.
-        var announcementFull = Loc.GetString("alert-level-announcement", ("name", name), ("announcement", announcement));
-
-        var playDefault = false;
-        if (playSound)
-        {
-            if (detail.Sound != null)
-            {
-                var filter = _stationSystem.GetInOwningStation(station);
-                _audio.PlayGlobal(detail.Sound, filter, true, detail.Sound.Params);
-            }
-            else
-            {
-                playDefault = true;
-            }
-        }
-
-        if (announce)
-        {
-            _chatSystem.DispatchStationAnnouncement(station, announcementFull, playDefaultSound: playDefault,
-                colorOverride: detail.Color, sender: stationName);
-        }
-
-        RaiseLocalEvent(new AlertLevelChangedEvent(station, level));
-    }
-}
-
-public sealed class AlertLevelDelayFinishedEvent : EntityEventArgs
-{}
-
-public sealed class AlertLevelPrototypeReloadedEvent : EntityEventArgs
-{}
-
-public sealed class AlertLevelChangedEvent : EntityEventArgs
-{
-    public EntityUid Station { get; }
-    public string AlertLevel { get; }
-
-    public AlertLevelChangedEvent(EntityUid station, string alertLevel)
-    {
-        Station = station;
-        AlertLevel = alertLevel;
-    }
-}
diff --git a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
index 9fc7a6c624..f781b7a7da 100644
--- a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
+++ b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
@@ -1,89 +1,76 @@
-using System.Linq;
-using Content.Server.Administration;
-using Content.Server.Station.Systems;
+using Content.Server.Administration;
 using Content.Shared.Administration;
+using Content.Shared.AlertLevel;
+using Content.Shared.Station;
 using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
 
-namespace Content.Server.AlertLevel.Commands
+namespace Content.Server.AlertLevel.Commands;
+
+[AdminCommand(AdminFlags.Fun)]
+public sealed partial class SetAlertLevelCommand : LocalizedEntityCommands
 {
-    [AdminCommand(AdminFlags.Fun)]
-    public sealed partial class SetAlertLevelCommand : LocalizedEntityCommands
+    [Dependency] private AlertLevelSystem _alertLevelSystem = default!;
+    [Dependency] private SharedStationSystem _stationSystem = default!;
+    [Dependency] private IPrototypeManager _prototype = default!;
+
+    public override string Command => "setalertlevel";
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     {
-        [Dependency] private AlertLevelSystem _alertLevelSystem = default!;
-        [Dependency] private StationSystem _stationSystem = default!;
-
-        public override string Command => "setalertlevel";
-
-        public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        return args.Length switch
         {
-            var levelNames = new string[] {};
-            var player = shell.Player;
-            if (player?.AttachedEntity != null)
-            {
-                var stationUid = _stationSystem.GetOwningStation(player.AttachedEntity.Value);
-                if (stationUid != null)
-                    levelNames = GetStationLevelNames(stationUid.Value);
-            }
+            1 => CompletionResult.FromHintOptions(CompletionHelper.PrototypeIDs<AlertLevelPrototype>(),
+            Loc.GetString("cmd-setalertlevel-hint-1")),
+            2 => CompletionResult.FromHintOptions(CompletionHelper.Booleans,
+                LocalizationManager.GetString("cmd-setalertlevel-hint-2")),
+            _ => CompletionResult.Empty,
+        };
+    }
 
-            return args.Length switch
-            {
-                1 => CompletionResult.FromHintOptions(levelNames,
-                    LocalizationManager.GetString("cmd-setalertlevel-hint-1")),
-                2 => CompletionResult.FromHintOptions(CompletionHelper.Booleans,
-                    LocalizationManager.GetString("cmd-setalertlevel-hint-2")),
-                _ => CompletionResult.Empty,
-            };
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var player = shell.Player;
+        if (player?.AttachedEntity == null)
+        {
+            shell.WriteLine(LocalizationManager.GetString("shell-only-players-can-run-this-command"));
+            return;
         }
 
-        public override void Execute(IConsoleShell shell, string argStr, string[] args)
+        if (args.Length < 1)
         {
-            if (args.Length < 1)
-            {
-                shell.WriteError(LocalizationManager.GetString("shell-wrong-arguments-number"));
-                return;
-            }
+            shell.WriteError(LocalizationManager.GetString("shell-wrong-arguments-number"));
+            return;
+        }
 
-            var locked = false;
-            if (args.Length > 1 && !bool.TryParse(args[1], out locked))
+        bool? locked = null;
+        if (args.Length > 1)
+        {
+            if (bool.TryParse(args[1], out var parsedBool))
+            {
+                locked = parsedBool;
+            }
+            else
             {
                 shell.WriteLine(LocalizationManager.GetString("shell-argument-must-be-boolean"));
                 return;
             }
-
-            var player = shell.Player;
-            if (player?.AttachedEntity == null)
-            {
-                shell.WriteLine(LocalizationManager.GetString("shell-only-players-can-run-this-command"));
-                return;
-            }
-
-            var stationUid = _stationSystem.GetOwningStation(player.AttachedEntity.Value);
-            if (stationUid == null)
-            {
-                shell.WriteLine(LocalizationManager.GetString("cmd-setalertlevel-invalid-grid"));
-                return;
-            }
-
-            var level = args[0];
-            var levelNames = GetStationLevelNames(stationUid.Value);
-            if (!levelNames.Contains(level))
-            {
-                shell.WriteLine(LocalizationManager.GetString("cmd-setalertlevel-invalid-level"));
-                return;
-            }
-
-            _alertLevelSystem.SetLevel(stationUid.Value, level, true, true, true, locked);
         }
 
-        private string[] GetStationLevelNames(EntityUid station)
+        var stationUid = _stationSystem.GetOwningStation(player.AttachedEntity.Value);
+        if (stationUid == null)
         {
-            if (!EntityManager.TryGetComponent<AlertLevelComponent>(station, out var alertLevelComp))
-                return new string[]{};
-
-            if (alertLevelComp.AlertLevels == null)
-                return new string[]{};
-
-            return alertLevelComp.AlertLevels.Levels.Keys.ToArray();
+            shell.WriteLine(LocalizationManager.GetString("cmd-setalertlevel-invalid-grid"));
+            return;
         }
+
+        var level = args[0];
+        if (!_prototype.HasIndex<AlertLevelPrototype>(level))
+        {
+            shell.WriteLine(LocalizationManager.GetString("cmd-setalertlevel-invalid-level"));
+            return;
+        }
+
+        _alertLevelSystem.SetLevel(stationUid.Value, level, force: true, locked: locked);
     }
 }
diff --git a/Content.Server/Atmos/Components/AtmosExposedComponent.cs b/Content.Server/Atmos/Components/AtmosExposedComponent.cs
index 721aae8f4f..0f40e998ea 100644
--- a/Content.Server/Atmos/Components/AtmosExposedComponent.cs
+++ b/Content.Server/Atmos/Components/AtmosExposedComponent.cs
@@ -1,11 +1,26 @@
-namespace Content.Server.Atmos.Components
+using Content.Shared.Temperature.Components;
+
+namespace Content.Server.Atmos.Components;
+
+// not if i get there first - Flipp
+/// <summary>
+/// Represents that entity can be exposed to Atmos
+/// </summary>
+[RegisterComponent, AutoGenerateComponentPause]
+public sealed partial class AtmosExposedComponent : Component
 {
-    // not if i get there first - Flipp
     /// <summary>
-    /// Represents that entity can be exposed to Atmos
+    /// Last real time we were exposed to the atmosphere!
     /// </summary>
-    [RegisterComponent]
-    public sealed partial class AtmosExposedComponent : Component
-    {
-    }
+    [DataField, AutoPausedField]
+    public TimeSpan LastExposure = TimeSpan.Zero;
+
+    /// <summary>
+    /// The amount of surface area this entity has exposed to the atmosphere in m^2.
+    /// The human body has about 2m^2 of surface area so we use that as a default.
+    /// This is multiplied by the <see cref="TemperatureComponent.ThermalConductivity"/>
+    /// Source: https://pmc.ncbi.nlm.nih.gov/articles/PMC8953946/
+    /// </summary>
+    [DataField]
+    public float ExposedArea = 2f;
 }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
index 400b778cac..dd09d95ed2 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
@@ -48,7 +48,6 @@ public sealed partial class AtmosphereSystem : SharedAtmosphereSystem
     [Dependency] private EntityQuery<FirelockComponent> _firelockQuery = default!;
 
     private const float ExposedUpdateDelay = 1f;
-    private float _exposedTimer = 0f;
 
     private HashSet<EntityUid> _entSet = new();
 
@@ -103,24 +102,23 @@ public sealed partial class AtmosphereSystem : SharedAtmosphereSystem
         UpdateProcessing(frameTime);
         UpdateHighPressure(frameTime);
 
-        _exposedTimer += frameTime;
-
-        if (_exposedTimer < ExposedUpdateDelay)
-            return;
+        var delay = TimeSpan.FromSeconds(ExposedUpdateDelay);
 
         var query = EntityQueryEnumerator<AtmosExposedComponent, TransformComponent>();
-        while (query.MoveNext(out var uid, out _, out var transform))
+        while (query.MoveNext(out var uid, out var exposed, out var transform))
         {
+            if (exposed.LastExposure + delay > _gameTiming.CurTime)
+                continue;
+
             var air = GetContainingMixture((uid, transform));
 
             if (air == null)
                 continue;
 
-            var updateEvent = new AtmosExposedUpdateEvent(transform.Coordinates, air, transform);
+            var updateEvent = new AtmosExposedUpdateEvent(transform.Coordinates, air, transform, ExposedUpdateDelay, exposed.ExposedArea);
             RaiseLocalEvent(uid, ref updateEvent);
+            exposed.LastExposure = _gameTiming.CurTime;
         }
-
-        _exposedTimer -= ExposedUpdateDelay;
     }
 
     private void CacheDecals()
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 137da5f10d..490e7ae845 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -453,8 +453,7 @@ namespace Content.Server.Atmos.EntitySystems
                     var source = EnsureComp<IgnitionSourceComponent>(uid);
                     _ignitionSourceSystem.SetIgnited((uid, source));
 
-                    if (TryComp(uid, out TemperatureComponent? temp))
-                        _temperatureSystem.ChangeHeat(uid, 12500 * flammable.FireStacks, false, temp);
+                    _temperatureSystem.ChangeHeat(uid, 12500 * flammable.FireStacks, false);
 
                     var ev = new GetFireProtectionEvent();
                     // let the thing on fire handle it
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index 46dd913bcf..cbad6f9a84 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -44,7 +44,7 @@ public sealed partial class RottingSystem : SharedRottingSystem
     {
         if (args.Handled)
             return;
-        args.Handled = component.CurrentTemperature < Atmospherics.T0C + 0.85f;
+        args.Handled = component.Temperature < Atmospherics.T0C + 0.85f;
     }
 
     /// <summary>
diff --git a/Content.Server/Body/BodyCommand.cs b/Content.Server/Body/BodyCommand.cs
new file mode 100644
index 0000000000..6e9fe5b838
--- /dev/null
+++ b/Content.Server/Body/BodyCommand.cs
@@ -0,0 +1,42 @@
+using System.Linq;
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Body;
+using Robust.Shared.Containers;
+using Robust.Shared.Toolshed;
+
+namespace Content.Server.Body;
+
+[ToolshedCommand, AdminCommand(AdminFlags.Debug)]
+public sealed class BodyCommand : ToolshedCommand
+{
+    private SharedContainerSystem? _container;
+
+    [CommandImplementation("insert")]
+    public void Insert([PipedArgument] EntityUid body, EntityUid organ)
+    {
+        _container ??= GetSys<SharedContainerSystem>();
+
+        if (!_container.TryGetContainer(body, BodyComponent.ContainerID, out var container))
+            return;
+
+        _container.Insert(organ, container, force: true);
+    }
+
+    [CommandImplementation("organs")]
+    public IEnumerable<EntityUid> Organs([PipedArgument] EntityUid body)
+    {
+        _container ??= GetSys<SharedContainerSystem>();
+
+        if (!_container.TryGetContainer(body, BodyComponent.ContainerID, out var container))
+            return Enumerable.Empty<EntityUid>();
+
+        return container.ContainedEntities.ToList();
+    }
+
+    [CommandImplementation("organs")]
+    public IEnumerable<EntityUid> Organs([PipedArgument] IEnumerable<EntityUid> body)
+    {
+        return body.SelectMany(Organs);
+    }
+}
diff --git a/Content.Server/Body/OrganCommand.cs b/Content.Server/Body/OrganCommand.cs
new file mode 100644
index 0000000000..e791783cf6
--- /dev/null
+++ b/Content.Server/Body/OrganCommand.cs
@@ -0,0 +1,112 @@
+using System.Linq;
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Body;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Toolshed;
+
+namespace Content.Server.Body;
+
+[ToolshedCommand, AdminCommand(AdminFlags.Debug)]
+public sealed class OrganCommand : ToolshedCommand
+{
+    private DetachableOrganSystem? _detachableOrgan;
+    private SharedContainerSystem? _container;
+    private OrganRelationSystem? _organRelation;
+
+    [CommandImplementation("parent")]
+    public EntityUid? Parent([PipedArgument] EntityUid child)
+    {
+        if (!TryComp<ChildOrganComponent>(child, out var childOrgan))
+            return null;
+
+        return childOrgan.Parent;
+    }
+
+    [CommandImplementation("parent")]
+    public IEnumerable<EntityUid?> Parent([PipedArgument] IEnumerable<EntityUid> children)
+    {
+        return children.Select(Parent);
+    }
+
+    [CommandImplementation("children")]
+    public IEnumerable<EntityUid> Children([PipedArgument] EntityUid parent)
+    {
+        if (!TryComp<ParentOrganComponent>(parent, out var parentOrgan))
+            yield break;
+
+        foreach (var child in parentOrgan.Children)
+        {
+            yield return child;
+        }
+    }
+
+    [CommandImplementation("children")]
+    public IEnumerable<EntityUid> Children([PipedArgument] IEnumerable<EntityUid> parents)
+    {
+        return parents.SelectMany(Children);
+    }
+
+    [CommandImplementation("detach")]
+    public EntityUid? Detach([PipedArgument] EntityUid organ)
+    {
+        _detachableOrgan ??= GetSys<DetachableOrganSystem>();
+        return _detachableOrgan.Detach(organ);
+    }
+
+    [CommandImplementation("detach")]
+    public IEnumerable<EntityUid?> Detach([PipedArgument] IEnumerable<EntityUid> organs)
+    {
+        return organs.Select(Detach);
+    }
+
+    [CommandImplementation("attach")]
+    public void Attach([PipedArgument] EntityUid parent, EntityUid child)
+    {
+        _container ??= GetSys<SharedContainerSystem>();
+        _organRelation ??= GetSys<OrganRelationSystem>();
+
+        if (!TryComp<ParentOrganComponent>(parent, out var parentOrgan) ||
+            !TryComp<ChildOrganComponent>(child, out var childOrgan) ||
+            !TryComp<OrganComponent>(parent, out var parentOrganComponent) ||
+            parentOrganComponent.Body is not { } body)
+            return;
+
+        if (!_container.TryGetContainer(body, BodyComponent.ContainerID, out var container))
+            return;
+
+        _container.Insert(child, container, force: true);
+        _organRelation.Relate((parent, parentOrgan), (child, childOrgan));
+    }
+
+    [CommandImplementation("attach")]
+    public void Attach([PipedArgument] IEnumerable<EntityUid> parents, EntityUid child)
+    {
+        foreach (var parent in parents)
+        {
+            Attach(parent, child);
+        }
+    }
+
+    [CommandImplementation("is")]
+    public bool Is([PipedArgument] EntityUid organ, ProtoId<OrganCategoryPrototype> category)
+    {
+        if (!TryComp<OrganComponent>(organ, out var organComp))
+            return false;
+
+        return organComp.Category == category;
+    }
+
+    [CommandImplementation("is")]
+    public IEnumerable<bool> Is([PipedArgument] IEnumerable<EntityUid> organs, ProtoId<OrganCategoryPrototype> category)
+    {
+        return organs.Select(it => Is(it, category));
+    }
+
+    [CommandImplementation("of_type")]
+    public IEnumerable<EntityUid> Typed([PipedArgument] IEnumerable<EntityUid> organs, ProtoId<OrganCategoryPrototype> category)
+    {
+        return organs.Where(it => Is(it, category));
+    }
+}
diff --git a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
index 581c308f56..e0b8899a17 100644
--- a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
+++ b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
@@ -55,10 +55,10 @@ public sealed partial class ThermalRegulatorSystem : EntitySystem
         var totalMetabolismTempChange = ent.Comp1.MetabolismHeat - ent.Comp1.RadiatedHeat;
 
         // implicit heat regulation
-        var tempDiff = Math.Abs(ent.Comp2.CurrentTemperature - ent.Comp1.NormalBodyTemperature);
-        var heatCapacity = _tempSys.GetHeatCapacity(ent, ent);
+        var tempDiff = Math.Abs(ent.Comp2.Temperature - ent.Comp1.NormalBodyTemperature);
+        var heatCapacity = ent.Comp2.HeatCapacity;
         var targetHeat = tempDiff * heatCapacity;
-        if (ent.Comp2.CurrentTemperature > ent.Comp1.NormalBodyTemperature)
+        if (ent.Comp2.Temperature > ent.Comp1.NormalBodyTemperature)
         {
             totalMetabolismTempChange -= Math.Min(targetHeat, ent.Comp1.ImplicitHeatRegulation);
         }
@@ -67,10 +67,10 @@ public sealed partial class ThermalRegulatorSystem : EntitySystem
             totalMetabolismTempChange += Math.Min(targetHeat, ent.Comp1.ImplicitHeatRegulation);
         }
 
-        _tempSys.ChangeHeat(ent, totalMetabolismTempChange, ignoreHeatResistance: true, ent);
+        _tempSys.ChangeHeat((ent, ent.Comp2), totalMetabolismTempChange, ignoreHeatResistance: true);
 
         // recalc difference and target heat
-        tempDiff = Math.Abs(ent.Comp2.CurrentTemperature - ent.Comp1.NormalBodyTemperature);
+        tempDiff = Math.Abs(ent.Comp2.Temperature - ent.Comp1.NormalBodyTemperature);
         targetHeat = tempDiff * heatCapacity;
 
         // if body temperature is not within comfortable, thermal regulation
@@ -78,19 +78,19 @@ public sealed partial class ThermalRegulatorSystem : EntitySystem
         if (tempDiff < ent.Comp1.ThermalRegulationTemperatureThreshold)
             return;
 
-        if (ent.Comp2.CurrentTemperature > ent.Comp1.NormalBodyTemperature)
+        if (ent.Comp2.Temperature > ent.Comp1.NormalBodyTemperature)
         {
             if (!_actionBlockerSys.CanSweat(ent))
                 return;
 
-            _tempSys.ChangeHeat(ent, -Math.Min(targetHeat, ent.Comp1.SweatHeatRegulation), ignoreHeatResistance: true, ent);
+            _tempSys.ChangeHeat((ent, ent.Comp2), -Math.Min(targetHeat, ent.Comp1.SweatHeatRegulation), ignoreHeatResistance: true);
         }
         else
         {
             if (!_actionBlockerSys.CanShiver(ent))
                 return;
 
-            _tempSys.ChangeHeat(ent, Math.Min(targetHeat, ent.Comp1.ShiveringHeatRegulation), ignoreHeatResistance: true, ent);
+            _tempSys.ChangeHeat((ent, ent.Comp2), Math.Min(targetHeat, ent.Comp1.ShiveringHeatRegulation), ignoreHeatResistance: true);
         }
     }
 }
diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs
index 87557cb754..813fbf5b2e 100644
--- a/Content.Server/Chat/Commands/SuicideCommand.cs
+++ b/Content.Server/Chat/Commands/SuicideCommand.cs
@@ -1,7 +1,6 @@
-using Content.Server.GameTicking;
 using Content.Server.Popups;
+using Content.Server.Suicide;
 using Content.Shared.Administration;
-using Content.Shared.Chat;
 using Content.Shared.Mind;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
diff --git a/Content.Server/Chat/Systems/ChatSystem.Utility.cs b/Content.Server/Chat/Systems/ChatSystem.Utility.cs
index fc24e75cc7..b1eba9f856 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Utility.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Utility.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using System.Text;
-using Content.Server.Speech.Prototypes;
 using Content.Shared.Chat;
 using Content.Shared.Ghost;
 using Content.Shared.Players;
+using Content.Shared.Speech.Prototypes;
 using Robust.Shared.Console;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 8ebc4918b7..f9cfadeb4e 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -3,7 +3,6 @@ using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
-using Content.Server.Speech.EntitySystems;
 using Content.Server.Station.Systems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration;
@@ -13,6 +12,7 @@ using Content.Shared.Examine;
 using Content.Shared.Ghost;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Players.RateLimiting;
+using Content.Shared.Speech.EntitySystems;
 using Robust.Server.Player;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
diff --git a/Content.Server/Cloning/CloningSystem.Subscriptions.cs b/Content.Server/Cloning/CloningSystem.Subscriptions.cs
index cb1c8593f8..559618306e 100644
--- a/Content.Server/Cloning/CloningSystem.Subscriptions.cs
+++ b/Content.Server/Cloning/CloningSystem.Subscriptions.cs
@@ -1,5 +1,4 @@
 using Content.Server.Forensics;
-using Content.Server.Speech.EntitySystems;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
 using Content.Shared.Cloning.Events;
@@ -15,6 +14,7 @@ using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Paper;
 using Content.Shared.Speech.Components;
+using Content.Shared.Speech.EntitySystems;
 using Content.Shared.Stacks;
 using Content.Shared.Storage;
 using Content.Shared.Store;
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index d36c58e301..bb96744aea 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -1,9 +1,8 @@
 using Content.Server.Chat;
 using Content.Server.Chat.Systems;
-using Content.Server.Emoting.Systems;
 using Content.Server.Clothing.Systems;
+using Content.Server.Emoting.Systems;
 using Content.Server.Popups;
-using Content.Server.Speech.EntitySystems;
 using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Clumsy;
@@ -13,6 +12,7 @@ using Content.Shared.IdentityManagement;
 using Content.Shared.Mobs;
 using Content.Shared.NameModifier.EntitySystems;
 using Content.Shared.Popups;
+using Content.Shared.Speech.EntitySystems;
 using Content.Shared.Stunnable;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index e9b97ab95c..3a0879fcc2 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Administration.Logs;
-using Content.Server.AlertLevel;
 using Content.Server.Chat.Systems;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Popups;
@@ -9,6 +8,7 @@ using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Systems;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.AlertLevel;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Communications;
@@ -19,6 +19,7 @@ using Content.Shared.IdentityManagement;
 using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Communications
 {
@@ -44,7 +45,7 @@ namespace Content.Server.Communications
             // All events that refresh the BUI
             SubscribeLocalEvent<AlertLevelChangedEvent>(OnAlertLevelChanged);
             SubscribeLocalEvent<RoundEndSystemChangedEvent>(_ => OnGenericBroadcastEvent());
-            SubscribeLocalEvent<AlertLevelDelayFinishedEvent>(_ => OnGenericBroadcastEvent());
+            SubscribeLocalEvent<AlertLevelDelayFinishedEvent>((ref AlertLevelDelayFinishedEvent ev) => OnGenericBroadcastEvent());
 
             // Messages from the BUI
             SubscribeLocalEvent<CommunicationsConsoleComponent, CommunicationsConsoleSelectAlertLevelMessage>(OnSelectAlertLevelMessage);
@@ -104,7 +105,7 @@ namespace Content.Server.Communications
         /// Updates all comms consoles belonging to the station that the alert level was set on
         /// </summary>
         /// <param name="args">Alert level changed event arguments</param>
-        private void OnAlertLevelChanged(AlertLevelChangedEvent args)
+        private void OnAlertLevelChanged(ref AlertLevelChangedEvent args)
         {
             var query = EntityQueryEnumerator<CommunicationsConsoleComponent>();
             while (query.MoveNext(out var uid, out var comp))
@@ -132,39 +133,10 @@ namespace Content.Server.Communications
         /// </summary>
         public void UpdateCommsConsoleInterface(EntityUid uid, CommunicationsConsoleComponent comp)
         {
-            var stationUid = _stationSystem.GetOwningStation(uid);
-            List<string>? levels = null;
-            string currentLevel = default!;
-            float currentDelay = 0;
-
-            if (stationUid != null)
-            {
-                if (TryComp(stationUid.Value, out AlertLevelComponent? alertComp) &&
-                    alertComp.AlertLevels != null)
-                {
-                    if (alertComp.IsSelectable)
-                    {
-                        levels = new();
-                        foreach (var (id, detail) in alertComp.AlertLevels.Levels)
-                        {
-                            if (detail.Selectable)
-                            {
-                                levels.Add(id);
-                            }
-                        }
-                    }
-
-                    currentLevel = alertComp.CurrentLevel;
-                    currentDelay = _alertLevelSystem.GetAlertLevelDelay(stationUid.Value, alertComp);
-                }
-            }
-
+            // TODO: Use component states and predict the UI
             _uiSystem.SetUiState(uid, CommunicationsConsoleUiKey.Key, new CommunicationsConsoleInterfaceState(
                 CanAnnounce(comp),
                 CanCallOrRecall(comp),
-                levels,
-                currentLevel,
-                currentDelay,
                 _roundEndSystem.ExpectedCountdownEnd
             ));
         }
@@ -222,7 +194,7 @@ namespace Content.Server.Communications
             var stationUid = _stationSystem.GetOwningStation(uid);
             if (stationUid != null)
             {
-                _alertLevelSystem.SetLevel(stationUid.Value, message.Level, true, true);
+                _alertLevelSystem.SetLevel(stationUid.Value, message.Level);
             }
         }
 
diff --git a/Content.Server/Construction/ConstructionSystem.Interactions.cs b/Content.Server/Construction/ConstructionSystem.Interactions.cs
index ca4865639c..f467e2c220 100644
--- a/Content.Server/Construction/ConstructionSystem.Interactions.cs
+++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs
@@ -42,7 +42,7 @@ namespace Content.Server.Construction
             SubscribeLocalEvent<ConstructionComponent, InteractUsingEvent>(EnqueueEvent,
                 new []{typeof(AnchorableSystem), typeof(PryingSystem), typeof(WeldableSystem)},
                 new []{typeof(EncryptionKeySystem)});
-            SubscribeLocalEvent<ConstructionComponent, OnTemperatureChangeEvent>(EnqueueEvent);
+            SubscribeLocalEvent<ConstructionComponent, TemperatureChangedEvent>(EnqueueRefEvent);
             SubscribeLocalEvent<ConstructionComponent, PartAssemblyPartInsertedEvent>(EnqueueEvent);
         }
 
@@ -382,7 +382,7 @@ namespace Content.Server.Construction
 
                 case TemperatureConstructionGraphStep temperatureChangeStep:
                 {
-                    if (ev is not OnTemperatureChangeEvent)
+                    if (ev is not TemperatureChangedEvent)
                         break;
 
                     // Some things, like microwaves, might need to block the temperature construction step from kicking in, or override it entirely.
@@ -400,7 +400,7 @@ namespace Content.Server.Construction
                     }
                     else if (TryComp<TemperatureComponent>(uid, out var tempComp))
                     {
-                        temp = tempComp.CurrentTemperature;
+                        temp = tempComp.Temperature;
                     }
                     else
                     {
@@ -544,6 +544,13 @@ namespace Content.Server.Construction
 
         #region Event Handlers
 
+        // Why does this system have you subscribe to an event,
+        // and then pass it through 5 layers of bullshit into a switch statement which tries to guess what event got passed?
+        private void EnqueueRefEvent<T>(Entity<ConstructionComponent> entity, ref T args) where T : struct
+        {
+            EnqueueEvent(entity, entity.Comp, args);
+        }
+
         /// <summary>
         ///     Queues a directed event to be handled by construction on the next update tick.
         ///     Used as a handler for any events that construction can listen to. <seealso cref="InitializeInteractions"/>
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index c051adec2c..13027a31fc 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -1,14 +1,12 @@
 using System.Numerics;
 using Content.Server.Forensics;
-using Content.Server.Spawners.Components;
-using Content.Server.Spawners.EntitySystems;
+using Content.Server.Stack;
 using Content.Shared.Destructible.Thresholds;
 using Content.Shared.Prototypes;
 using Content.Shared.Stacks;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Spawners;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
 {
@@ -16,15 +14,13 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
     [DataDefinition]
     public sealed partial class SpawnEntitiesBehavior : IThresholdBehavior
     {
-        private static readonly EntProtoId TempEntityProtoId = "TemporaryEntityForTimedDespawnSpawners";
-
         /// <summary>
         ///     Entities spawned on reaching this threshold, from a min to a max.
         /// </summary>
         [DataField]
-        public Dictionary<EntProtoId, MinMax> Spawn = [];
+        public Dictionary<EntProtoId, MinMax> Spawn = new();
 
-        [DataField]
+        [DataField("offset")]
         public float Offset { get; set; } = 0.5f;
 
         [DataField("transferForensics")]
@@ -33,21 +29,12 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
         [DataField]
         public bool SpawnInContainer;
 
-        /// <summary>
-        /// Time in seconds to wait before spawning entities.
-        /// </summary>
-        /// <remarks>
-        /// If positive, <see cref="DoTransferForensics"/> and <see cref="SpawnInContainer"/> are ignored.
-        /// </remarks>
-        [DataField]
-        public float SpawnAfter;
-
         public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
         {
             var tSys = system.EntityManager.System<TransformSystem>();
             var position = tSys.GetMapCoordinates(owner);
 
-            Vector2 GetRandomVector() => system.Random.NextVector2(Offset);
+            var getRandomVector = () => new Vector2(system.Random.NextFloat(-Offset, Offset), system.Random.NextFloat(-Offset, Offset));
 
             var executions = 1;
             if (system.EntityManager.TryGetComponent<StackComponent>(owner, out var stack))
@@ -66,23 +53,11 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
                     if (count == 0)
                         continue;
 
-                    if (SpawnAfter > 0)
-                    {
-                        // TODO: TransferForensics is not supported here because the actual entity UID is not known until the spawner spawns it.
-                        for (var i = 0; i < count; i++)
-                        {
-                            var spawner = system.EntityManager.SpawnEntity(TempEntityProtoId, position.Offset(GetRandomVector()));
-                            var timedDespawn = system.EntityManager.GetComponent<TimedDespawnComponent>(spawner);
-                            timedDespawn.Lifetime = SpawnAfter;
-                            var spawnOnDespawn = system.EntityManager.GetComponent<SpawnOnDespawnComponent>(spawner);
-                            system.EntityManager.System<SpawnOnDespawnSystem>().SetPrototype((spawner, spawnOnDespawn), entityId);
-                        }
-                    }
-                    else if (EntityPrototypeHelpers.HasComponent<StackComponent>(entityId, system.PrototypeManager, system.EntityManager.ComponentFactory))
+                    if (EntityPrototypeHelpers.HasComponent<StackComponent>(entityId, system.PrototypeManager, system.EntityManager.ComponentFactory))
                     {
                         var spawned = SpawnInContainer
                             ? system.EntityManager.SpawnNextToOrDrop(entityId, owner)
-                            : system.EntityManager.SpawnEntity(entityId, position.Offset(GetRandomVector()));
+                            : system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
                         system.StackSystem.SetCount((spawned, null), count);
 
                         TransferForensics(spawned, system, owner);
@@ -93,7 +68,7 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
                         {
                             var spawned = SpawnInContainer
                                 ? system.EntityManager.SpawnNextToOrDrop(entityId, owner)
-                                : system.EntityManager.SpawnEntity(entityId, position.Offset(GetRandomVector()));
+                                : system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
 
                             TransferForensics(spawned, system, owner);
                         }
diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index de2fbb6d69..b605ae58f8 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -50,7 +50,7 @@ public sealed partial class ElectrocutionSystem : SharedElectrocutionSystem
     [Dependency] private SharedJitteringSystem _jittering = default!;
     [Dependency] private SharedPopupSystem _popup = default!;
     [Dependency] private SharedStunSystem _stun = default!;
-    [Dependency] private SharedStutteringSystem _stuttering = default!;
+    [Dependency] private StutteringSystem _stuttering = default!;
     [Dependency] private TagSystem _tag = default!;
     [Dependency] private MetaDataSystem _metaData = default!;
     [Dependency] private TurfSystem _turf = default!;
diff --git a/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
index c623b25857..b1e2703995 100644
--- a/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Ghost.Roles.Components;
-using Content.Server.Speech.Components;
 using Content.Shared.EntityEffects;
 using Content.Shared.EntityEffects.Effects;
 using Content.Shared.Mind.Components;
+using Content.Shared.Speech.Components;
 
 namespace Content.Server.EntityEffects.Effects;
 
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index af8d698d70..7d69482bd2 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -5,12 +5,10 @@ using Content.Server.Administration.Managers;
 using Content.Server.Administration.Systems;
 using Content.Server.GameTicking.Events;
 using Content.Server.Spawners.Components;
-using Content.Server.Speech.Components;
 using Content.Server.Station.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.GameTicking;
-using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Mind;
 using Content.Shared.Players;
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 774331080f..dd39f63716 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -1,45 +1,42 @@
+using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Construction;
-using Content.Server.Explosion.EntitySystems;
+using Content.Server.Construction.Components;
 using Content.Server.DeviceLinking.Systems;
+using Content.Server.Explosion.EntitySystems;
 using Content.Server.Hands.Systems;
 using Content.Server.Kitchen.Components;
+using Content.Server.Lightning;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Temperature.Systems;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Construction.EntitySystems;
+using Content.Shared.Damage.Components;
 using Content.Shared.Database;
-using Content.Shared.DeviceLinking.Events;
 using Content.Shared.Destructible;
+using Content.Shared.DeviceLinking.Events;
 using Content.Shared.FixedPoint;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
-using Robust.Shared.Random;
-using Robust.Shared.Audio;
-using Content.Server.Lightning;
 using Content.Shared.Item;
 using Content.Shared.Kitchen;
 using Content.Shared.Kitchen.Components;
 using Content.Shared.Popups;
 using Content.Shared.Power;
+using Content.Shared.Power.EntitySystems;
+using Content.Shared.Stacks;
+using Content.Shared.Suicide;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
-using Robust.Shared.Player;
-using System.Linq;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Timing;
-using Content.Shared.Stacks;
-using Content.Server.Construction.Components;
-using Content.Shared.Chat;
-using Content.Shared.Damage.Components;
-using Content.Shared.Power.EntitySystems;
-using Content.Shared.Temperature.Components;
-using Content.Shared.IdentityManagement;
 
 namespace Content.Server.Kitchen.EntitySystems
 {
@@ -179,8 +176,7 @@ namespace Content.Server.Kitchen.EntitySystems
             var heatToAdd = time * component.BaseHeatMultiplier;
             foreach (var entity in component.Storage.ContainedEntities)
             {
-                if (TryComp<TemperatureComponent>(entity, out var tempComp))
-                    _temperature.ChangeHeat(entity, heatToAdd * component.ObjectHeatMultiplier, false, tempComp);
+                _temperature.ChangeHeat(entity, heatToAdd * component.ObjectHeatMultiplier, false);
 
                 foreach (var (_, soln) in _solutionContainer.EnumerateSolutions(entity))
                 {
diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
index 69cc1e3940..fce66ee6f2 100644
--- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
@@ -1,9 +1,9 @@
-using Content.Server.AlertLevel;
 using Content.Server.Audio;
 using Content.Server.Light.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Station.Systems;
+using Content.Shared.AlertLevel;
 using Content.Shared.Examine;
 using Content.Shared.Light;
 using Content.Shared.Light.Components;
@@ -18,6 +18,7 @@ namespace Content.Server.Light.EntitySystems;
 public sealed partial class EmergencyLightSystem : SharedEmergencyLightSystem
 {
     [Dependency] private AmbientSoundSystem _ambient = default!;
+    [Dependency] private AlertLevelSystem _alert = default!;
     [Dependency] private BatterySystem _battery = default!;
     [Dependency] private PointLightSystem _pointLight = default!;
     [Dependency] private SharedAppearanceSystem _appearance = default!;
@@ -57,22 +58,17 @@ public sealed partial class EmergencyLightSystem : SharedEmergencyLightSystem
                         Loc.GetString(component.BatteryStateText[component.State]))));
 
             // Show alert level on the light itself.
-            if (!TryComp<AlertLevelComponent>(_station.GetOwningStation(uid), out var alerts))
+            if (_station.GetOwningStation(uid) is not { } station)
                 return;
 
-            if (alerts.AlertLevels == null)
+            if (!_alert.TryGetLevel(station, out var level)
+                || !ProtoMan.Resolve(level, out var proto))
                 return;
 
-            var name = alerts.CurrentLevel;
-
-            var color = Color.White;
-            if (alerts.AlertLevels.Levels.TryGetValue(alerts.CurrentLevel, out var details))
-                color = details.Color;
-
             args.PushMarkup(
                 Loc.GetString("emergency-light-component-on-examine-alert",
-                    ("color", color.ToHex()),
-                    ("level", Loc.GetString($"alert-level-{name.ToString().ToLower()}"))));
+                    ("color", proto.Color.ToHex()),
+                    ("level", proto.LocalizedName)));
         }
     }
 
@@ -93,12 +89,9 @@ public sealed partial class EmergencyLightSystem : SharedEmergencyLightSystem
         }
     }
 
-    private void OnAlertLevelChanged(AlertLevelChangedEvent ev)
+    private void OnAlertLevelChanged(ref AlertLevelChangedEvent ev)
     {
-        if (!TryComp<AlertLevelComponent>(ev.Station, out var alert))
-            return;
-
-        if (alert.AlertLevels == null || !alert.AlertLevels.Levels.TryGetValue(ev.AlertLevel, out var details))
+        if (!ProtoMan.Resolve(ev.AlertLevel, out var level))
             return;
 
         var query = EntityQueryEnumerator<EmergencyLightComponent, PointLightComponent, AppearanceComponent, TransformComponent>();
@@ -107,15 +100,15 @@ public sealed partial class EmergencyLightSystem : SharedEmergencyLightSystem
             if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != ev.Station)
                 continue;
 
-            _pointLight.SetColor(uid, details.EmergencyLightColor, pointLight);
-            _appearance.SetData(uid, EmergencyLightVisuals.Color, details.EmergencyLightColor, appearance);
+            _pointLight.SetColor(uid, level.EmergencyLightColor, pointLight);
+            _appearance.SetData(uid, EmergencyLightVisuals.Color, level.EmergencyLightColor, appearance);
 
-            if (details.ForceEnableEmergencyLights && !light.ForciblyEnabled)
+            if (level.ForceEnableEmergencyLights && !light.ForciblyEnabled)
             {
                 light.ForciblyEnabled = true;
                 TurnOn((uid, light));
             }
-            else if (!details.ForceEnableEmergencyLights && light.ForciblyEnabled)
+            else if (!level.ForceEnableEmergencyLights && light.ForciblyEnabled)
             {
                 // Previously forcibly enabled, and we went down an alert level.
                 light.ForciblyEnabled = false;
@@ -174,10 +167,10 @@ public sealed partial class EmergencyLightSystem : SharedEmergencyLightSystem
         if (!TryComp<ApcPowerReceiverComponent>(entity.Owner, out var receiver))
             return;
 
-        if (!TryComp<AlertLevelComponent>(_station.GetOwningStation(entity.Owner), out var alerts))
-            return;
-
-        if (alerts.AlertLevels == null || !alerts.AlertLevels.Levels.TryGetValue(alerts.CurrentLevel, out var details))
+        // Show alert level on the light itself.
+        if (_station.GetOwningStation(entity.Owner) is not { } station
+            || !_alert.TryGetLevel(station, out var level)
+            || !ProtoMan.Resolve(level, out var proto))
         {
             TurnOff(entity, Color.Red); // if no alert, default to off red state
             return;
@@ -185,8 +178,8 @@ public sealed partial class EmergencyLightSystem : SharedEmergencyLightSystem
 
         if (receiver.Powered && !entity.Comp.ForciblyEnabled) // Green alert
         {
-            receiver.Load = (int) Math.Abs(entity.Comp.Wattage);
-            TurnOff(entity, details.Color);
+            receiver.Load = (int)Math.Abs(entity.Comp.Wattage);
+            TurnOff(entity, proto.EmergencyLightColor);
             SetState(entity.Owner, entity.Comp, EmergencyLightState.Charging);
         }
         else if (!receiver.Powered) // If internal battery runs out it will end in off red state
@@ -196,7 +189,7 @@ public sealed partial class EmergencyLightSystem : SharedEmergencyLightSystem
         }
         else // Powered and enabled
         {
-            TurnOn(entity, details.Color);
+            TurnOn(entity, proto.EmergencyLightColor);
             SetState(entity.Owner, entity.Comp, EmergencyLightState.On);
         }
     }
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index cce1d4ad13..869cfc69d5 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -231,7 +231,7 @@ public sealed partial class HealthAnalyzerSystem : EntitySystem
         var bodyTemperature = float.NaN;
 
         if (TryComp<TemperatureComponent>(entity, out var temp))
-            bodyTemperature = temp.CurrentTemperature;
+            bodyTemperature = temp.Temperature;
 
         var bloodAmount = float.NaN;
         var bleeding = false;
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index c0e7db0120..859aac60a0 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -384,7 +384,7 @@ public sealed partial class NPCUtilitySystem : EntitySystem
                     if (!TryComp<TemperatureComponent>(targetUid, out var temperature))
                         return 0f;
 
-                    return temperature.CurrentTemperature <= con.MinTemp ? 1f : 0f;
+                    return temperature.Temperature <= con.MinTemp ? 1f : 0f;
                 }
             default:
                 throw new NotImplementedException();
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 502e2d1862..1dba04507f 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.AlertLevel;
 using Content.Server.Audio;
 using Content.Server.Chat.Systems;
 using Content.Server.Explosion.EntitySystems;
@@ -6,6 +5,7 @@ using Content.Server.Pinpointer;
 using Content.Server.Popups;
 using Content.Server.Station.Systems;
 using Content.Shared.Audio;
+using Content.Shared.AlertLevel;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.DoAfter;
@@ -489,7 +489,7 @@ public sealed partial class NukeSystem : EntitySystem
         // let people know that a nuclear bomb was armed in their vicinity instead.
         // Otherwise, you could set every station to whatever AlertLevelOnActivate is.
         if (stationUid != null)
-            _alertLevel.SetLevel(stationUid.Value, component.AlertLevelOnActivate, true, true, true, true);
+            _alertLevel.SetLevel(stationUid.Value, component.AlertLevelOnActivate, true, true, true);
 
         var pos = _transform.GetMapCoordinates(uid, xform: nukeXform);
         var x = (int) pos.X;
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index 2d92224ecd..23c3b1923f 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Access.Systems;
-using Content.Server.AlertLevel;
 using Content.Server.CartridgeLoader;
 using Content.Server.Chat.Managers;
 using Content.Server.Instruments;
@@ -10,6 +9,7 @@ using Content.Server.Station.Systems;
 using Content.Server.Store.Systems;
 using Content.Server.Traitor.Uplink;
 using Content.Shared.Access.Components;
+using Content.Shared.AlertLevel;
 using Content.Shared.CartridgeLoader;
 using Content.Shared.Chat;
 using Content.Shared.DeviceNetwork.Components;
@@ -25,6 +25,7 @@ using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Server.PDA
@@ -41,6 +42,7 @@ namespace Content.Server.PDA
         [Dependency] private UnpoweredFlashlightSystem _unpoweredFlashlight = default!;
         [Dependency] private ContainerSystem _containerSystem = default!;
         [Dependency] private IdCardSystem _idCard = default!;
+        [Dependency] private IPrototypeManager _prototype = default!;
 
         public override void Initialize()
         {
@@ -143,7 +145,7 @@ namespace Content.Server.PDA
             UpdateAllPdaUisOnStation();
         }
 
-        private void OnAlertLevelChanged(AlertLevelChangedEvent args)
+        private void OnAlertLevelChanged(ref AlertLevelChangedEvent args)
         {
             UpdateAllPdaUisOnStation();
         }
@@ -328,12 +330,11 @@ namespace Content.Server.PDA
         private void UpdateAlertLevel(EntityUid uid, PdaComponent pda)
         {
             var station = _station.GetOwningStation(uid);
-            if (!TryComp(station, out AlertLevelComponent? alertComp) ||
-                alertComp.AlertLevels == null)
+            if (!TryComp(station, out AlertLevelComponent? alertComp))
                 return;
-            pda.StationAlertLevel = alertComp.CurrentLevel;
-            if (alertComp.AlertLevels.Levels.TryGetValue(alertComp.CurrentLevel, out var details))
-                pda.StationAlertColor = details.Color;
+            pda.StationAlertLevel = alertComp.CurrentAlertLevel;
+            if (_prototype.Resolve(alertComp.CurrentAlertLevel, out var level))
+                pda.StationAlertColor = level.Color;
         }
 
         private string? GetDeviceNetAddress(EntityUid uid)
diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs
index 76abe69bd2..4b52edff01 100644
--- a/Content.Server/RoundEnd/RoundEndSystem.cs
+++ b/Content.Server/RoundEnd/RoundEndSystem.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using Content.Server.Administration.Logs;
-using Content.Server.AlertLevel;
+using Content.Shared.AlertLevel;
 using Content.Shared.CCVar;
 using Content.Server.Chat.Managers;
 using Content.Server.Chat.Systems;
@@ -146,11 +146,11 @@ namespace Content.Server.RoundEnd
             if (requester != null)
             {
                 var stationUid = _stationSystem.GetOwningStation(requester.Value);
-                if (TryComp<AlertLevelComponent>(stationUid, out var alertLevel))
+                if (TryComp<AlertLevelComponent>(stationUid, out var alertLevelComp))
                 {
                     duration = ProtoMan
-                        .Index<AlertLevelPrototype>(AlertLevelSystem.DefaultAlertLevelSet)
-                        .Levels[alertLevel.CurrentLevel].ShuttleTime;
+                        .Index(alertLevelComp.CurrentAlertLevel)
+                        .ShuttleTime;
                 }
             }
 
diff --git a/Content.Server/Speech/Components/BackwardsAccentComponent.cs b/Content.Server/Speech/Components/BackwardsAccentComponent.cs
deleted file mode 100644
index 6ee8aa7690..0000000000
--- a/Content.Server/Speech/Components/BackwardsAccentComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-[RegisterComponent]
-public sealed partial class BackwardsAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/BarkAccentComponent.cs b/Content.Server/Speech/Components/BarkAccentComponent.cs
deleted file mode 100644
index f584a2aa23..0000000000
--- a/Content.Server/Speech/Components/BarkAccentComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-[RegisterComponent]
-public sealed partial class BarkAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/BleatingAccentComponent.cs b/Content.Server/Speech/Components/BleatingAccentComponent.cs
deleted file mode 100644
index 4f889b1e87..0000000000
--- a/Content.Server/Speech/Components/BleatingAccentComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-/// Makes this entity speak like a sheep or a goat in all chat messages it sends.
-/// </summary>
-[RegisterComponent]
-public sealed partial class BleatingAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/BlockListeningComponent.cs b/Content.Server/Speech/Components/BlockListeningComponent.cs
deleted file mode 100644
index 3c747252ba..0000000000
--- a/Content.Server/Speech/Components/BlockListeningComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-///     Causes all ListenAttemptEvents to fail on the entity.
-/// </summary>
-[RegisterComponent]
-public sealed partial class BlockListeningComponent : Component
-{
-
-}
diff --git a/Content.Server/Speech/Components/FrontalLispComponent.cs b/Content.Server/Speech/Components/FrontalLispComponent.cs
deleted file mode 100644
index 9f0ec761e3..0000000000
--- a/Content.Server/Speech/Components/FrontalLispComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-[RegisterComponent]
-public sealed partial class FrontalLispComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/GermanAccentComponent.cs b/Content.Server/Speech/Components/GermanAccentComponent.cs
deleted file mode 100644
index 10b7ed0234..0000000000
--- a/Content.Server/Speech/Components/GermanAccentComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-[RegisterComponent]
-public sealed partial class GermanAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/LizardAccentComponent.cs b/Content.Server/Speech/Components/LizardAccentComponent.cs
deleted file mode 100644
index 6008c7248e..0000000000
--- a/Content.Server/Speech/Components/LizardAccentComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-///     Hiss!
-/// </summary>
-[RegisterComponent]
-public sealed partial class LizardAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/MobsterAccentComponent.cs b/Content.Server/Speech/Components/MobsterAccentComponent.cs
deleted file mode 100644
index db92c5fd7a..0000000000
--- a/Content.Server/Speech/Components/MobsterAccentComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-///     Nyehh, my gabagool, see?
-///     Etc etc.
-/// </summary>
-[RegisterComponent]
-public sealed partial class MobsterAccentComponent : BaseAccentComponent
-{
-    /// <summary>
-    ///     Do you make all the rules?
-    /// </summary>
-    [DataField("isBoss")]
-    public bool IsBoss = true;
-}
diff --git a/Content.Server/Speech/Components/MonkeyAccentComponent.cs b/Content.Server/Speech/Components/MonkeyAccentComponent.cs
deleted file mode 100644
index b2ae0ed246..0000000000
--- a/Content.Server/Speech/Components/MonkeyAccentComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-[RegisterComponent]
-public sealed partial class MonkeyAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/MothAccentComponent.cs b/Content.Server/Speech/Components/MothAccentComponent.cs
deleted file mode 100644
index e3a61cc4cf..0000000000
--- a/Content.Server/Speech/Components/MothAccentComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-///     Buzzz!
-/// </summary>
-[RegisterComponent]
-public sealed partial class MothAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/OwOAccentComponent.cs b/Content.Server/Speech/Components/OwOAccentComponent.cs
deleted file mode 100644
index a7c1d3c7b4..0000000000
--- a/Content.Server/Speech/Components/OwOAccentComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-[RegisterComponent]
-public sealed partial class OwOAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/ReplacementAccentComponent.cs b/Content.Server/Speech/Components/ReplacementAccentComponent.cs
deleted file mode 100644
index 4a6508b241..0000000000
--- a/Content.Server/Speech/Components/ReplacementAccentComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.Speech.Prototypes;
-using Content.Shared.Speech.Components;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-/// Replaces full sentences or words within sentences with new strings.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ReplacementAccentComponent : BaseAccentComponent
-{
-    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<ReplacementAccentPrototype>), required: true)]
-    public string Accent = default!;
-
-}
diff --git a/Content.Server/Speech/Components/RussianAccentComponent.cs b/Content.Server/Speech/Components/RussianAccentComponent.cs
deleted file mode 100644
index 2b06b3b668..0000000000
--- a/Content.Server/Speech/Components/RussianAccentComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-[RegisterComponent]
-public sealed partial class RussianAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/ScrambledAccentComponent.cs b/Content.Server/Speech/Components/ScrambledAccentComponent.cs
deleted file mode 100644
index f2f75a18fd..0000000000
--- a/Content.Server/Speech/Components/ScrambledAccentComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-[RegisterComponent]
-public sealed partial class ScrambledAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/SkeletonAccentComponent.cs b/Content.Server/Speech/Components/SkeletonAccentComponent.cs
deleted file mode 100644
index 50b52b57f7..0000000000
--- a/Content.Server/Speech/Components/SkeletonAccentComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-///     Rattle me bones!
-/// </summary>
-[RegisterComponent]
-public sealed partial class SkeletonAccentComponent : BaseAccentComponent
-{
-    /// <summary>
-    ///     Chance that the message will be appended with "ACK ACK!"
-    /// </summary>
-    [DataField("ackChance")]
-    public float ackChance = 0.3f; // Funnier if it doesn't happen every single time
-}
diff --git a/Content.Server/Speech/Components/SlowAccentComponent.cs b/Content.Server/Speech/Components/SlowAccentComponent.cs
deleted file mode 100644
index 225b727b9e..0000000000
--- a/Content.Server/Speech/Components/SlowAccentComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-/// Makes... the... entity... talk... like... this...
-/// </summary>
-[RegisterComponent]
-public sealed partial class SlowAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/SouthernAccentComponent.cs b/Content.Server/Speech/Components/SouthernAccentComponent.cs
deleted file mode 100644
index ac44e051cb..0000000000
--- a/Content.Server/Speech/Components/SouthernAccentComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Server.Speech.EntitySystems;
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-[RegisterComponent]
-[Access(typeof(SouthernAccentSystem))]
-public sealed partial class SouthernAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/SpanishAccentComponent.cs b/Content.Server/Speech/Components/SpanishAccentComponent.cs
deleted file mode 100644
index c7c769b074..0000000000
--- a/Content.Server/Speech/Components/SpanishAccentComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Speech.Components;
-
-namespace Content.Server.Speech.Components;
-
-[RegisterComponent]
-public sealed partial class SpanishAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/UnblockableSpeechComponent.cs b/Content.Server/Speech/Components/UnblockableSpeechComponent.cs
deleted file mode 100644
index 48e2b9863a..0000000000
--- a/Content.Server/Speech/Components/UnblockableSpeechComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Speech.Components
-{
-    [RegisterComponent]
-    public sealed partial class UnblockableSpeechComponent : Component
-    {
-    }
-}
diff --git a/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs b/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs
deleted file mode 100644
index 17cffac759..0000000000
--- a/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
-using Robust.Shared.Random;
-
-namespace Content.Server.Speech.EntitySystems;
-
-public sealed partial class BarkAccentSystem : RelayAccentSystem<BarkAccentComponent>
-{
-    [Dependency] private IRobustRandom _random = default!;
-
-    private static readonly IReadOnlyList<string> Barks = new List<string>{
-            " Гав!", " ГАВ", " вуф-вуф"  // Corvax-Localization
-        }.AsReadOnly();
-
-    private static readonly IReadOnlyDictionary<string, string> SpecialWords = new Dictionary<string, string>()
-        {
-            { "ah", "arf" },
-            { "Ah", "Arf" },
-            { "oh", "oof" },
-            { "Oh", "Oof" },
-            //Corvax-Localization-Start
-            { "га", "гаф" },
-            { "Га", "Гаф" },
-            { "угу", "вуф" },
-            { "Угу", "Вуф" },
-            //Corvax-Localization-End
-        };
-
-    public override string Accentuate(string message, Entity<BarkAccentComponent>? ent = null)
-    {
-        foreach (var (word, repl) in SpecialWords)
-        {
-            message = message.Replace(word, repl);
-        }
-
-        return message.Replace("!", _random.Pick(Barks))
-            .Replace("l", "r").Replace("L", "R")
-            .Replace("л", "р").Replace("Л", "Р");//Corvax-Localization
-    }
-}
diff --git a/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs b/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs
deleted file mode 100644
index 6b09877512..0000000000
--- a/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Server.Speech.Components;
-using Content.Shared.Speech;
-
-namespace Content.Server.Speech.EntitySystems;
-
-public sealed class BlockListeningSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<BlockListeningComponent, ListenAttemptEvent>(OnListenAttempt);
-    }
-
-    private void OnListenAttempt(EntityUid uid, BlockListeningComponent component, ListenAttemptEvent args)
-    {
-        args.Cancel();
-    }
-}
diff --git a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
index 067dc34687..3ab654746a 100644
--- a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
@@ -1,119 +1,19 @@
 using System.Text;
 using Content.Server.Destructible;
-using Content.Shared.Speech.Components;
-using Content.Shared.Damage.Components;
-using Content.Shared.Damage.Systems;
 using Content.Shared.FixedPoint;
-using Content.Shared.Power.EntitySystems;
-using Content.Shared.PowerCell;
+using Content.Shared.Speech.Components;
 using Content.Shared.Speech.EntitySystems;
+
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
 
-public sealed partial class DamagedSiliconAccentSystem : RelayAccentSystem<DamagedSiliconAccentComponent>
+public sealed partial class DamagedSiliconAccentSystem : SharedDamagedSiliconAccentSystem
 {
     [Dependency] private IRobustRandom _random = default!;
-    [Dependency] private SharedBatterySystem _battery = default!;
-    [Dependency] private PowerCellSystem _powerCell = default!;
     [Dependency] private DestructibleSystem _destructibleSystem = default!;
-    [Dependency] private DamageableSystem _damageable = default!;
 
-    protected override Type[]? AccentAfter => [typeof(ReplacementAccentSystem)];
-    protected override Type[]? RelayAccentAfter => [typeof(ReplacementAccentSystem)];
-
-    public override string Accentuate(string message, Entity<DamagedSiliconAccentComponent>? ent = null)
-    {
-        if (ent == null)
-            return message;
-
-        var uid = ent.Value.Owner;
-
-        if (ent.Value.Comp.EnableChargeCorruption)
-        {
-            var currentChargeLevel = 0.0f;
-            if (ent.Value.Comp.OverrideChargeLevel.HasValue)
-            {
-                currentChargeLevel = ent.Value.Comp.OverrideChargeLevel.Value;
-            }
-            else if (_powerCell.TryGetBatteryFromSlot(uid, out var battery))
-            {
-                currentChargeLevel = _battery.GetChargeLevel(battery.Value.AsNullable());
-            }
-            currentChargeLevel = Math.Clamp(currentChargeLevel, 0.0f, 1.0f);
-            // Corrupt due to low power (drops characters on longer messages)
-            message = CorruptPower(message, currentChargeLevel, ent.Value.Comp);
-        }
-
-        if (ent.Value.Comp.EnableDamageCorruption)
-        {
-            var damage = FixedPoint2.Zero;
-            if (ent.Value.Comp.OverrideTotalDamage.HasValue)
-            {
-                damage = ent.Value.Comp.OverrideTotalDamage.Value;
-            }
-            else if (TryComp<DamageableComponent>(uid, out var damageable))
-            {
-                damage = _damageable.GetTotalDamage((uid, damageable));
-            }
-            // Corrupt due to damage (drop, repeat, replace with symbols)
-            message = CorruptDamage(message, damage, ent.Value);
-        }
-
-        return message;
-    }
-
-    public string CorruptPower(string message, float chargeLevel, DamagedSiliconAccentComponent comp)
-    {
-        // The first idxMin characters are SAFE
-        var idxMin = comp.StartPowerCorruptionAtCharIdx;
-        // Probability will max at idxMax
-        var idxMax = comp.MaxPowerCorruptionAtCharIdx;
-
-        // Fast bails, would not have an effect
-        if (chargeLevel > comp.ChargeThresholdForPowerCorruption || message.Length < idxMin)
-        {
-            return message;
-        }
-
-        var outMsg = new StringBuilder();
-
-        var maxDropProb = comp.MaxDropProbFromPower * (1.0f - chargeLevel / comp.ChargeThresholdForPowerCorruption);
-
-        var idx = -1;
-        foreach (var letter in message)
-        {
-            idx++;
-            if (idx < idxMin) // Fast character, no effect
-            {
-                outMsg.Append(letter);
-                continue;
-            }
-
-            // use an x^2 interpolation to increase the drop probability until we hit idxMax
-            var probToDrop = idx >= idxMax
-                ? maxDropProb
-                : (float)Math.Pow(((double)idx - idxMin) / (idxMax - idxMin), 2.0) * maxDropProb;
-            // Ensure we're in the range for Prob()
-            probToDrop = Math.Clamp(probToDrop, 0.0f, 1.0f);
-
-            if (_random.Prob(probToDrop)) // Lose a character
-            {
-                // Additional chance to change to dot for flavor instead of full drop
-                if (_random.Prob(comp.ProbToCorruptDotFromPower))
-                {
-                    outMsg.Append('.');
-                }
-            }
-            else // Character is safe
-            {
-                outMsg.Append(letter);
-            }
-        }
-        return outMsg.ToString();
-    }
-
-    private string CorruptDamage(string message, FixedPoint2 totalDamage, Entity<DamagedSiliconAccentComponent> ent)
+    protected override string CorruptDamage(string message, FixedPoint2 totalDamage, Entity<DamagedSiliconAccentComponent> ent)
     {
         var outMsg = new StringBuilder();
 
diff --git a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs b/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
deleted file mode 100644
index b41b2c4441..0000000000
--- a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
-using Robust.Shared.Random; // Corvax-Localization
-
-namespace Content.Server.Speech.EntitySystems;
-
-public sealed partial class FrontalLispSystem : RelayAccentSystem<FrontalLispComponent>
-{
-    // @formatter:off
-    private static readonly Regex RegexUpperTh = new(@"[T]+[Ss]+|[S]+[Cc]+(?=[IiEeYy]+)|[C]+(?=[IiEeYy]+)|[P][Ss]+|([S]+[Tt]+|[T]+)(?=[Ii]+[Oo]+[Uu]*[Nn]*)|[C]+[Hh]+(?=[Ii]*[Ee]*)|[Z]+|[S]+|[X]+(?=[Ee]+)");
-    private static readonly Regex RegexLowerTh = new(@"[t]+[s]+|[s]+[c]+(?=[iey]+)|[c]+(?=[iey]+)|[p][s]+|([s]+[t]+|[t]+)(?=[i]+[o]+[u]*[n]*)|[c]+[h]+(?=[i]*[e]*)|[z]+|[s]+|[x]+(?=[e]+)");
-    private static readonly Regex RegexUpperEcks = new(@"[E]+[Xx]+[Cc]*|[X]+");
-    private static readonly Regex RegexLowerEcks = new(@"[e]+[x]+[c]*|[x]+");
-    // @formatter:on
-
-    // Corvax-Localization Start
-    private static readonly Regex _regexLowerC = new Regex("с");// для "с" на "ш"/"с"
-    private static readonly Regex _regexUpperC = new Regex("С");// для "С" на "Ш"/"С"
-    private static readonly Regex _regexLowerCh = new Regex("ч");// для "ч" на "ш"/"ч"
-    private static readonly Regex _regexUpperCh = new Regex("Ч");// для "Ч" на "Ш"/"Ч"
-    private static readonly Regex _regexLowerTs = new Regex("ц");// для "ц" на "ч"/"ц"
-    private static readonly Regex _regexUpperTs = new Regex("Ц");// для "Ц" на "Ч"/"Ц"
-    private static readonly Regex _regexLowerT = new Regex(@"\B[т](?![АЕЁИОУЫЭЮЯаеёиоуыэюя])");
-    private static readonly Regex _regexUpperT = new Regex(@"\B[Т](?![АЕЁИОУЫЭЮЯаеёиоуыэюя])");
-    private static readonly Regex _regexLowerZ = new Regex("з");// для "з" на "ж"/"з"
-    private static readonly Regex _regexUpperZ = new Regex("З");// для "З" на "Ж"/"З"
-    // Corvax-Localization End
-
-    [Dependency] private IRobustRandom _random = default!; // Corvax-Localization
-
-    public override string Accentuate(string message, Entity<FrontalLispComponent>? ent = null)
-    {
-        // handles ts, sc(i|e|y), c(i|e|y), ps, st(io(u|n)), ch(i|e), z, s
-        message = RegexUpperTh.Replace(message, "TH");
-        message = RegexLowerTh.Replace(message, "th");
-        // handles ex(c), x
-        message = RegexUpperEcks.Replace(message, "EKTH");
-        message = RegexLowerEcks.Replace(message, "ekth");
-
-        // Corvax-Localization Start
-        message = _regexLowerC.Replace(message, _random.Prob(0.90f) ? "ш" : "с");
-        message = _regexUpperC.Replace(message, _random.Prob(0.90f) ? "Ш" : "С");
-        message = _regexLowerCh.Replace(message, _random.Prob(0.90f) ? "ш" : "ч");
-        message = _regexUpperCh.Replace(message, _random.Prob(0.90f) ? "Ш" : "Ч");
-        message = _regexLowerTs.Replace(message, _random.Prob(0.90f) ? "ч" : "ц");
-        message = _regexUpperTs.Replace(message, _random.Prob(0.90f) ? "Ч" : "Ц");
-        message = _regexLowerT.Replace(message, _random.Prob(0.90f) ? "ч" : "т");
-        message = _regexUpperT.Replace(message, _random.Prob(0.90f) ? "Ч" : "Т");
-        message = _regexLowerZ.Replace(message, _random.Prob(0.90f) ? "ж" : "з");
-        message = _regexUpperZ.Replace(message, _random.Prob(0.90f) ? "Ж" : "З");
-        // Corvax-Localization End
-
-        return message;
-    }
-}
diff --git a/Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs b/Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs
deleted file mode 100644
index e9e224dddb..0000000000
--- a/Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using Content.Server.Administration.Logs;
-using Content.Shared.Actions;
-using Content.Shared.Database;
-using Content.Shared.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
-using Robust.Server.GameObjects;
-using Robust.Shared.Player;
-
-namespace Content.Server.Speech.EntitySystems;
-
-public sealed partial class MeleeSpeechSystem : SharedMeleeSpeechSystem
-{
-    [Dependency] private IAdminLogManager _adminLogger = default!;
-    [Dependency] private SharedActionsSystem _actionSystem = default!;
-    [Dependency] private UserInterfaceSystem _uiSystem = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<MeleeSpeechComponent, MeleeSpeechBattlecryChangedMessage>(OnBattlecryChanged);
-        SubscribeLocalEvent<MeleeSpeechComponent, MeleeSpeechConfigureActionEvent>(OnConfigureAction);
-        SubscribeLocalEvent<MeleeSpeechComponent, GetItemActionsEvent>(OnGetActions);
-        SubscribeLocalEvent<MeleeSpeechComponent, MapInitEvent>(OnComponentMapInit);
-    }
-    private void OnComponentMapInit(EntityUid uid, MeleeSpeechComponent component, MapInitEvent args)
-    {
-        _actionSystem.AddAction(uid, ref component.ConfigureActionEntity, component.ConfigureAction, uid);
-    }
-    private void OnGetActions(EntityUid uid, MeleeSpeechComponent component, GetItemActionsEvent args)
-    {
-        args.AddAction(ref component.ConfigureActionEntity, component.ConfigureAction);
-    }
-    private void OnBattlecryChanged(EntityUid uid, MeleeSpeechComponent comp, MeleeSpeechBattlecryChangedMessage args)
-    {
-        if (!TryComp<MeleeSpeechComponent>(uid, out var meleeSpeechUser))
-            return;
-        var battlecry = args.Battlecry;
-        if (battlecry.Length > comp.MaxBattlecryLength)
-            battlecry = battlecry[..comp.MaxBattlecryLength];
-        TryChangeBattlecry(uid, battlecry, meleeSpeechUser);
-    }
-    /// <summary>
-    /// Attempts to open the Battlecry UI.
-    /// </summary>
-    private void OnConfigureAction(EntityUid uid, MeleeSpeechComponent comp, MeleeSpeechConfigureActionEvent args)
-    {
-        TryOpenUi(args.Performer, uid, comp);
-    }
-    public void TryOpenUi(EntityUid user, EntityUid source, MeleeSpeechComponent? component = null)
-    {
-        if (!Resolve(source, ref component))
-            return;
-        if (!TryComp<ActorComponent>(user, out var actor))
-            return;
-        _uiSystem.TryToggleUi(source, MeleeSpeechUiKey.Key, actor.PlayerSession);
-    }
-    /// <summary>
-    /// Attempts to change the battlecry of an entity.
-    /// Returns true/false.
-    /// </summary>
-    /// <remarks>
-    /// Logs changes to an entity's battlecry
-    /// </remarks>
-    public bool TryChangeBattlecry(EntityUid uid, string? battlecry, MeleeSpeechComponent? meleeSpeechComp = null)
-    {
-        if (!Resolve(uid, ref meleeSpeechComp))
-            return false;
-        if (!string.IsNullOrWhiteSpace(battlecry))
-        {
-            battlecry = battlecry.Trim();
-        }
-        else
-        {
-            battlecry = null;
-        }
-        if (meleeSpeechComp.Battlecry == battlecry)
-            return true;
-        meleeSpeechComp.Battlecry = battlecry;
-        Dirty(uid, meleeSpeechComp);
-        _adminLogger.Add(LogType.ItemConfigure, LogImpact.Medium, $" {ToPrettyString(uid):entity}'s battlecry has been changed to {battlecry}");
-        return true;
-    }
-}
diff --git a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs b/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
deleted file mode 100644
index 48c86cbf21..0000000000
--- a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
-using Robust.Shared.Random;
-
-namespace Content.Server.Speech.EntitySystems;
-
-public sealed partial class OwOAccentSystem : RelayAccentSystem<OwOAccentComponent>
-{
-    [Dependency] private IRobustRandom _random = default!;
-
-    private static readonly IReadOnlyList<string> Faces = new List<string>{
-        " (•`ω´•)", " ;;w;;", " owo", " UwU", " >w<", " ^w^"
-    }.AsReadOnly();
-
-    private static readonly IReadOnlyDictionary<string, string> SpecialWords = new Dictionary<string, string>()
-        {
-            { "you", "wu" },
-            { "ты", "ти" }, // Corvax-Localization
-        };
-
-    public override string Accentuate(string message, Entity<OwOAccentComponent>? ent = null)
-    {
-        foreach (var (word, repl) in SpecialWords)
-        {
-            message = message.Replace(word, repl);
-        }
-
-        return message.Replace("!", _random.Pick(Faces))
-            .Replace("r", "w").Replace("R", "W")
-            .Replace("l", "w").Replace("L", "W")
-             // Corvax-Localization-Start
-            .Replace("р", "в").Replace("Р", "В")
-            .Replace("л", "в").Replace("Л", "В");
-            // Corvax-Localization-End
-    }
-}
diff --git a/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs b/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs
deleted file mode 100644
index 0978154b23..0000000000
--- a/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Shared.Speech.EntitySystems;
-
-namespace Content.Server.Speech.EntitySystems;
-
-public sealed partial class RatvarianLanguageSystem : SharedRatvarianLanguageSystem
-{
-    public override void DoRatvarian(EntityUid uid, TimeSpan time, bool refresh)
-    {
-        if (refresh)
-            Status.TryUpdateStatusEffectDuration(uid, Ratvarian, time);
-        else
-            Status.TryAddStatusEffectDuration(uid, Ratvarian, time);
-    }
-}
diff --git a/Content.Server/Speech/EntitySystems/SpeakOnActionSystem.cs b/Content.Server/Speech/EntitySystems/SpeakOnActionSystem.cs
deleted file mode 100644
index de4a814345..0000000000
--- a/Content.Server/Speech/EntitySystems/SpeakOnActionSystem.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Server.Chat.Systems;
-using Content.Shared.Actions.Events;
-using Content.Shared.Chat;
-using Content.Shared.Speech;
-using Content.Shared.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
-using Content.Shared.Speech.Muting;
-
-namespace Content.Server.Speech.EntitySystems;
-
-/// <summary>
-/// As soon as the chat refactor moves to Shared
-/// the logic here can move to the shared <see cref="SharedSpeakOnActionSystem"/>
-/// </summary>
-public sealed partial class SpeakOnActionSystem : SharedSpeakOnActionSystem
-{
-    [Dependency] private ChatSystem _chat = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SpeakOnActionComponent, ActionPerformedEvent>(OnActionPerformed);
-    }
-
-    private void OnActionPerformed(Entity<SpeakOnActionComponent> ent, ref ActionPerformedEvent args)
-    {
-        var user = args.Performer;
-
-        // If we can't speak, we can't speak
-        if (!HasComp<SpeechComponent>(user) || HasComp<MutedComponent>(user))
-            return;
-
-        if (string.IsNullOrWhiteSpace(ent.Comp.Sentence))
-            return;
-
-        _chat.TrySendInGameICMessage(user, Loc.GetString(ent.Comp.Sentence), InGameICChatType.Speak, false);
-    }
-}
diff --git a/Content.Server/Speech/EntitySystems/StutteringSystem.cs b/Content.Server/Speech/EntitySystems/StutteringSystem.cs
deleted file mode 100644
index 2003e54362..0000000000
--- a/Content.Server/Speech/EntitySystems/StutteringSystem.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System.Text;
-using System.Text.RegularExpressions;
-using Content.Shared.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
-using Robust.Shared.Random;
-
-namespace Content.Server.Speech.EntitySystems;
-
-public sealed partial class StutteringSystem : SharedStutteringSystem
-{
-    [Dependency] private IRobustRandom _random = default!;
-
-    // Regex of characters to stutter.
-        private static readonly Regex Stutter = new(@"[b-df-hj-np-tv-wxyz-б-вд-к-лмн-прст]", // Corvax-Localization
-        RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-    public override void DoStutter(EntityUid uid, TimeSpan time, bool refresh)
-    {
-        if (refresh)
-            Status.TryUpdateStatusEffectDuration(uid, Stuttering, time);
-        else
-            Status.TryAddStatusEffectDuration(uid, Stuttering, time);
-    }
-
-    public override void DoRemoveStutterTime(EntityUid uid, TimeSpan timeRemoved)
-    {
-        Status.TryAddTime(uid, Stuttering, -timeRemoved);
-    }
-
-    public override void DoRemoveStutter(EntityUid uid)
-    {
-        Status.TryRemoveStatusEffect(uid, Stuttering);
-    }
-
-    public override string Accentuate(string message, Entity<StutteringAccentComponent>? ent = null)
-    {
-        if (ent == null)
-            return message;
-
-        var length = message.Length;
-
-        var finalMessage = new StringBuilder();
-
-        string newLetter;
-
-        for (var i = 0; i < length; i++)
-        {
-            newLetter = message[i].ToString();
-            if (Stutter.IsMatch(newLetter) && _random.Prob(ent.Value.Comp.MatchRandomProb))
-            {
-                if (_random.Prob(ent.Value.Comp.FourRandomProb))
-                {
-                    newLetter = $"{newLetter}-{newLetter}-{newLetter}-{newLetter}";
-                }
-                else if (_random.Prob(ent.Value.Comp.ThreeRandomProb))
-                {
-                    newLetter = $"{newLetter}-{newLetter}-{newLetter}";
-                }
-                else if (_random.Prob(ent.Value.Comp.CutRandomProb))
-                {
-                    newLetter = "";
-                }
-                else
-                {
-                    newLetter = $"{newLetter}-{newLetter}";
-                }
-            }
-
-            finalMessage.Append(newLetter);
-        }
-
-        return finalMessage.ToString();
-    }
-}
-
diff --git a/Content.Server/Speech/EntitySystems/UnblockableSpeechSystem.cs b/Content.Server/Speech/EntitySystems/UnblockableSpeechSystem.cs
deleted file mode 100644
index 6d5f165d6c..0000000000
--- a/Content.Server/Speech/EntitySystems/UnblockableSpeechSystem.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Server.Speech.Components;
-using Content.Shared.Chat;
-
-namespace Content.Server.Speech.EntitySystems
-{
-    public sealed class UnblockableSpeechSystem : EntitySystem
-    {
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<UnblockableSpeechComponent, CheckIgnoreSpeechBlockerEvent>(OnCheck);
-        }
-
-        private void OnCheck(EntityUid uid, UnblockableSpeechComponent component, CheckIgnoreSpeechBlockerEvent args)
-        {
-            args.IgnoreBlocker = true;
-        }
-    }
-}
diff --git a/Content.Server/Speech/EntitySystems/VocalSystem.cs b/Content.Server/Speech/EntitySystems/VocalSystem.cs
deleted file mode 100644
index 7bd561b4f8..0000000000
--- a/Content.Server/Speech/EntitySystems/VocalSystem.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using Content.Server.Actions;
-using Content.Server.Chat.Systems;
-using Content.Shared.Chat;
-using Content.Shared.Chat.Prototypes;
-using Content.Shared.Humanoid;
-using Content.Shared.Speech;
-using Content.Shared.Speech.Components;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Random;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Speech.EntitySystems;
-
-public sealed partial class VocalSystem : EntitySystem
-{
-    [Dependency] private IRobustRandom _random = default!;
-    [Dependency] private SharedAudioSystem _audio = default!;
-    [Dependency] private ChatSystem _chat = default!;
-    [Dependency] private ActionsSystem _actions = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<VocalComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<VocalComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<VocalComponent, VoiceChangedEvent>(OnVoiceChanged);
-        SubscribeLocalEvent<VocalComponent, EmoteEvent>(OnEmote);
-        SubscribeLocalEvent<VocalComponent, EmoteActionEvent>(OnEmoteAction);
-    }
-
-    /// <summary>
-    /// Copy this component's datafields from one entity to another.
-    /// This can't use CopyComp because of the ScreamActionEntity DataField, which should not be copied.
-    /// </summary>
-    public void CopyComponent(Entity<VocalComponent?> source, EntityUid target)
-    {
-        if (!Resolve(source, ref source.Comp))
-            return;
-
-        var targetComp = EnsureComp<VocalComponent>(target);
-        targetComp.ScreamId = source.Comp.ScreamId;
-        targetComp.Wilhelm = source.Comp.Wilhelm;
-        targetComp.WilhelmProbability = source.Comp.WilhelmProbability;
-        LoadSounds(target, targetComp);
-
-        Dirty(target, targetComp);
-    }
-
-    private void OnMapInit(EntityUid uid, VocalComponent component, MapInitEvent args)
-    {
-        // try to add scream action when vocal comp added
-        _actions.AddAction(uid, ref component.EmoteActionEntity, component.EmoteAction);
-    }
-
-    private void OnShutdown(EntityUid uid, VocalComponent component, ComponentShutdown args)
-    {
-        // remove scream action when component removed
-        if (component.EmoteActionEntity != null)
-        {
-            _actions.RemoveAction(uid, component.EmoteActionEntity);
-        }
-    }
-
-    private void OnVoiceChanged(EntityUid uid, VocalComponent component, VoiceChangedEvent args)
-    {
-        LoadSounds(uid, component, args.NewVoice);
-    }
-
-    private void OnEmote(EntityUid uid, VocalComponent component, ref EmoteEvent args)
-    {
-        if (args.Handled || !args.Emote.Category.HasFlag(EmoteCategory.Vocal))
-            return;
-
-        // snowflake case for wilhelm scream easter egg
-        if (args.Emote == component.ScreamId)
-        {
-            args.Handled = TryPlayScreamSound(uid, component);
-            return;
-        }
-
-        if (component.EmoteSounds is not { } sounds)
-            return;
-
-        // just play regular sound based on emote proto
-        args.Handled = _chat.TryPlayEmoteSound(uid, ProtoMan.Index(sounds), args.Emote);
-    }
-
-    private void OnEmoteAction(EntityUid uid, VocalComponent component, EmoteActionEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        _chat.TryEmoteWithChat(uid, args.Emote);
-        args.Handled = true;
-    }
-
-    private bool TryPlayScreamSound(EntityUid uid, VocalComponent component)
-    {
-        if (_random.Prob(component.WilhelmProbability))
-        {
-            _audio.PlayPvs(component.Wilhelm, uid, component.Wilhelm.Params);
-            return true;
-        }
-
-        if (component.EmoteSounds is not { } sounds)
-            return false;
-
-        return _chat.TryPlayEmoteSound(uid, ProtoMan.Index(sounds), component.ScreamId);
-    }
-
-    /// <summary>
-    /// This only works on Humanoids. Mobs should have emoteSounds on <see cref="VocalComponent"/> set directly instead.
-    /// </summary>
-    private void LoadSounds(EntityUid uid, VocalComponent component, ProtoId<EmoteSoundsPrototype>? protoId = null)
-    {
-        if (!TryComp<HumanoidProfileComponent>(uid, out var humanoid))
-            return;
-
-        protoId ??= humanoid.Voice;
-
-        if (!ProtoMan.HasIndex(protoId))
-            return;
-
-        component.EmoteSounds = protoId;
-    }
-}
diff --git a/Content.Server/Speech/EntitySystems/VoiceOverrideSystem.cs b/Content.Server/Speech/EntitySystems/VoiceOverrideSystem.cs
deleted file mode 100644
index daaad099d6..0000000000
--- a/Content.Server/Speech/EntitySystems/VoiceOverrideSystem.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Shared.Chat;
-using Content.Server.Speech.Components;
-
-namespace Content.Server.Speech.EntitySystems;
-
-public sealed partial class VoiceOverrideSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<VoiceOverrideComponent, TransformSpeakerNameEvent>(OnTransformSpeakerName);
-    }
-
-    private void OnTransformSpeakerName(Entity<VoiceOverrideComponent> entity, ref TransformSpeakerNameEvent args)
-    {
-        if (!entity.Comp.Enabled)
-            return;
-
-        args.VoiceName = entity.Comp.NameOverride ?? args.VoiceName;
-        args.SpeechVerb = entity.Comp.SpeechVerbOverride ?? args.SpeechVerb;
-    }
-}
diff --git a/Content.Server/Speech/Components/ListenWireAction.cs b/Content.Server/Speech/ListenWireAction.cs
similarity index 98%
rename from Content.Server/Speech/Components/ListenWireAction.cs
rename to Content.Server/Speech/ListenWireAction.cs
index f9f1d9e92e..f8f6045523 100644
--- a/Content.Server/Speech/Components/ListenWireAction.cs
+++ b/Content.Server/Speech/ListenWireAction.cs
@@ -1,10 +1,10 @@
 using Content.Server.Chat.Systems;
-using Content.Shared.Radio.Components;
 using Content.Server.Radio.EntitySystems;
-using Content.Server.Speech.Components;
 using Content.Server.Wires;
 using Content.Shared.Radio;
+using Content.Shared.Radio.Components;
 using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Wires;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Speech/Muting/MutingSystem.cs b/Content.Server/Speech/Muting/MutingSystem.cs
index 5ccd30bd76..2dd1e00906 100644
--- a/Content.Server/Speech/Muting/MutingSystem.cs
+++ b/Content.Server/Speech/Muting/MutingSystem.cs
@@ -1,5 +1,5 @@
 using Content.Server.Popups;
-using Content.Server.Speech.EntitySystems;
+using Content.Shared.Speech.EntitySystems;
 using Content.Shared.Abilities.Mime;
 using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
diff --git a/Content.Server/Speech/SpeechNoiseSystem.cs b/Content.Server/Speech/SpeechNoiseSystem.cs
deleted file mode 100644
index 79d4cadc19..0000000000
--- a/Content.Server/Speech/SpeechNoiseSystem.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using Content.Shared.Chat;
-using Content.Shared.Speech;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Speech
-{
-    public sealed partial class SpeechSoundSystem : EntitySystem
-    {
-        [Dependency] private IGameTiming _gameTiming = default!;
-        [Dependency] private IRobustRandom _random = default!;
-        [Dependency] private SharedAudioSystem _audio = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<SpeechComponent, EntitySpokeEvent>(OnEntitySpoke);
-        }
-
-        public SoundSpecifier? GetSpeechSound(Entity<SpeechComponent> ent, string message)
-        {
-            if (ent.Comp.SpeechSounds == null)
-                return null;
-
-            // Play speech sound
-            SoundSpecifier? contextSound;
-            var prototype = ProtoMan.Index<SpeechSoundsPrototype>(ent.Comp.SpeechSounds);
-
-            // Different sounds for ask/exclaim based on last character
-            contextSound = message[^1] switch
-            {
-                '?' => prototype.AskSound,
-                '!' => prototype.ExclaimSound,
-                _ => prototype.SaySound
-            };
-
-            // Use exclaim sound if most characters are uppercase.
-            int uppercaseCount = 0;
-            for (int i = 0; i < message.Length; i++)
-            {
-                if (char.IsUpper(message[i]))
-                    uppercaseCount++;
-            }
-            if (uppercaseCount > (message.Length / 2))
-            {
-                contextSound = prototype.ExclaimSound;
-            }
-
-            var scale = (float) _random.NextGaussian(1, prototype.Variation);
-            contextSound.Params = ent.Comp.AudioParams.WithPitchScale(scale);
-            return contextSound;
-        }
-
-        private void OnEntitySpoke(EntityUid uid, SpeechComponent component, EntitySpokeEvent args)
-        {
-            if (component.SpeechSounds == null)
-                return;
-
-            var currentTime = _gameTiming.CurTime;
-            var cooldown = TimeSpan.FromSeconds(component.SoundCooldownTime);
-
-            // Ensure more than the cooldown time has passed since last speaking
-            if (currentTime - component.LastTimeSoundPlayed < cooldown)
-                return;
-
-            var sound = GetSpeechSound((uid, component), args.Message);
-            component.LastTimeSoundPlayed = currentTime;
-            _audio.PlayPvs(sound, uid);
-        }
-    }
-}
diff --git a/Content.Server/Speech/Components/SpeechWireAction.cs b/Content.Server/Speech/SpeechWireAction.cs
similarity index 100%
rename from Content.Server/Speech/Components/SpeechWireAction.cs
rename to Content.Server/Speech/SpeechWireAction.cs
diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs
index 9169762c01..c3b132de54 100644
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -8,7 +8,6 @@ using Content.Shared.Station.Components;
 using JetBrains.Annotations;
 using Robust.Server.GameStates;
 using Robust.Server.Player;
-using Robust.Shared.Collections;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -27,16 +26,12 @@ public sealed partial class StationSystem : SharedStationSystem
 {
     [Dependency] private IPlayerManager _player = default!;
     [Dependency] private ChatSystem _chatSystem = default!;
-    [Dependency] private SharedTransformSystem _transform = default!;
     [Dependency] private MetaDataSystem _metaData = default!;
     [Dependency] private PvsOverrideSystem _pvsOverride = default!;
     [Dependency] private EntityQuery<MapGridComponent> _gridQuery = default!;
 
     private ISawmill _sawmill = default!;
 
-    private ValueList<MapId> _mapIds;
-    private ValueList<(Box2Rotated Bounds, MapId MapId)> _gridBounds;
-
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -183,105 +178,6 @@ public sealed partial class StationSystem : SharedStationSystem
 
     #endregion Event handlers
 
-    /// <summary>
-    /// Tries to retrieve a filter for everything in the station the source is on.
-    /// </summary>
-    /// <param name="source">The entity to use to find the station.</param>
-    /// <param name="range">The range around the station</param>
-    /// <returns></returns>
-    public Filter GetInOwningStation(EntityUid source, float range = 32f)
-    {
-        var station = GetOwningStation(source);
-
-        if (TryComp<StationDataComponent>(station, out var data))
-        {
-            return GetInStation(data, range);
-        }
-
-        return Filter.Empty();
-    }
-
-    /// <summary>
-    /// Retrieves a filter for everything in a particular station or near its member grids.
-    /// </summary>
-    public Filter GetInStation(StationDataComponent dataComponent, float range = 32f)
-    {
-        var filter = Filter.Empty();
-        _mapIds.Clear();
-
-        // First collect all valid map IDs where station grids exist
-        foreach (var gridUid in dataComponent.Grids)
-        {
-            if (!TryComp(gridUid, out TransformComponent? xform))
-                continue;
-
-            var mapId = xform.MapID;
-            if (!_mapIds.Contains(mapId))
-                _mapIds.Add(mapId);
-        }
-
-        // Cache the rotated bounds for each grid
-        _gridBounds.Clear();
-
-        foreach (var gridUid in dataComponent.Grids)
-        {
-            if (!_gridQuery.TryComp(gridUid, out var grid) ||
-                !TryComp(gridUid, out TransformComponent? gridXform))
-            {
-                continue;
-            }
-
-            var (worldPos, worldRot) = _transform.GetWorldPositionRotation(gridXform);
-            var worldBounds = grid.LocalAABB.Enlarged(range).Translated(worldPos);
-
-            // Create a rotated box using the grid's transform
-            var rotatedBounds = new Box2Rotated(
-                worldBounds,
-                worldRot,
-                worldPos);
-
-            _gridBounds.Add((rotatedBounds, gridXform.MapID));
-        }
-
-        foreach (var session in Filter.GetAllPlayers(_player))
-        {
-            var entity = session.AttachedEntity;
-            if (entity == null || !TryComp(entity, out TransformComponent? xform))
-                continue;
-
-            var mapId = xform.MapID;
-
-            if (!_mapIds.Contains(mapId))
-                continue;
-
-            // Check if the player is directly on any station grid
-            var gridUid = xform.GridUid;
-            if (gridUid != null && dataComponent.Grids.Contains(gridUid.Value))
-            {
-                filter.AddPlayer(session);
-                continue;
-            }
-
-            // If not directly on a grid, check against cached rotated bounds
-            var position = _transform.GetWorldPosition(xform);
-
-            foreach (var (bounds, boundsMapId) in _gridBounds)
-            {
-                // Skip bounds on different maps
-                if (boundsMapId != mapId)
-                    continue;
-
-                if (!bounds.Contains(position))
-                    continue;
-
-                filter.AddPlayer(session);
-                break;
-            }
-        }
-
-        return filter;
-    }
-
     /// <summary>
     /// Initializes a new station with the given information.
     /// </summary>
diff --git a/Content.Server/StationEvents/Components/AlertLevelInterceptionRuleComponent.cs b/Content.Server/StationEvents/Components/AlertLevelInterceptionRuleComponent.cs
index 6907aa6176..92066ac4bf 100644
--- a/Content.Server/StationEvents/Components/AlertLevelInterceptionRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/AlertLevelInterceptionRuleComponent.cs
@@ -1,9 +1,13 @@
 using Content.Server.StationEvents.Events;
-using Content.Server.AlertLevel;
+using Content.Shared.AlertLevel;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.StationEvents.Components;
 
+/// <summary>
+/// Added to gamerule entity prototypes to make them change the station's alert level when starting the gamerule.
+/// This will only apply if the station is currently on its default alert level.
+/// </summary>
 [RegisterComponent, Access(typeof(AlertLevelInterceptionRule))]
 public sealed partial class AlertLevelInterceptionRuleComponent : Component
 {
@@ -11,5 +15,5 @@ public sealed partial class AlertLevelInterceptionRuleComponent : Component
     /// Alert level to set the station to when the event starts.
     /// </summary>
     [DataField]
-    public string AlertLevel = "blue";
+    public ProtoId<AlertLevelPrototype> AlertLevel = "Blue";
 }
diff --git a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
index 01eb65662e..d1b039bdaa 100644
--- a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
+++ b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
@@ -1,12 +1,12 @@
 using Content.Server.StationEvents.Components;
-using Content.Server.AlertLevel;
-using Content.Shared.GameTicking.Components;
+using Content.Shared.AlertLevel;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
 public sealed partial class AlertLevelInterceptionRule : StationEventSystem<AlertLevelInterceptionRuleComponent>
 {
-    [Dependency] private AlertLevelSystem _alertLevelSystem = default!;
+    [Dependency] private AlertLevelSystem _alertLevel = default!;
 
     protected override void Started(EntityUid uid, AlertLevelInterceptionRuleComponent component, GameRuleComponent gameRule,
         GameRuleStartedEvent args)
@@ -15,9 +15,14 @@ public sealed partial class AlertLevelInterceptionRule : StationEventSystem<Aler
 
         if (!TryGetRandomStation(out var chosenStation))
             return;
-        if (_alertLevelSystem.GetLevel(chosenStation.Value) != "green")
+
+        if (!_alertLevel.TryGetLevel(chosenStation.Value, out var level)
+            || !_alertLevel.TryGetDefaultLevel(chosenStation.Value, out var defaultLevel)
+            || level != defaultLevel)
             return;
 
-        _alertLevelSystem.SetLevel(chosenStation.Value, component.AlertLevel, true, true, true);
+        _alertLevel.SetLevel(chosenStation.Value,
+            component.AlertLevel,
+            force: true);
     }
 }
diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Suicide/SuicideSystem.cs
similarity index 95%
rename from Content.Server/Chat/SuicideSystem.cs
rename to Content.Server/Suicide/SuicideSystem.cs
index f24d695009..6c177b9663 100644
--- a/Content.Server/Chat/SuicideSystem.cs
+++ b/Content.Server/Suicide/SuicideSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Ghost;
 using Content.Server.Hands.Systems;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Chat;
 using Content.Shared.Damage.Components;
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
@@ -12,13 +11,14 @@ using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
+using Content.Shared.Suicide;
 using Content.Shared.Tag;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Chat;
+namespace Content.Server.Suicide;
 
-public sealed partial class SuicideSystem : EntitySystem
+public sealed partial class SuicideSystem : SharedSuicideSystem
 {
     [Dependency] private EntityLookupSystem _entityLookupSystem = default!;
     [Dependency] private ISharedAdminLogManager _adminLogger = default!;
@@ -27,7 +27,6 @@ public sealed partial class SuicideSystem : EntitySystem
     [Dependency] private MobStateSystem _mobState = default!;
     [Dependency] private SharedPopupSystem _popup = default!;
     [Dependency] private GhostSystem _ghostSystem = default!;
-    [Dependency] private SharedSuicideSystem _suicide = default!;
     [Dependency] private EntityQuery<ItemComponent> _itemQuery = default!;
 
     private static readonly ProtoId<TagPrototype> CannotSuicideTag = "CannotSuicide";
@@ -83,6 +82,7 @@ public sealed partial class SuicideSystem : EntitySystem
         {
             _adminLogger.Add(LogType.Mind, $"{ToPrettyString(victim):player} suicided.");
         }
+
         return true;
     }
 
@@ -162,7 +162,7 @@ public sealed partial class SuicideSystem : EntitySystem
 
         if (args.DamageSpecifier != null)
         {
-            _suicide.ApplyLethalDamage(victim, args.DamageSpecifier);
+            ApplyLethalDamage(victim, args.DamageSpecifier);
             args.Handled = true;
             return;
         }
@@ -178,7 +178,7 @@ public sealed partial class SuicideSystem : EntitySystem
         else
             args.DamageType ??= "Blunt";
         // Corvax-IPC-end
-        _suicide.ApplyLethalDamage(victim, args.DamageType);
+        ApplyLethalDamage(victim, args.DamageType);
         args.Handled = true;
     }
 }
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
index 4ad44ec9ac..97e454a45d 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Chat.Systems;
-using Content.Server.Speech;
 using Content.Server.SurveillanceCamera.Systems;
-using Content.Shared.Speech;
 using Content.Shared.Chat;
+using Content.Shared.Speech;
+using Content.Shared.Speech.EntitySystems;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 
diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs
index ca2201c103..8a07fe1e9c 100644
--- a/Content.Server/Telephone/TelephoneSystem.cs
+++ b/Content.Server/Telephone/TelephoneSystem.cs
@@ -445,6 +445,7 @@ public sealed partial class TelephoneSystem : SharedTelephoneSystem
         {
             var activeListener = AddComp<ActiveListenerComponent>(entity);
             activeListener.Range = entity.Comp.ListeningRange;
+            Dirty(entity, activeListener);
         }
 
         if (!microphoneOn && HasComp<ActiveListenerComponent>(entity))
diff --git a/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs b/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
index 7c7b1e81e8..7cbd398b79 100644
--- a/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
+++ b/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
@@ -1,11 +1,23 @@
-namespace Content.Server.Temperature.Components;
+using Content.Shared.Temperature.Components;
 
+namespace Content.Server.Temperature.Components;
+
+/// <summary>
+/// Overrides the <see cref="TemperatureDamageComponent"/> thresholds for an entity inserted into this container.
+/// Used for cryogenics typically.
+/// </summary>
 [RegisterComponent]
 public sealed partial class ContainerTemperatureComponent : Component
 {
+    /// <summary>
+    /// Overrides the <see cref="TemperatureDamageComponent.HeatDamageThreshold"/> for an entity inserted into this container.
+    /// </summary>
     [DataField]
     public float? HeatDamageThreshold;
 
+    /// <summary>
+    /// Overrides the <see cref="TemperatureDamageComponent.ColdDamageThreshold"/> for an entity inserted into this container.
+    /// </summary>
     [DataField]
     public float? ColdDamageThreshold;
 }
diff --git a/Content.Server/Temperature/Components/InternalTemperatureComponent.cs b/Content.Server/Temperature/Components/InternalTemperatureComponent.cs
index 1e456d4410..ff134727f0 100644
--- a/Content.Server/Temperature/Components/InternalTemperatureComponent.cs
+++ b/Content.Server/Temperature/Components/InternalTemperatureComponent.cs
@@ -1,4 +1,7 @@
 using Content.Server.Temperature.Systems;
+using Content.Shared.Atmos;
+using Content.Shared.Temperature.Components;
+using Content.Shared.Temperature.HeatContainer;
 
 namespace Content.Server.Temperature.Components;
 
@@ -12,37 +15,33 @@ namespace Content.Server.Temperature.Components;
 /// Too cold? Suffering hypothermia, start shivering to warm up and increase hunger.
 /// </remarks>
 [RegisterComponent, Access(typeof(TemperatureSystem))]
-public sealed partial class InternalTemperatureComponent : Component
+public sealed partial class InternalTemperatureComponent : Component, IHeatContainer
 {
+    // TODO: These values probably shouldn't be duplicated from temperature component, but they're only used for the chef atm so low priority.
     /// <summary>
     /// Internal temperature which is modified by surface temperature.
-    /// This gets set to <see cref="TemperatureComponent.CurrentTemperature"/> on mapinit.
+    /// This gets set to <see cref="TemperatureComponent.Temperature"/> on mapinit.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float Temperature;
+    [DataField]
+    public float Temperature { get; set; } = Atmospherics.T20C;
 
     /// <summary>
-    /// Thermal conductivity of the material in W/m/K.
-    /// Higher conductivity means its insides will heat up faster.
+    /// Heat capacity of our internal temperature.
+    /// This gets set to <see cref="TemperatureComponent.HeatCapacity"/> on mapinit.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float Conductivity = 0.5f;
+    [DataField]
+    public float HeatCapacity { get; set; }
 
     /// <summary>
-    /// Average thickness between the surface and the inside.
-    /// For meats and such this is constant.
-    /// Thicker materials take longer for heat to dissipate.
+    /// Thermal Conductance in W/K to this entity's <see cref="TemperatureComponent"/>.
+    /// Roughly estimated by multiplying meat's thermal conductivity of about 0.4 W/(m*K) by the total surface area of the meat,
+    /// and dividing by the thickness of the meat.
+    /// Then we multiply by four because we should only care about half the thickness typically, and also we're sharing a heat capacity.
+    /// Yes this is stupid. I'll care when chef has content or this is used by BodySystem.
+    /// No I'm not doing a custom value for each piece of meat.
     /// </summary>
-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
-    public float Thickness;
+    [DataField]
+    public float Conductance = 40f;
+
 
-    /// <summary>
-    /// Surface area in m^2 for the purpose of conducting surface temperature to the inside.
-    /// Larger surface area means it takes longer to heat up/cool down
-    /// </summary>
-    /// <remarks>
-    /// For meats etc this should just be the area of the cooked surface not the whole thing as it's only getting heat from one side usually.
-    /// </remarks>
-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
-    public float Area;
 }
diff --git a/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs b/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs
index 01e46cfc8d..8c40e35fa0 100644
--- a/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs
+++ b/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs
@@ -7,16 +7,10 @@ namespace Content.Server.Temperature.Components;
 public sealed partial class TemperatureProtectionComponent : Component
 {
     /// <summary>
-    ///     Multiplier for the transferred heat when heating up
+    ///     Multiplier for the transferred heat when heating up or cooling down.
     /// </summary>
     [DataField]
-    public float HeatingCoefficient = 1.0f;
-
-    /// <summary>
-    ///     Multiplier for the transferred heat when cooling down
-    /// </summary>
-    [DataField]
-    public float CoolingCoefficient = 1.0f;
+    public float Coefficient = 1.0f;
 }
 
 /// <summary>
diff --git a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs
index a9c6ede33f..1c46afa011 100644
--- a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs
+++ b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs
@@ -35,13 +35,13 @@ public sealed partial class EntityHeaterSystem : SharedEntityHeaterSystem
             if (!power.Powered)
                 continue;
 
-            // don't divide by total entities since it's a big grill
+            // divide by total entities to encourage the use of multiple grills
             // excess would just be wasted in the air but that's not worth simulating
             // if you want a heater thermomachine just use that...
             var energy = power.PowerReceived * deltaTime;
             foreach (var ent in placer.PlacedEntities)
             {
-                _temperature.ChangeHeat(ent, energy);
+                _temperature.ChangeHeat(ent, energy / placer.PlacedEntities.Count);
             }
         }
     }
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs b/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs
index c7e31bad81..c16ef38325 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs
@@ -52,9 +52,9 @@ public sealed partial class TemperatureSystem
 
     private void InitializeDamage()
     {
-        SubscribeLocalEvent<AlertsComponent, OnTemperatureChangeEvent>(ServerAlert);
+        SubscribeLocalEvent<AlertsComponent, TemperatureChangedEvent>(ServerAlert);
 
-        SubscribeLocalEvent<TemperatureDamageComponent, OnTemperatureChangeEvent>(EnqueueDamage);
+        SubscribeLocalEvent<TemperatureDamageComponent, TemperatureChangedEvent>(EnqueueDamage);
         SubscribeLocalEvent<TemperatureDamageComponent, EntityUnpausedEvent>(OnUnpaused);
 
         // Allows overriding thresholds based on the parent's thresholds.
@@ -98,7 +98,7 @@ public sealed partial class TemperatureSystem
         var heatDamageThreshold = entity.Comp.ParentHeatDamageThreshold ?? entity.Comp.HeatDamageThreshold;
         var coldDamageThreshold = entity.Comp.ParentColdDamageThreshold ?? entity.Comp.ColdDamageThreshold;
 
-        if (temperature.CurrentTemperature >= heatDamageThreshold)
+        if (temperature.Temperature >= heatDamageThreshold)
         {
             if (!entity.Comp.TakingDamage)
             {
@@ -106,11 +106,11 @@ public sealed partial class TemperatureSystem
                 entity.Comp.TakingDamage = true;
             }
 
-            var diff = Math.Abs(temperature.CurrentTemperature - heatDamageThreshold);
+            var diff = Math.Abs(temperature.Temperature - heatDamageThreshold);
             var tempDamage = c / (1 + a * Math.Pow(Math.E, -heatK * diff)) - y;
             _damageable.TryChangeDamage(entity.Owner, entity.Comp.HeatDamage * tempDamage * deltaTime.TotalSeconds, ignoreResistances: true, interruptsDoAfters: false);
         }
-        else if (temperature.CurrentTemperature <= coldDamageThreshold)
+        else if (temperature.Temperature <= coldDamageThreshold)
         {
             if (!entity.Comp.TakingDamage)
             {
@@ -118,7 +118,7 @@ public sealed partial class TemperatureSystem
                 entity.Comp.TakingDamage = true;
             }
 
-            var diff = Math.Abs(temperature.CurrentTemperature - coldDamageThreshold);
+            var diff = Math.Abs(temperature.Temperature - coldDamageThreshold);
             var tempDamage =
                 Math.Sqrt(diff * (Math.Pow(entity.Comp.DamageCap.Double(), 2) / coldDamageThreshold));
             _damageable.TryChangeDamage(entity.Owner, entity.Comp.ColdDamage * tempDamage * deltaTime.TotalSeconds, ignoreResistances: true, interruptsDoAfters: false);
@@ -130,7 +130,7 @@ public sealed partial class TemperatureSystem
         }
     }
 
-    private void ServerAlert(Entity<AlertsComponent> entity, ref OnTemperatureChangeEvent args)
+    private void ServerAlert(Entity<AlertsComponent> entity, ref TemperatureChangedEvent args)
     {
         ProtoId<AlertPrototype> type;
         float threshold;
@@ -175,7 +175,7 @@ public sealed partial class TemperatureSystem
             _alerts.ClearAlertCategory(entity.AsNullable(), TemperatureAlertCategory);
     }
 
-    private void EnqueueDamage(Entity<TemperatureDamageComponent> ent, ref OnTemperatureChangeEvent args)
+    private void EnqueueDamage(Entity<TemperatureDamageComponent> ent, ref TemperatureChangedEvent args)
     {
         if (ShouldUpdateDamage.Add(ent) && !ent.Comp.TakingDamage)
             ent.Comp.LastUpdate = _gameTiming.CurTime;
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index 14539728f3..0698e090ab 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -6,6 +6,7 @@ using Content.Shared.Rejuvenate;
 using Content.Shared.Temperature;
 using Content.Shared.Projectiles;
 using Content.Shared.Temperature.Components;
+using Content.Shared.Temperature.HeatContainer;
 using Content.Shared.Temperature.Systems;
 
 namespace Content.Server.Temperature.Systems;
@@ -20,7 +21,7 @@ public sealed partial class TemperatureSystem : SharedTemperatureSystem
 
         SubscribeLocalEvent<TemperatureComponent, AtmosExposedUpdateEvent>(OnAtmosExposedUpdate);
         SubscribeLocalEvent<TemperatureComponent, RejuvenateEvent>(OnRejuvenate);
-        Subs.SubscribeWithRelay<TemperatureProtectionComponent, ModifyChangedTemperatureEvent>(OnTemperatureChangeAttempt, held: false);
+        Subs.SubscribeWithRelay<TemperatureProtectionComponent, BeforeHeatExchangeEvent>(OnBeforeHeatExchange, held: false);
 
         SubscribeLocalEvent<InternalTemperatureComponent, MapInitEvent>(OnInit);
 
@@ -29,6 +30,15 @@ public sealed partial class TemperatureSystem : SharedTemperatureSystem
         InitializeDamage();
     }
 
+    protected override void OnMapInit(Entity<TemperatureComponent> entity, ref MapInitEvent args)
+    {
+        base.OnMapInit(entity, ref args);
+
+        // Make sure entities don't spawn cold!
+        if (_thermalRegulatorQuery.TryComp(entity, out var comp))
+            entity.Comp.Temperature = comp.NormalBodyTemperature;
+    }
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -37,72 +47,28 @@ public sealed partial class TemperatureSystem : SharedTemperatureSystem
         var query = EntityQueryEnumerator<InternalTemperatureComponent, TemperatureComponent>();
         while (query.MoveNext(out var uid, out var comp, out var temp))
         {
-            // don't do anything if they equalised
-            var diff = Math.Abs(temp.CurrentTemperature - comp.Temperature);
+            // don't do anything if they equalized
+            var diff = Math.Abs(temp.Temperature - comp.Temperature);
             if (diff < 0.1f)
                 continue;
 
-            // heat flow in W/m^2 as per fourier's law in 1D.
-            var q = comp.Conductivity * diff / comp.Thickness;
-
-            // convert to J then K
-            var joules = q * comp.Area * frameTime;
-            var degrees = joules / GetHeatCapacity(uid, temp);
-            if (temp.CurrentTemperature < comp.Temperature)
-                degrees *= -1;
-
-            // exchange heat between inside and surface
-            comp.Temperature += degrees;
-            ForceChangeTemperature(uid, temp.CurrentTemperature - degrees, temp);
+            ConductHeat((uid, temp), ref comp, frameTime, comp.Conductance, true);
         }
 
         UpdateDamage();
     }
 
-    public void ForceChangeTemperature(EntityUid uid, float temp, TemperatureComponent? temperature = null)
-    {
-        if (!TemperatureQuery.Resolve(uid, ref temperature))
-            return;
-
-        var lastTemp = temperature.CurrentTemperature;
-        var delta = temperature.CurrentTemperature - temp;
-        temperature.CurrentTemperature = temp;
-        RaiseLocalEvent(uid, new OnTemperatureChangeEvent(temperature.CurrentTemperature, lastTemp, delta), broadcast: true);
-    }
-
-    public override void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false, TemperatureComponent? temperature = null)
-    {
-        if (!TemperatureQuery.Resolve(uid, ref temperature, false))
-            return;
-
-        if (!ignoreHeatResistance)
-        {
-            var ev = new ModifyChangedTemperatureEvent(heatAmount);
-            RaiseLocalEvent(uid, ev);
-            heatAmount = ev.TemperatureDelta;
-        }
-
-        float lastTemp = temperature.CurrentTemperature;
-        temperature.CurrentTemperature += heatAmount / GetHeatCapacity(uid, temperature);
-        float delta = temperature.CurrentTemperature - lastTemp;
-
-        RaiseLocalEvent(uid, new OnTemperatureChangeEvent(temperature.CurrentTemperature, lastTemp, delta), broadcast: true);
-    }
-
-    private void OnAtmosExposedUpdate(EntityUid uid, TemperatureComponent temperature, ref AtmosExposedUpdateEvent args)
+    private void OnAtmosExposedUpdate(Entity<TemperatureComponent> entity, ref AtmosExposedUpdateEvent args)
     {
         var transform = args.Transform;
 
         if (transform.MapUid == null)
             return;
 
-        var temperatureDelta = args.GasMixture.Temperature - temperature.CurrentTemperature;
-        var airHeatCapacity = _atmosphere.GetHeatCapacity(args.GasMixture, false);
-        var heatCapacity = GetHeatCapacity(uid, temperature);
-        // TODO ATMOS: This heat transfer formula is really really wrong, it needs to be pulled out. Pending on HeatContainers.
-        var heat = temperatureDelta * (airHeatCapacity * heatCapacity /
-                                       (airHeatCapacity + heatCapacity));
-        ChangeHeat(uid, heat * temperature.AtmosTemperatureTransferEfficiency, temperature: temperature);
+        // TODO ATMOS: Atmos heat containers!!!
+        var atmosContainer = new HeatContainer(_atmosphere.GetHeatCapacity(args.GasMixture, false), args.GasMixture.Temperature);
+        ConductHeat(entity.AsNullable(), ref atmosContainer, args.DeltaTime, args.ConductivityMod);
+        args.GasMixture.Temperature = atmosContainer.Temperature;
     }
 
     private void OnInit(Entity<InternalTemperatureComponent> entity, ref MapInitEvent args)
@@ -110,24 +76,20 @@ public sealed partial class TemperatureSystem : SharedTemperatureSystem
         if (!TemperatureQuery.TryComp(entity, out var temp))
             return;
 
-        entity.Comp.Temperature = temp.CurrentTemperature;
+        // TODO: This shouldn't copy temperature component, but this component is so niche it's not worth the effort of fixing.
+        entity.Comp.Temperature = temp.Temperature;
+        entity.Comp.HeatCapacity = temp.HeatCapacity;
     }
 
-    private void OnRejuvenate(EntityUid uid, TemperatureComponent comp, RejuvenateEvent args)
+    private void OnRejuvenate(Entity<TemperatureComponent> entity, ref RejuvenateEvent args)
     {
-        ForceChangeTemperature(uid, Atmospherics.T20C, comp);
+        SetTemperature(entity.AsNullable(), _thermalRegulatorQuery.CompOrNull(entity)?.NormalBodyTemperature ?? Atmospherics.T20C);
     }
 
-    private void OnTemperatureChangeAttempt(EntityUid uid, TemperatureProtectionComponent component, ModifyChangedTemperatureEvent args)
+    private void OnBeforeHeatExchange(Entity<TemperatureProtectionComponent> entity, ref BeforeHeatExchangeEvent args)
     {
-        var coefficient = args.TemperatureDelta < 0
-            ? component.CoolingCoefficient
-            : component.HeatingCoefficient;
-
-        var ev = new GetTemperatureProtectionEvent(coefficient);
-        RaiseLocalEvent(uid, ref ev);
-
-        args.TemperatureDelta *= ev.Coefficient;
+        // TODO: Proper coverage modifiers!!! This should be its own system which relays to inventory and then based on coverage spits out a modifier!
+        args.HeatTransferModifier *= entity.Comp.Coefficient;
     }
 
     private void ChangeTemperatureOnCollide(Entity<ChangeTemperatureOnCollideComponent> ent, ref ProjectileHitEvent args)
diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs
index 72100f127f..2e59086553 100644
--- a/Content.Server/VoiceMask/VoiceMaskSystem.cs
+++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.Speech;
 using Content.Shared.Actions;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CCVar;
@@ -12,6 +11,7 @@ using Content.Shared.Inventory;
 using Content.Shared.Lock;
 using Content.Shared.Popups;
 using Content.Shared.Speech;
+using Content.Shared.Speech.EntitySystems;
 using Content.Shared.VoiceMask;
 using Robust.Shared.Configuration;
 using Robust.Shared.Containers;
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 03cd0267c8..b668927f86 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -5,46 +5,43 @@ using Content.Server.Body.Components;
 using Content.Server.Chat;
 using Content.Server.Chat.Managers;
 using Content.Server.Ghost;
-using Content.Server.Ghost.Roles.Components;
-using Content.Server.Humanoid;
 using Content.Server.Inventory;
 using Content.Server.Mind;
 using Content.Server.NPC;
 using Content.Server.NPC.HTN;
 using Content.Server.NPC.Systems;
 using Content.Server.StationEvents.Components;
-using Content.Server.Speech.Components;
 using Content.Shared.Body;
 using Content.Shared.Body.Components;
 using Content.Shared.CombatMode;
 using Content.Shared.CombatMode.Pacification;
+using Content.Shared.Ghost.Roles.Components;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Humanoid;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.NameModifier.EntitySystems;
+using Content.Shared.NPC.Prototypes;
 using Content.Shared.NPC.Systems;
 using Content.Shared.Nutrition.AnimalHusbandry;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
+using Content.Shared.Prying.Components;
+using Content.Shared.Roles;
+using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Tag;
+using Content.Shared.Temperature.Components;
+using Content.Shared.Traits.Assorted;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Zombies;
-using Content.Shared.Prying.Components;
-using Content.Shared.Traits.Assorted;
 using Robust.Shared.Audio.Systems;
-using Content.Shared.Ghost.Roles.Components;
-using Content.Shared.Humanoid.Markings;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Tag;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Content.Shared.NPC.Prototypes;
-using Content.Shared.Roles;
-using Content.Shared.Temperature.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Zombies;
@@ -70,6 +67,7 @@ public sealed partial class ZombieSystem
     [Dependency] private MindSystem _mind = default!;
     [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!;
     [Dependency] private NameModifierSystem _nameMod = default!;
+    [Dependency] private ReplacementAccentSystem _replacementAccent = default!;
     [Dependency] private NPCSystem _npc = default!;
     [Dependency] private TagSystem _tag = default!;
     [Dependency] private ISharedPlayerManager _player = default!;
@@ -152,7 +150,7 @@ public sealed partial class ZombieSystem
         if (TryComp<ZombieAccentOverrideComponent>(target, out var accent))
             accentType = accent.Accent;
 
-        EnsureComp<ReplacementAccentComponent>(target).Accent = accentType;
+        _replacementAccent.ApplyAccent(target, accentType);
 
         //This is needed for stupid entities that fuck up combat mode component
         //in an attempt to make an entity not attack. This is the easiest way to do it.
diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index 6c890536d0..1d1be3c0ba 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -4,7 +4,7 @@ using Content.Server.Body.Systems;
 using Content.Server.Chat;
 using Content.Server.Chat.Systems;
 using Content.Server.Emoting.Systems;
-using Content.Server.Speech.EntitySystems;
+using Content.Shared.Speech.EntitySystems;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Armor;
 using Content.Shared.Bed.Sleep;
diff --git a/Content.Shared/AlertLevel/AlertLevelComponent.cs b/Content.Shared/AlertLevel/AlertLevelComponent.cs
new file mode 100644
index 0000000000..62e8078497
--- /dev/null
+++ b/Content.Shared/AlertLevel/AlertLevelComponent.cs
@@ -0,0 +1,48 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.AlertLevel;
+
+/// <summary>
+/// Alert level component. This is the component given to a station to
+/// signify its alert level state.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(AlertLevelSystem))]
+public sealed partial class AlertLevelComponent : Component
+{
+    /// <summary>
+    /// The available alert levels for this station.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public List<ProtoId<AlertLevelPrototype>> AvailableAlertLevels = new();
+
+    /// <summary>
+    /// The default alert level for this station.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<AlertLevelPrototype> DefaultAlertLevel = "Green";
+
+    /// <summary>
+    /// The current level on the station.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<AlertLevelPrototype> CurrentAlertLevel = "Green";
+
+    /// <summary>
+    /// Is changing the alert level currently locked?
+    /// For example when the nuke is active the level is locked to Delta.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IsLevelLocked = false;
+
+    /// <summary>
+    /// The time stamp until which changing the alert level is unavailable.
+    /// Used to prevent spamming alerts in chat.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan? DelayedUntil;
+}
diff --git a/Content.Shared/AlertLevel/AlertLevelDisplayComponent.cs b/Content.Shared/AlertLevel/AlertLevelDisplayComponent.cs
index c305296e79..88b46c3b92 100644
--- a/Content.Shared/AlertLevel/AlertLevelDisplayComponent.cs
+++ b/Content.Shared/AlertLevel/AlertLevelDisplayComponent.cs
@@ -1,8 +1,18 @@
+using Robust.Shared.Prototypes;
+
 namespace Content.Shared.AlertLevel;
 
+/// <summary>
+/// Allows an entity to change visuals depending on the station's current alertlevel.
+/// </summary>
 [RegisterComponent]
 public sealed partial class AlertLevelDisplayComponent : Component
 {
-    [DataField("alertVisuals")]
-    public  Dictionary<string, string> AlertVisuals = new();
+    /// <summary>
+    /// The RSI state to use for each alert level.
+    /// Changes the <see cref="AlertLevelDisplay.Layer"/> layer accordingly.
+    /// If the device is unpowered that layer will be hidden.
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<AlertLevelPrototype>, string> AlertVisuals = new();
 }
diff --git a/Content.Shared/AlertLevel/AlertLevelPrototype.cs b/Content.Shared/AlertLevel/AlertLevelPrototype.cs
new file mode 100644
index 0000000000..dfbc6906f2
--- /dev/null
+++ b/Content.Shared/AlertLevel/AlertLevelPrototype.cs
@@ -0,0 +1,85 @@
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
+
+namespace Content.Shared.AlertLevel;
+
+/// <summary>
+/// Prototype for a single alert level a station can be set to.
+/// </summary>
+[Prototype]
+public sealed partial class AlertLevelPrototype : IPrototype, IInheritingPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<AlertLevelPrototype>))]
+    public string[]? Parents { get; private set; }
+
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; private set; }
+
+    [DataField(required: true)]
+    private LocId Name { get; set; }
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public string LocalizedName => Loc.GetString(Name);
+
+    /// <summary>
+    /// Whether this alert level is selectable from a communications console.
+    /// </summary>
+    [DataField]
+    public bool Selectable = true;
+
+    /// <summary>
+    /// If this alert level disables user selection while it is active. Beware -
+    /// setting this while something is selectable will disable selection permanently!
+    /// This should only apply to entities or gamemodes that auto-select an alert level,
+    /// such as a nuclear bomb being set to active.
+    /// </summary>
+    [DataField]
+    public bool DisableSelection;
+
+    /// <summary>
+    /// The text that is announced when this alert level is selected.
+    /// </summary>
+    [DataField]
+    public LocId? Announcement;
+
+    /// <summary>
+    /// The text that is announced when this alert level is selected.
+    /// </summary>
+    [DataField]
+    public LocId? Instructions;
+
+    /// <summary>
+    /// The sound that will played in-game when this alert level is selected.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? Sound;
+
+    /// <summary>
+    /// The color that this alert level will show in-game in chat.
+    /// </summary>
+    [DataField]
+    public Color Color = Color.White;
+
+    /// <summary>
+    /// The color to turn emergency lights on this station when they are active.
+    /// </summary>
+    [DataField]
+    public Color EmergencyLightColor = Color.FromHex("#FF4020");
+
+    /// <summary>
+    /// Will this alert level force emergency lights on for the station that's active?
+    /// </summary>
+    [DataField]
+    public bool ForceEnableEmergencyLights = false;
+
+    /// <summary>
+    /// How long it takes for the shuttle to arrive when called while this alert level is active.
+    /// </summary>
+    [DataField]
+    public TimeSpan ShuttleTime = TimeSpan.FromMinutes(5);
+}
diff --git a/Content.Shared/AlertLevel/AlertLevelSystem.cs b/Content.Shared/AlertLevel/AlertLevelSystem.cs
new file mode 100644
index 0000000000..73234337a8
--- /dev/null
+++ b/Content.Shared/AlertLevel/AlertLevelSystem.cs
@@ -0,0 +1,325 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Chat;
+using Content.Shared.Station;
+using Content.Shared.CCVar;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.AlertLevel;
+
+public sealed partial class AlertLevelSystem : EntitySystem
+{
+    [Dependency] private IConfigurationManager _cfg = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private INetManager _net = default!;
+    [Dependency] private IPrototypeManager _prototype = default!;
+    [Dependency] private SharedAudioSystem _audio = default!;
+    [Dependency] private SharedChatSystem _chat = default!;
+    [Dependency] private SharedStationSystem _station = default!;
+
+    private static string _fallbackAlertKey = "alert-level-unknown";
+    private static string _fallbackAlertName = $"{_fallbackAlertKey}";
+    private static string _fallbackAlertAnnouncement = $"{_fallbackAlertKey}";
+    private static string _fallbackAlertInstructions = $"{_fallbackAlertKey}";
+
+    public override void Update(float time)
+    {
+        var query = EntityQueryEnumerator<AlertLevelComponent>();
+        var curTime = _timing.CurTime;
+
+        while (query.MoveNext(out var station, out var alertComp))
+        {
+            if (alertComp.DelayedUntil <= curTime)
+            {
+                // Raise an event so that UIs can refresh.
+                var ev = new AlertLevelDelayFinishedEvent();
+                RaiseLocalEvent(ref ev);
+                alertComp.DelayedUntil = null;
+                Dirty(station, alertComp);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Can the alert level currently be changed from the communications console?
+    /// This considers both the cooldown and if the current mode prevents changing it, for example when the nuke is armed.
+    /// </summary>
+    public bool CanChangeAlertLevel(Entity<AlertLevelComponent?> station)
+    {
+        if (!Resolve(station, ref station.Comp))
+            return false;
+
+        return station.Comp.DelayedUntil == null && !station.Comp.IsLevelLocked;
+    }
+
+    /// <summary>
+    /// Gets a list of alert levels that are available on this station and can be selected from the communications console.
+    /// </summary>
+    public List<ProtoId<AlertLevelPrototype>> GetSelectableAlertLevels(Entity<AlertLevelComponent?> station)
+    {
+        List<ProtoId<AlertLevelPrototype>> list = new();
+        if (!Resolve(station, ref station.Comp))
+            return list;
+
+        foreach (var levelId in station.Comp.AvailableAlertLevels)
+        {
+            if (!_prototype.Resolve(levelId, out var level))
+                continue;
+
+            if (level.Selectable)
+                list.Add(levelId);
+        }
+
+        return list;
+    }
+
+    /// <summary>
+    /// Gets the current alert level for this station entity.
+    /// </summary>
+    public bool TryGetLevel(Entity<AlertLevelComponent?> station, [NotNullWhen(true)] out ProtoId<AlertLevelPrototype>? level)
+    {
+        level = null;
+        if (!Resolve(station, ref station.Comp, false))
+            return false;
+
+        level = station.Comp.CurrentAlertLevel;
+        return true;
+    }
+
+    /// <summary>
+    /// Gets the default alert level for this station entity.
+    /// </summary>
+    public bool TryGetDefaultLevel(Entity<AlertLevelComponent?> station, [NotNullWhen(true)] out ProtoId<AlertLevelPrototype>? level)
+    {
+        level = null;
+        if (!Resolve(station, ref station.Comp, false))
+            return false;
+
+        level = station.Comp.DefaultAlertLevel;
+        return true;
+    }
+
+    /// <summary>
+    /// Gets the remaining cooldown for changing the alert level from the communications console.
+    /// </summary>
+    public TimeSpan GetAlertLevelDelay(Entity<AlertLevelComponent?> station)
+    {
+        if (!Resolve(station, ref station.Comp, false))
+            return TimeSpan.Zero;
+
+        if (station.Comp.DelayedUntil == null)
+            return TimeSpan.Zero;
+
+        return station.Comp.DelayedUntil.Value - _timing.CurTime;
+    }
+
+    /// <summary>
+    /// Set the alert level based on the station's entity uid.
+    /// </summary>
+    /// <param name="station">Station entity UID.</param>
+    /// <param name="level">Level to change the station's alert level to.</param>
+    /// <param name="playSound">Play the alert level's sound?</param>
+    /// <param name="announce">Announce the alert level change in chat?</param>
+    /// <param name="force">Force the alert change. This applies if the alert level is not selectable.</param>
+    /// <param name="locked">Override to decide if the crew will be able to change from this alert level via the console. Will use the value given in the prototype if null.</param>
+    public void SetLevel(
+        Entity<AlertLevelComponent?> station,
+        ProtoId<AlertLevelPrototype> level,
+        bool playSound = true,
+        bool announce = true,
+        bool force = false,
+        bool? locked = null)
+    {
+        if (!Resolve(station, ref station.Comp))
+            return;
+
+        if (station.Comp.CurrentAlertLevel == level)
+            return;
+
+        if (!_prototype.Resolve(level, out var prototype))
+            return;
+
+        if (!force)
+        {
+            if (!CanChangeAlertLevel(station) || !prototype.Selectable)
+                return;
+
+            station.Comp.DelayedUntil = _timing.CurTime + TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.GameAlertLevelChangeDelay));
+        }
+
+        station.Comp.CurrentAlertLevel = level;
+        station.Comp.IsLevelLocked = prototype.DisableSelection;
+        if (locked != null) // optional override
+            station.Comp.IsLevelLocked = locked.Value;
+        Dirty(station);
+
+        var stationName = MetaData(station.Owner).EntityName;
+
+        // The full announcement to be spat out into chat.
+        var announcementFull = Loc.GetString("alert-level-announcement",
+            ("name", prototype.LocalizedName),
+            ("announcement", AlertLevelAnnouncement(prototype)));
+
+        var ev = new AlertLevelChangedEvent(station, level);
+        RaiseLocalEvent(ref ev);
+
+        if (_net.IsClient)
+            return;
+
+        var playDefault = false;
+        if (playSound)
+        {
+            if (prototype.Sound != null)
+            {
+                var filter = _station.GetInOwningStation(station);
+                _audio.PlayGlobal(prototype.Sound, filter, true);
+            }
+            else
+            {
+                playDefault = true;
+            }
+        }
+
+        if (announce)
+        {
+            _chat.DispatchStationAnnouncement(
+                station,
+                announcementFull,
+                playDefaultSound: playDefault,
+                colorOverride: prototype.Color,
+                sender: stationName);
+        }
+
+    }
+
+    /// <summary>
+    /// Returns the name, announcement, and description of this station's alert level.
+    /// </summary>
+    public (string Name, string Announcement, string Instructions) AlertLevelData(Entity<AlertLevelComponent?> station)
+    {
+        if (!TryGetDefaultLevel(station, out var level))
+        {
+            return (Loc.GetString(_fallbackAlertName),
+                Loc.GetString(_fallbackAlertAnnouncement),
+                Loc.GetString(_fallbackAlertInstructions));
+        }
+
+        return AlertLevelData(level);
+    }
+
+    /// <summary>
+    /// Returns the name, announcement, and description of the given alert level.
+    /// </summary>
+    public (string Name, string Announcement, string Instructions) AlertLevelData(ProtoId<AlertLevelPrototype>? level)
+    {
+        if (!ProtoMan.Resolve(level, out var proto))
+        {
+            return (Loc.GetString(_fallbackAlertName),
+                Loc.GetString(_fallbackAlertAnnouncement),
+                Loc.GetString(_fallbackAlertInstructions));
+        }
+
+        return AlertLevelData(proto);
+    }
+
+    /// <summary>
+    /// Returns the name, announcement, and description of the given alert level.
+    /// </summary>
+    public (string Name, string Announcement, string Instructions) AlertLevelData(AlertLevelPrototype level)
+    {
+        return (level.LocalizedName, AlertLevelAnnouncement(level), AlertLevelInstructions(level));
+    }
+
+    /// <summary>
+    /// Returns the name of this station's current alert level.
+    /// </summary>
+    /// <returns>Returns the name of the current Alert Level.</returns>
+    public string AlertLevelName(Entity<AlertLevelComponent?> station)
+    {
+        return !TryGetDefaultLevel(station, out var level)
+            ? Loc.GetString(_fallbackAlertName)
+            : AlertLevelName(level);
+    }
+
+    /// <summary>
+    /// Returns the name of the given alert level.
+    /// </summary>
+    /// <returns>Returns the name of the given Alert Level.</returns>
+    public string AlertLevelName(ProtoId<AlertLevelPrototype>? level)
+    {
+        return !ProtoMan.Resolve(level, out var proto)
+            ? Loc.GetString(_fallbackAlertName)
+            : proto.LocalizedName;
+    }
+
+    /// <summary>
+    /// Gets the announcement message for the stations' current alert level.
+    /// </summary>
+    /// <returns>Returns the description of the current Alert Level.</returns>
+    public string AlertLevelAnnouncement(Entity<AlertLevelComponent?> station)
+    {
+        return !TryGetDefaultLevel(station, out var level)
+            ? Loc.GetString(_fallbackAlertAnnouncement)
+            : AlertLevelAnnouncement(level);
+    }
+
+    /// <see cref="AlertLevelAnnouncement(AlertLevelPrototype)"/>
+    public string AlertLevelAnnouncement(ProtoId<AlertLevelPrototype>? level)
+    {
+        return !ProtoMan.Resolve(level, out var proto)
+            ? Loc.GetString(_fallbackAlertAnnouncement)
+            : AlertLevelAnnouncement(proto);
+    }
+
+    /// <summary>
+    /// Gets the announcement message for the given alert level.
+    /// </summary>
+    /// <returns>Returns the announcement for the given Alert Level.</returns>
+    public string AlertLevelAnnouncement(AlertLevelPrototype level)
+    {
+        return Loc.GetString(level.Announcement ?? _fallbackAlertAnnouncement);
+    }
+
+    /// <summary>
+    /// Gets the instructions for the station's current alert level.
+    /// </summary>
+    /// <returns>Returns the instructions for the current alert level.</returns>
+    public string AlertLevelInstructions(Entity<AlertLevelComponent?> station)
+    {
+        return !TryGetDefaultLevel(station, out var level)
+            ? Loc.GetString(_fallbackAlertInstructions)
+            : AlertLevelInstructions(level);
+    }
+
+    /// <see cref="AlertLevelInstructions(AlertLevelPrototype)"/>
+    public string AlertLevelInstructions(ProtoId<AlertLevelPrototype>? level)
+    {
+        return !ProtoMan.Resolve(level, out var proto)
+            ? Loc.GetString(_fallbackAlertInstructions)
+            : AlertLevelInstructions(proto);
+    }
+
+    /// <summary>
+    /// Gets the instructions for the given alert level.
+    /// </summary>
+    /// <returns>Returns the instructions for the given Alert Level.</returns>
+    public string AlertLevelInstructions(AlertLevelPrototype level)
+    {
+        return Loc.GetString(level.Instructions ?? _fallbackAlertInstructions);
+    }
+}
+
+/// <summary>
+/// Broadcast event that is raised when the alert level selection delay for a station is over and it can be switched again.
+/// </summary>
+[ByRefEvent]
+public record struct AlertLevelDelayFinishedEvent;
+
+/// <summary>
+/// Broadcast event that is raised when the a station changes its alert level.
+/// </summary>
+[ByRefEvent]
+public record struct AlertLevelChangedEvent(EntityUid Station, ProtoId<AlertLevelPrototype> AlertLevel);
diff --git a/Content.Shared/Atmos/AtmosExposedEvents.cs b/Content.Shared/Atmos/AtmosExposedEvents.cs
index 41b65fe24f..b64ebb49cd 100644
--- a/Content.Shared/Atmos/AtmosExposedEvents.cs
+++ b/Content.Shared/Atmos/AtmosExposedEvents.cs
@@ -9,15 +9,22 @@ namespace Content.Shared.Atmos;
 /// <param name="coordinates">The coordinates of the entity that is being exposed.</param>
 /// <param name="mixture">The gas mixture that the entity is exposed to.</param>
 /// <param name="transform">The xform of the entity that is being exposed.</param>
+/// <param name="deltaTime">Amount of time since the last AtmosExposedUpdateEvent, in seconds.</param>
+/// <param name="conductivityMod">A modifier for thermal conductivity between the exposed entity and the atmosphere.
+/// Typically equal to <see cref="AtmosExposedComponent.ExposedArea"/></param>
 [ByRefEvent]
 public readonly struct AtmosExposedUpdateEvent(
     EntityCoordinates coordinates,
     GasMixture mixture,
-    TransformComponent transform)
+    TransformComponent transform,
+    float deltaTime,
+    float conductivityMod)
 {
     public readonly EntityCoordinates Coordinates = coordinates;
     public readonly GasMixture GasMixture = mixture;
     public readonly TransformComponent Transform = transform;
+    public readonly float DeltaTime = deltaTime;
+    public readonly float ConductivityMod = conductivityMod;
 }
 
 /// <summary>
diff --git a/Content.Shared/Body/ChildOrganComponent.cs b/Content.Shared/Body/ChildOrganComponent.cs
new file mode 100644
index 0000000000..815f8d3423
--- /dev/null
+++ b/Content.Shared/Body/ChildOrganComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Body;
+
+/// <summary>
+/// An organ that can be a child to a parent organ within a body.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(OrganRelationSystem))]
+public sealed partial class ChildOrganComponent : Component
+{
+    /// <summary>
+    /// The current organ that's a parent to this one, if any
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? Parent;
+}
diff --git a/Content.Shared/Body/DetachableOrganComponent.cs b/Content.Shared/Body/DetachableOrganComponent.cs
new file mode 100644
index 0000000000..9cd0af4115
--- /dev/null
+++ b/Content.Shared/Body/DetachableOrganComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Body;
+
+/// <summary>
+/// An organ that can be detached with all of its children into a new body
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(DetachableOrganSystem))]
+public sealed partial class DetachableOrganComponent : Component
+{
+    /// <summary>
+    /// The body to spawn upon detaching
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId DetachedBody;
+}
diff --git a/Content.Shared/Body/DetachableOrganSystem.cs b/Content.Shared/Body/DetachableOrganSystem.cs
new file mode 100644
index 0000000000..ce1d720acc
--- /dev/null
+++ b/Content.Shared/Body/DetachableOrganSystem.cs
@@ -0,0 +1,52 @@
+using Content.Shared.Body;
+using JetBrains.Annotations;
+using Robust.Shared.Containers;
+using Robust.Shared.Network;
+
+namespace Content.Shared.Body;
+
+public sealed partial class DetachableOrganSystem : EntitySystem
+{
+    [Dependency] private EntityQuery<DetachableOrganComponent> _detachableOrgan;
+    [Dependency] private EntityQuery<OrganComponent> _organ;
+    [Dependency] private OrganRelationSystem _organRelation = default!;
+    [Dependency] private SharedContainerSystem _container = default!;
+
+    /// <summary>
+    /// Detaches an organ from its containing body.
+    /// </summary>
+    /// <param name="organ">The organ to detach</param>
+    /// <returns>The body that spawned when this organ was detached</returns>
+    [PublicAPI]
+    public EntityUid? Detach(Entity<DetachableOrganComponent?> organ)
+    {
+        if (!_detachableOrgan.Resolve(organ, ref organ.Comp) || !_organ.TryComp(organ, out var organComp) || organComp.Body is not { } oldBody)
+            return null;
+
+        _organRelation.Orphan(organ.Owner);
+        var body = PredictedSpawnNextToOrDrop(organ.Comp.DetachedBody, oldBody);
+
+        if (!_container.TryGetContainer(body, BodyComponent.ContainerID, out var container))
+        {
+            Log.Error($"Entity {ToPrettyString(body)} relied on by {nameof(DetachableOrganComponent)} on {ToPrettyString(organ)} is missing a container ({BodyComponent.ContainerID}).");
+            Del(body);
+            return null;
+        }
+
+        if (!_container.Insert(organ.Owner, container, force: true))
+        {
+            Log.Error($"{ToPrettyString(organ)} could not be transferred to new body {ToPrettyString(body)}.");
+        }
+
+        foreach (var child in _organRelation.AllChildren(organ.Owner))
+        {
+            if (!_container.Insert(child.Owner, container, force: true))
+            {
+                Log.Error($"{ToPrettyString(child)} could not be transferred to new body {ToPrettyString(body)}.");
+                _organRelation.Orphan(child.AsNullable());
+            }
+        }
+
+        return body;
+    }
+}
diff --git a/Content.Shared/Body/InitialBodyComponent.cs b/Content.Shared/Body/InitialBodyComponent.cs
index a27e5c092c..70326ea7d4 100644
--- a/Content.Shared/Body/InitialBodyComponent.cs
+++ b/Content.Shared/Body/InitialBodyComponent.cs
@@ -15,4 +15,10 @@ public sealed partial class InitialBodyComponent : Component
     /// </summary>
     [DataField(required: true)]
     public Dictionary<ProtoId<OrganCategoryPrototype>, EntProtoId<OrganComponent>> Organs;
+
+    /// <summary>
+    /// Organ relationships, based on their categories. Keys are parents to their values.
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<OrganCategoryPrototype>, HashSet<ProtoId<OrganCategoryPrototype>>>? Relationships;
 }
diff --git a/Content.Shared/Body/InitialBodySystem.cs b/Content.Shared/Body/InitialBodySystem.cs
index 6ac8066e54..5df762e495 100644
--- a/Content.Shared/Body/InitialBodySystem.cs
+++ b/Content.Shared/Body/InitialBodySystem.cs
@@ -1,12 +1,14 @@
 using System.Numerics;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Body;
 
 public sealed partial class InitialBodySystem : EntitySystem
 {
     [Dependency] private SharedContainerSystem _container = default!;
+    [Dependency] private OrganRelationSystem _organRelation = default!;
 
     public override void Initialize()
     {
@@ -31,8 +33,9 @@ public sealed partial class InitialBodySystem : EntitySystem
 
         var xform = Transform(ent);
         var coords = new EntityCoordinates(ent, Vector2.Zero);
+        var spawned = new Dictionary<ProtoId<OrganCategoryPrototype>, EntityUid>();
 
-        foreach (var proto in ent.Comp.Organs.Values)
+        foreach (var (part, proto) in ent.Comp.Organs)
         {
             // TODO: When e#6192 is merged replace this all with TrySpawnInContainer...
             var spawn = Spawn(proto, coords);
@@ -41,6 +44,26 @@ public sealed partial class InitialBodySystem : EntitySystem
             {
                 Log.Error($"Entity {ToPrettyString(ent)} with a {nameof(InitialBodyComponent)} failed to insert an entity: {ToPrettyString(spawn)}.\n");
                 Del(spawn);
+                continue;
+            }
+
+            spawned[part] = spawn;
+        }
+
+        if (ent.Comp.Relationships is null)
+            return;
+
+        foreach (var (partId, parentUid) in spawned)
+        {
+            if (!ent.Comp.Relationships.TryGetValue(partId, out var children))
+                continue;
+
+            foreach (var childId in children)
+            {
+                if (!spawned.TryGetValue(childId, out var childUid))
+                    continue;
+
+                _organRelation.Relate(parentUid, childUid);
             }
         }
     }
diff --git a/Content.Shared/Body/InternalChildOrganComponent.cs b/Content.Shared/Body/InternalChildOrganComponent.cs
new file mode 100644
index 0000000000..0f3c9348ef
--- /dev/null
+++ b/Content.Shared/Body/InternalChildOrganComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Body;
+
+/// <summary>
+/// Marker components for child organs that are considered "internal" to their parent. e.g. kidneys are internal to a torso, but an arm isn't.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class InternalChildOrganComponent : Component;
diff --git a/Content.Shared/Body/OrganRelationSystem.cs b/Content.Shared/Body/OrganRelationSystem.cs
new file mode 100644
index 0000000000..d5236277e8
--- /dev/null
+++ b/Content.Shared/Body/OrganRelationSystem.cs
@@ -0,0 +1,120 @@
+using JetBrains.Annotations;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Body;
+
+public sealed partial class OrganRelationSystem : EntitySystem
+{
+    [Dependency] private EntityQuery<ChildOrganComponent> _child;
+    [Dependency] private EntityQuery<ParentOrganComponent> _parent;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ParentOrganComponent, ComponentShutdown>(OnParentShutdown);
+        SubscribeLocalEvent<ChildOrganComponent, ComponentShutdown>(OnChildShutdown);
+    }
+
+    private void OnChildShutdown(Entity<ChildOrganComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.Parent is not { } parentUid)
+            return;
+
+        var parentComp = _parent.Comp(parentUid);
+        parentComp.Children.Remove(ent);
+        Dirty(parentUid, parentComp);
+    }
+
+    private void OnParentShutdown(Entity<ParentOrganComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.Children.Count == 0)
+            return;
+
+        foreach (var childUid in ent.Comp.Children)
+        {
+            var childComp = _child.Comp(childUid);
+            childComp.Parent = null;
+
+            Dirty(childUid, childComp);
+        }
+    }
+
+    /// <summary>
+    /// Associates a parent organ and a child organ.
+    /// </summary>
+    [PublicAPI]
+    public void Relate(Entity<ParentOrganComponent?> parent, Entity<ChildOrganComponent?> child)
+    {
+        if (!_parent.Resolve(parent, ref parent.Comp) || !_child.Resolve(child, ref child.Comp))
+            return;
+
+        DebugTools.Assert(child.Comp.Parent == null);
+
+        parent.Comp.Children.Add(child);
+        Dirty(parent, parent.Comp);
+
+        child.Comp.Parent = parent;
+        Dirty(child, child.Comp);
+    }
+
+    /// <summary>
+    /// Breaks the relationship between a child orphan and its parent.
+    /// </summary>
+    [PublicAPI]
+    public void Orphan(Entity<ChildOrganComponent?> child)
+    {
+        if (!_child.Resolve(child, ref child.Comp))
+            return;
+
+        if (child.Comp.Parent is not { } parentUid)
+            return;
+
+        child.Comp.Parent = null;
+        Dirty(child, child.Comp);
+
+        var parentComp = _parent.Comp(parentUid);
+        parentComp.Children.Remove(child);
+        Dirty(parentUid, parentComp);
+    }
+
+    /// <summary>
+    /// Enumerates all parents of a child organ recursively.
+    /// </summary>
+    [PublicAPI]
+    public IEnumerable<Entity<ParentOrganComponent>> AllParents(Entity<ChildOrganComponent?> child)
+    {
+        if (!_child.Resolve(child, ref child.Comp))
+            yield break;
+
+        while (child.Comp?.Parent is { } parent)
+        {
+            yield return (parent, _parent.Comp(parent));
+
+            if (!_child.TryGetComponent(parent, out var parentChild))
+                yield break;
+
+            child = (parent, parentChild);
+        }
+    }
+
+    /// <summary>
+    /// Enumerates all children of a parent organ recursively.
+    /// </summary>
+    [PublicAPI]
+    public IEnumerable<Entity<ChildOrganComponent>> AllChildren(Entity<ParentOrganComponent?> parent)
+    {
+        if (!_parent.Resolve(parent, ref parent.Comp, false))
+            yield break;
+
+        foreach (var child in parent.Comp.Children)
+        {
+            yield return (child, _child.Comp(child));
+
+            foreach (var childChild in AllChildren(child))
+            {
+                yield return childChild;
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Body/ParentOrganComponent.cs b/Content.Shared/Body/ParentOrganComponent.cs
new file mode 100644
index 0000000000..e82fa70574
--- /dev/null
+++ b/Content.Shared/Body/ParentOrganComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Body;
+
+/// <summary>
+/// An organ that can be a parent to other organs.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(OrganRelationSystem))]
+public sealed partial class ParentOrganComponent : Component
+{
+    /// <summary>
+    /// The current set of child organs parented to this one.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<EntityUid> Children = new();
+}
diff --git a/Content.Shared/CCVar/CCVars.Game.cs b/Content.Shared/CCVar/CCVars.Game.cs
index 16fcac7385..e34c12576d 100644
--- a/Content.Shared/CCVar/CCVars.Game.cs
+++ b/Content.Shared/CCVar/CCVars.Game.cs
@@ -350,7 +350,7 @@ public sealed partial class CCVars
 #endif
 
     /// <summary>
-    ///     Delay between station alert level changes.
+    ///     Delay between station alert level changes (in seconds).
     /// </summary>
     public static readonly CVarDef<int> GameAlertLevelChangeDelay =
         CVarDef.Create("game.alert_level_change_delay", 30, CVar.SERVERONLY);
diff --git a/Content.Shared/CCVar/CCVars.Misc.cs b/Content.Shared/CCVar/CCVars.Misc.cs
index a158505ffc..a7d322d8a8 100644
--- a/Content.Shared/CCVar/CCVars.Misc.cs
+++ b/Content.Shared/CCVar/CCVars.Misc.cs
@@ -35,7 +35,8 @@ public sealed partial class CCVars
     /// </summary>
     [CVarControl(AdminFlags.VarEdit, min: 0f, max: float.MaxValue)]
     public static readonly CVarDef<float> AfkTime =
-        CVarDef.Create("afk.time", 300f, CVar.SERVER | CVar.REPLICATED);
+        CVarDef.Create("afk.time", 600f, CVar.SERVER | CVar.REPLICATED);
+        // If afk players become an issue again, implement using a more aggressive time limit when server pop is near full
 
     /// <summary>
     ///     How long a player has to confirm they are not AFK before being disconnected.
diff --git a/Content.Shared/Chat/EmotesEvents.cs b/Content.Shared/Chat/EmotesEvents.cs
index 196bbb43bd..74eedca31a 100644
--- a/Content.Shared/Chat/EmotesEvents.cs
+++ b/Content.Shared/Chat/EmotesEvents.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Inventory;
+using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
@@ -28,8 +29,13 @@ public sealed class BeforeEmoteEvent(EntityUid source, EmotePrototype emote)
 /// Use it to play sound, change sprite or something else.
 /// </summary>
 [ByRefEvent]
-public record struct EmoteEvent(EmotePrototype Emote)
+public record struct EmoteEvent(NetEntity Source, EmotePrototype Emote)
 {
+    /// <summary>
+    /// The entity that performed the emote.
+    /// </summary>
+    public NetEntity Source = Source;
+
     /// <summary>
     /// The used emote.
     /// </summary>
diff --git a/Content.Shared/Chat/SharedChatSystem.Emote.cs b/Content.Shared/Chat/SharedChatSystem.Emote.cs
index 8b4b8a1d91..9300a3f772 100644
--- a/Content.Shared/Chat/SharedChatSystem.Emote.cs
+++ b/Content.Shared/Chat/SharedChatSystem.Emote.cs
@@ -156,7 +156,10 @@ public abstract partial class SharedChatSystem
 
         // optional override params > general params for all sounds in set > individual sound params
         var param = audioParams ?? proto.GeneralParams ?? sound.Params;
-        _audio.PlayPvs(sound, uid, param);
+
+        if (_net.IsServer) // Chat is not predicted.
+            _audio.PlayPvs(sound, uid, param);
+
         return true;
     }
     /// <summary>
@@ -222,10 +225,6 @@ public abstract partial class SharedChatSystem
 
         if (beforeEv.Cancelled)
         {
-            // Chat is not predicted anyways, so no need to predict this popup either.
-            if (_net.IsClient)
-                return false;
-
             if (beforeEv.Blocker != null)
             {
                 _popup.PopupEntity(
@@ -251,7 +250,7 @@ public abstract partial class SharedChatSystem
             return false;
         }
 
-        var ev = new EmoteEvent(proto);
+        var ev = new EmoteEvent(GetNetEntity(uid), proto);
         RaiseLocalEvent(uid, ref ev);
 
         return true;
diff --git a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
index 604b067a84..3e01b7cab9 100644
--- a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
+++ b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
@@ -1,3 +1,5 @@
+using Content.Shared.AlertLevel;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Communications
@@ -15,31 +17,24 @@ namespace Content.Shared.Communications
         public readonly bool CanCall;
         public readonly TimeSpan? ExpectedCountdownEnd;
         public readonly bool CountdownStarted;
-        public List<string>? AlertLevels;
-        public string CurrentAlert;
-        public float CurrentAlertDelay;
 
-        public CommunicationsConsoleInterfaceState(bool canAnnounce, bool canCall, List<string>? alertLevels, string currentAlert, float currentAlertDelay, TimeSpan? expectedCountdownEnd = null)
+
+        public CommunicationsConsoleInterfaceState(
+            bool canAnnounce,
+            bool canCall,
+            TimeSpan? expectedCountdownEnd = null)
         {
             CanAnnounce = canAnnounce;
             CanCall = canCall;
             ExpectedCountdownEnd = expectedCountdownEnd;
             CountdownStarted = expectedCountdownEnd != null;
-            AlertLevels = alertLevels;
-            CurrentAlert = currentAlert;
-            CurrentAlertDelay = currentAlertDelay;
         }
     }
 
     [Serializable, NetSerializable]
-    public sealed class CommunicationsConsoleSelectAlertLevelMessage : BoundUserInterfaceMessage
+    public sealed class CommunicationsConsoleSelectAlertLevelMessage(ProtoId<AlertLevelPrototype> level) : BoundUserInterfaceMessage
     {
-        public readonly string Level;
-
-        public CommunicationsConsoleSelectAlertLevelMessage(string level)
-        {
-            Level = level;
-        }
+        public ProtoId<AlertLevelPrototype> Level = level;
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
index 1e8fe47fe3..cc43ea889e 100644
--- a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
@@ -55,6 +55,7 @@ public abstract partial class SharedDisposalUnitSystem : EntitySystem
     [Dependency] private SharedMapSystem _map = default!;
     [Dependency] private SharedTransformSystem _xform = default!;
     [Dependency] private INetManager _net = default!;
+    [Dependency] private SharedPowerStateSystem _powerState = default!;
 
     public override void Initialize()
     {
@@ -259,9 +260,15 @@ public abstract partial class SharedDisposalUnitSystem : EntitySystem
 
         ent.Comp.State = state;
 
-        if (state == DisposalsPressureState.Ready)
+        switch (state)
         {
-            ent.Comp.NextPressurized = TimeSpan.Zero;
+            case DisposalsPressureState.Ready:
+                ent.Comp.NextPressurized = TimeSpan.Zero;
+                _powerState.SetWorkingState(ent.Owner, false);
+                break;
+            case DisposalsPressureState.Pressurizing:
+                _powerState.SetWorkingState(ent.Owner, true);
+                break;
         }
 
         RecalculateFlushTime(ent, true);
diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs
index 714e45b604..d7926b8be4 100644
--- a/Content.Shared/Doors/Components/DoorComponent.cs
+++ b/Content.Shared/Doors/Components/DoorComponent.cs
@@ -301,6 +301,20 @@ public sealed partial class DoorComponent : Component
     [DataField]
     public bool ClickOpen = true;
 
+    /// <summary>
+    /// If true, the door closing check will try to match only entities intersecting the door's first fixture.
+    /// If false, the door will check the full tile the door is on.
+    /// </summary>
+    [DataField]
+    public bool CheckFixtureCollision;
+
+    /// <summary>
+    /// If true, the door will be able to close over entities with the MachineLayer fixture layer.
+    /// Useful for windoors or other thin doors.
+    /// </summary>
+    [DataField]
+    public bool AllowMachineLayer;
+
     [DataField(customTypeSerializer: typeof(ConstantSerializer<DrawDepthTag>))]
     public int OpenDrawDepth = (int) DrawDepth.DrawDepth.Doors;
 
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index a0f26990c1..083308d40d 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -23,7 +23,9 @@ using Robust.Shared.Timing;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Doors.Systems;
 
@@ -54,8 +56,6 @@ public abstract partial class SharedDoorSystem : EntitySystem
     /// </summary>
     private readonly HashSet<Entity<DoorComponent>> _activeDoors = new();
 
-    private readonly HashSet<Entity<PhysicsComponent>> _doorIntersecting = new();
-
     public override void Initialize()
     {
         base.Initialize();
@@ -455,7 +455,7 @@ public abstract partial class SharedDoorSystem : EntitySystem
         if (!HasAccess(uid, user, door))
             return false;
 
-        return !ev.PerformCollisionCheck || !GetColliding(uid).Any();
+        return !ev.PerformCollisionCheck || !GetColliding(uid, null, null, door.CheckFixtureCollision, door.PerformCollisionCheck).Any();
     }
 
     public void StartClosing(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool predicted = false)
@@ -530,7 +530,7 @@ public abstract partial class SharedDoorSystem : EntitySystem
     }
 
     /// <summary>
-    /// Crushes everyone colliding with us by more than <see cref="IntersectPercentage"/>%.
+    /// Crushes everyone colliding with the door.
     /// </summary>
     public void Crush(EntityUid uid, DoorComponent? door = null, PhysicsComponent? physics = null)
     {
@@ -540,9 +540,9 @@ public abstract partial class SharedDoorSystem : EntitySystem
         if (!door.CanCrush)
             return;
 
-        // Find entities and apply curshing effects
+        // Find entities and apply crushing effects
         var stunTime = door.DoorStunTime + door.OpenTimeOne;
-        foreach (var entity in GetColliding(uid, physics))
+        foreach (var entity in GetColliding(uid, physics, null, door.CheckFixtureCollision, door.AllowMachineLayer))
         {
             door.CurrentlyCrushing.Add(entity);
             if (door.CrushDamage != null)
@@ -560,11 +560,17 @@ public abstract partial class SharedDoorSystem : EntitySystem
     }
 
     /// <summary>
-    ///     Get all entities that collide with this door by more than <see cref="IntersectPercentage"/> percent.\
+    /// Checks if there are any entities colliding with the door, passing them back out to use e.g. to prevent closing.
     /// </summary>
-    public IEnumerable<EntityUid> GetColliding(EntityUid uid, PhysicsComponent? physics = null)
+    /// <param name="uid">The door entity to check.</param>
+    /// <param name="physics">The door's <see cref="PhysicsComponent"/>.</param>
+    /// <param name="checkFixtureCollision">If true, the door will do a more exact check based on its first fixture.</param>
+    /// <param name="fixtures">The door's <see cref="FixturesComponent"/>.</param>
+    /// <param name="allowMachineLayer">The door will be able to close over <see cref="CollisionGroup.MachineLayer"/>.</param>
+    /// <returns>The list of entities inside the door.</returns>
+    public IEnumerable<EntityUid> GetColliding(EntityUid uid, PhysicsComponent? physics = null, FixturesComponent? fixtures = null, bool checkFixtureCollision = false, bool allowMachineLayer = false)
     {
-        if (!Resolve(uid, ref physics))
+        if (!Resolve(uid, ref physics) || !Resolve(uid, ref fixtures))
             yield break;
 
         var xform = Transform(uid);
@@ -574,13 +580,27 @@ public abstract partial class SharedDoorSystem : EntitySystem
             yield break;
         var tileRef = _mapSystem.GetTileRef(xform.GridUid.Value, mapGridComp, xform.Coordinates);
 
-        _doorIntersecting.Clear();
-        _entityLookup.GetLocalEntitiesIntersecting(xform.GridUid.Value, tileRef.GridIndices, _doorIntersecting, gridComp: mapGridComp, flags: (LookupFlags.All & ~LookupFlags.Sensors));
+        var doorIntersecting = new HashSet<Entity<PhysicsComponent>>();
+
+        if (checkFixtureCollision && fixtures.Fixtures.TryFirstOrNull(out var fixture))
+        {
+            var fixtureToWorld = PhysicsSystem.GetPhysicsTransform(uid, xform);
+
+            _entityLookup.GetEntitiesIntersecting(xform.MapID,
+                fixture.Value.Value.Shape,
+                fixtureToWorld,
+                doorIntersecting,
+                flags: LookupFlags.All & ~(LookupFlags.Sensors | LookupFlags.Contained));
+        }
+        else
+        {
+            _entityLookup.GetLocalEntitiesIntersecting(xform.GridUid.Value, tileRef.GridIndices, doorIntersecting, gridComp: mapGridComp, flags: LookupFlags.All & ~(LookupFlags.Sensors | LookupFlags.Contained));
+        }
 
         // TODO SLOTH fix electro's code.
         // ReSharper disable once InconsistentNaming
 
-        foreach (var otherPhysics in _doorIntersecting)
+        foreach (var otherPhysics in doorIntersecting)
         {
             if (otherPhysics.Comp == physics)
                 continue;
@@ -601,6 +621,10 @@ public abstract partial class SharedDoorSystem : EntitySystem
             if (otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.ConveyorMask)
                 continue;
 
+            // We want windoors to be able to close over machines
+            if (allowMachineLayer && otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.MachineLayer)
+                continue;
+
             if ((physics.CollisionMask & otherPhysics.Comp.CollisionLayer) == 0 && (otherPhysics.Comp.CollisionMask & physics.CollisionLayer) == 0)
                 continue;
 
diff --git a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
index f87bbecf8c..6a818a1d33 100644
--- a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
@@ -12,7 +12,7 @@ public sealed partial class TemperatureEntityConditionSystem : EntityConditionSy
 {
     protected override void Condition(Entity<TemperatureComponent> entity, ref EntityConditionEvent<TemperatureCondition> args)
     {
-        if (entity.Comp.CurrentTemperature >= args.Condition.Min && entity.Comp.CurrentTemperature <= args.Condition.Max)
+        if (entity.Comp.Temperature >= args.Condition.Min && entity.Comp.Temperature <= args.Condition.Max)
             args.Result = true;
     }
 }
diff --git a/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
index 94b850fd98..418730e33a 100644
--- a/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
+++ b/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
@@ -16,7 +16,7 @@ public sealed partial class AdjustTemperatureEntityEffectSystem : EntityEffectSy
     {
         var amount = args.Effect.Amount * args.Scale;
 
-        _temperature.ChangeHeat(entity, amount, true, entity.Comp);
+        _temperature.ChangeHeat(entity.AsNullable(), amount, true);
     }
 }
 
diff --git a/Content.Shared/Execution/SharedExecutionSystem.cs b/Content.Shared/Execution/SharedExecutionSystem.cs
index 17c44cf430..e1ca1a0268 100644
--- a/Content.Shared/Execution/SharedExecutionSystem.cs
+++ b/Content.Shared/Execution/SharedExecutionSystem.cs
@@ -1,17 +1,17 @@
 using Content.Shared.ActionBlocker;
-using Content.Shared.Chat;
 using Content.Shared.CombatMode;
 using Content.Shared.Damage.Components;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction.Events;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
+using Content.Shared.Suicide;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
-using Content.Shared.Interaction.Events;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Shared.Execution;
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 62563cada9..91d33e8047 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -50,7 +50,6 @@ public partial class InventorySystem
         SubscribeLocalEvent<InventoryComponent, RefreshMovementSpeedModifiersEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, BeforeStripEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, SeeIdentityAttemptEvent>(RelayInventoryEvent);
-        SubscribeLocalEvent<InventoryComponent, ModifyChangedTemperatureEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, GetDefaultRadioChannelEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, RefreshNameModifiersEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, TransformSpeakerNameEvent>(RelayInventoryEvent);
@@ -90,6 +89,7 @@ public partial class InventorySystem
         SubscribeLocalEvent<InventoryComponent, WieldAttemptEvent>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, UnwieldAttemptEvent>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, IngestionAttemptEvent>(RefRelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, BeforeHeatExchangeEvent>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, ScreechEffectAttemptEvent>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, RefreshNightVisionEvent>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, GluedEffectAttemptEvent>(RefRelayInventoryEvent);
diff --git a/Content.Shared/Item/HeldSpeedModifierComponent.cs b/Content.Shared/Item/HeldSpeedModifierComponent.cs
index 6882676573..7d86973913 100644
--- a/Content.Shared/Item/HeldSpeedModifierComponent.cs
+++ b/Content.Shared/Item/HeldSpeedModifierComponent.cs
@@ -32,6 +32,12 @@ public sealed partial class HeldSpeedModifierComponent : Component
     [DataField]
     public float WeightlessAcceleration = 1.0f;
 
+    /// <summary>
+    /// A multiplier applied to Weightlessness speed, I.E the Maximum speed one can go in 0G under their own power
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float ZeroGravityModifier = 1.0f;
+
     /// <summary>
     /// If true, values from <see cref="ClothingSpeedModifierComponent"/> will attempted to be used before the ones in this component.
     /// </summary>
diff --git a/Content.Shared/Item/HeldSpeedModifierSystem.cs b/Content.Shared/Item/HeldSpeedModifierSystem.cs
index c0bb6c3e19..e4fe0effd6 100644
--- a/Content.Shared/Item/HeldSpeedModifierSystem.cs
+++ b/Content.Shared/Item/HeldSpeedModifierSystem.cs
@@ -53,5 +53,6 @@ public sealed partial class HeldSpeedModifierSystem : EntitySystem
     private void OnRefreshWeightlessModifiers(Entity<HeldSpeedModifierComponent> ent, ref HeldRelayedEvent<RefreshWeightlessModifiersEvent> args)
     {
         args.Args.ModifyAcceleration(ent.Comp.WeightlessAcceleration);
+        args.Args.WeightlessModifierMod *= ent.Comp.ZeroGravityModifier;
     }
 }
diff --git a/Content.Shared/Lock/LockComponent.cs b/Content.Shared/Lock/LockComponent.cs
index 2d3497d504..867aa5bbfa 100644
--- a/Content.Shared/Lock/LockComponent.cs
+++ b/Content.Shared/Lock/LockComponent.cs
@@ -16,9 +16,8 @@ public sealed partial class LockComponent : Component
     /// <summary>
     /// Whether or not the lock is locked.
     /// </summary>
-    [DataField("locked"), ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public bool Locked  = true;
+    [DataField, AutoNetworkedField]
+    public bool Locked = true;
 
     /// <summary>
     /// If true, will show verbs to lock and unlock the item. Otherwise, it will not.
@@ -35,8 +34,7 @@ public sealed partial class LockComponent : Component
     /// <summary>
     /// Whether or not the lock is locked by simply clicking.
     /// </summary>
-    [DataField("lockOnClick"), ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool LockOnClick;
 
     /// <summary>
@@ -80,7 +78,7 @@ public sealed partial class LockComponent : Component
     /// <summary>
     /// The sound played when unlocked.
     /// </summary>
-    [DataField("unlockingSound"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField("unlockingSound")]
     public SoundSpecifier? UnlockSound = new SoundPathSpecifier("/Audio/Machines/door_lock_off.ogg")
     {
         Params = AudioParams.Default.AddVolume(-5f),
@@ -89,10 +87,10 @@ public sealed partial class LockComponent : Component
     /// <summary>
     /// The sound played when locked.
     /// </summary>
-    [DataField("lockingSound"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField("lockingSound")]
     public SoundSpecifier? LockSound = new SoundPathSpecifier("/Audio/Machines/door_lock_on.ogg")
     {
-        Params = AudioParams.Default.WithVariation(-5f)
+        Params = AudioParams.Default.AddVolume(-5f)
     };
 
     /// <summary>
diff --git a/Content.Shared/Medical/Cryogenics/InsideCryoPodComponent.cs b/Content.Shared/Medical/Cryogenics/InsideCryoPodComponent.cs
index 03cc3edf13..033a79e3ff 100644
--- a/Content.Shared/Medical/Cryogenics/InsideCryoPodComponent.cs
+++ b/Content.Shared/Medical/Cryogenics/InsideCryoPodComponent.cs
@@ -10,4 +10,10 @@ public sealed partial class InsideCryoPodComponent: Component
     [ViewVariables]
     [DataField("previousOffset")]
     public Vector2 PreviousOffset { get; set; } = new(0, 0);
+
+    /// <summary>
+    /// A modifier for the conductance between the cryo pod and the entity inside.
+    /// </summary>
+    [DataField]
+    public float ConductanceMod = 20f; // Arbitrary number. Likely cryopods will have to be heat containers with special juice in the future, or use Frezon...
 }
diff --git a/Content.Shared/Medical/Cryogenics/SharedInsideCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedInsideCryoPodSystem.cs
index da3604e6e5..76fd6034e8 100644
--- a/Content.Shared/Medical/Cryogenics/SharedInsideCryoPodSystem.cs
+++ b/Content.Shared/Medical/Cryogenics/SharedInsideCryoPodSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Standing;
+using Content.Shared.Temperature;
 using Robust.Shared.Containers;
 
 namespace Content.Shared.Medical.Cryogenics;
@@ -7,23 +8,24 @@ public abstract partial class SharedCryoPodSystem
 {
     public virtual void InitializeInsideCryoPod()
     {
-        SubscribeLocalEvent<InsideCryoPodComponent, DownAttemptEvent>(HandleDown);
         SubscribeLocalEvent<InsideCryoPodComponent, EntGotRemovedFromContainerMessage>(OnEntGotRemovedFromContainer);
+        SubscribeLocalEvent<InsideCryoPodComponent, DownAttemptEvent>(HandleDown);
+        SubscribeLocalEvent<InsideCryoPodComponent, BeforeHeatExchangeEvent>(OnBeforeHeatExchange);
+    }
+
+    private void OnEntGotRemovedFromContainer(Entity<InsideCryoPodComponent> entity, ref EntGotRemovedFromContainerMessage args)
+    {
+        RemCompDeferred<InsideCryoPodComponent>(entity);
     }
 
     // Must stand in the cryo pod
-    private void HandleDown(EntityUid uid, InsideCryoPodComponent component, DownAttemptEvent args)
+    private void HandleDown(Entity<InsideCryoPodComponent> entity, ref DownAttemptEvent args)
     {
         args.Cancel();
     }
 
-    private void OnEntGotRemovedFromContainer(EntityUid uid, InsideCryoPodComponent component, EntGotRemovedFromContainerMessage args)
+    private void OnBeforeHeatExchange(Entity<InsideCryoPodComponent> entity, ref BeforeHeatExchangeEvent args)
     {
-        if (Terminating(uid))
-        {
-            return;
-        }
-
-        RemComp<InsideCryoPodComponent>(uid);
+        args.HeatTransferModifier *= entity.Comp.ConductanceMod;
     }
 }
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
index ebc0a16365..72bc619eeb 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
@@ -128,17 +128,17 @@ public abstract partial class SharedMoverController
         PhysicsSystem.UpdateIsPredicted(entity.Owner);
         PhysicsSystem.UpdateIsPredicted(entity.Comp.Source);
 
-        if (Timing.ApplyingState)
-            return;
-
         if (MoverQuery.TryComp(entity.Owner, out var inputMover))
             SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
 
-        if (RelayQuery.TryComp(entity.Comp.Source, out var relay) && relay.LifeStage <= ComponentLifeStage.Running)
-        {
-            RemComp(entity.Comp.Source, relay);
-            RaiseEffectiveMoverChanged(entity.Comp.Source, entity.Owner, entity.Comp.Source);
-        }
+        if (Timing.ApplyingState)
+            return;
+
+        if (!RelayQuery.TryComp(entity.Comp.Source, out var relay) ||
+            relay.LifeStage > ComponentLifeStage.Running) return;
+
+        RemComp(entity.Comp.Source, relay);
+        RaiseEffectiveMoverChanged(entity.Comp.Source, entity.Owner, entity.Comp.Source);
     }
 
     protected virtual void UpdateMoverStatus(Entity<InputMoverComponent?, MovementRelayTargetComponent?> ent) { }
diff --git a/Content.Shared/PDA/PdaComponent.cs b/Content.Shared/PDA/PdaComponent.cs
index cdfeffa2c1..5653ddfc44 100644
--- a/Content.Shared/PDA/PdaComponent.cs
+++ b/Content.Shared/PDA/PdaComponent.cs
@@ -1,8 +1,8 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.GameStates;
-using Content.Shared.Access.Components;
+using Content.Shared.AlertLevel;
 using Content.Shared.Containers.ItemSlots;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.PDA
 {
@@ -27,6 +27,7 @@ namespace Content.Shared.PDA
         [DataField("id", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? IdCard;
 
+        // TODO: Fix persistence
         [ViewVariables] public EntityUid? ContainedId;
         [ViewVariables] public bool FlashlightOn;
 
@@ -36,7 +37,8 @@ namespace Content.Shared.PDA
         // as well.
         [ViewVariables(VVAccess.ReadWrite)] public EntityUid? PdaOwner;
         [ViewVariables] public string? StationName;
-        [ViewVariables] public string? StationAlertLevel;
+        [ViewVariables]
+        public ProtoId<AlertLevelPrototype>? StationAlertLevel;
         [ViewVariables] public Color StationAlertColor = Color.White;
     }
 }
diff --git a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
index 844e9597e9..c6c0eab5fb 100644
--- a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
+++ b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
@@ -68,7 +68,7 @@ public abstract partial class SharedPowerReceiverSystem : EntitySystem
         if (playSwitchSound)
         {
             _audio.PlayPredicted(new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"), uid, user: user,
-                AudioParams.Default.WithVariation(-2f));
+                AudioParams.Default.AddVolume(-2f));
         }
 
         if (_netMan.IsClient && receiver.PowerDisabled)
diff --git a/Content.Shared/PowerCell/PowerCellSystem.cs b/Content.Shared/PowerCell/PowerCellSystem.cs
index a732fc0e48..c7b303392b 100644
--- a/Content.Shared/PowerCell/PowerCellSystem.cs
+++ b/Content.Shared/PowerCell/PowerCellSystem.cs
@@ -135,8 +135,16 @@ public sealed partial class PowerCellSystem : EntitySystem
 
     private void OnDrawRefreshChargeRate(Entity<PowerCellDrawComponent> ent, ref RefreshChargeRateEvent args)
     {
-        if (ent.Comp.Enabled)
-            args.NewChargeRate -= ent.Comp.DrawRate;
+        if (!ent.Comp.Enabled)
+            return;
+
+        args.NewChargeRate -= ent.Comp.DrawRate;
+
+        // If PowerCellDraw is enabled. then it should set the charge cooldown on the self recharging battery
+        if (!TryGetBatteryFromSlot(ent.Owner, out var battery))
+            return;
+
+        _battery.TrySetChargeCooldown(battery.Value.Owner);
     }
 
     private void OnDrawStartup(Entity<PowerCellDrawComponent> ent, ref ComponentStartup args)
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index c89ed23987..d0e4f2fd91 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Access.Systems;
 using Content.Shared.Actions;
 using Content.Shared.Administration.Logs;
+using Content.Shared.Body.Events;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
 using Content.Shared.Gibbing;
@@ -23,8 +24,8 @@ using Content.Shared.Roles;
 using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Throwing;
 using Content.Shared.UserInterface;
-using Content.Shared.Whitelist;
 using Content.Shared.Wires;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Containers;
@@ -89,7 +90,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
         SubscribeLocalEvent<BorgChassisComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
         SubscribeLocalEvent<BorgChassisComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
         SubscribeLocalEvent<BorgChassisComponent, MobStateChangedEvent>(OnMobStateChanged);
-        SubscribeLocalEvent<BorgChassisComponent, BeingGibbedEvent>(OnBeingGibbed);
+        SubscribeLocalEvent<BorgChassisComponent, GibbedBeforeDeletionEvent>(OnBeingGibbed);
         SubscribeLocalEvent<BorgChassisComponent, GetCharactedDeadIcEvent>(OnGetDeadIC);
         SubscribeLocalEvent<BorgChassisComponent, GetCharacterUnrevivableIcEvent>(OnGetUnrevivableIC);
         SubscribeLocalEvent<BorgChassisComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
@@ -286,17 +287,15 @@ public abstract partial class SharedBorgSystem : EntitySystem
             SetActive(chassis, false, user: args.Origin);
     }
 
-    private void OnBeingGibbed(Entity<BorgChassisComponent> chassis, ref BeingGibbedEvent args)
+    private void OnBeingGibbed(Entity<BorgChassisComponent> chassis, ref GibbedBeforeDeletionEvent args)
     {
         // Don't use the ItemSlotsSystem eject method since we don't want to play a sound and want we to eject the battery even if the slot is locked.
         if (TryComp<PowerCellSlotComponent>(chassis, out var slotComp) &&
             _container.TryGetContainer(chassis, slotComp.CellSlotId, out var slotContainer))
-        {
-            args.Giblets.UnionWith(_container.EmptyContainer(slotContainer));
-        }
+            _container.EmptyContainer(slotContainer);
 
-        args.Giblets.UnionWith(_container.EmptyContainer(chassis.Comp.BrainContainer));
-        args.Giblets.UnionWith(_container.EmptyContainer(chassis.Comp.ModuleContainer));
+        _container.EmptyContainer(chassis.Comp.BrainContainer);
+        _container.EmptyContainer(chassis.Comp.ModuleContainer);
     }
 
     private void OnGetDeadIC(Entity<BorgChassisComponent> chassis, ref GetCharactedDeadIcEvent args)
diff --git a/Content.Shared/Speech/AccentEvent.cs b/Content.Shared/Speech/AccentEvent.cs
index 30d384cbb2..4404404246 100644
--- a/Content.Shared/Speech/AccentEvent.cs
+++ b/Content.Shared/Speech/AccentEvent.cs
@@ -1,11 +1,11 @@
-using Content.Shared.Inventory;
+using Content.Shared.Inventory;
 
 namespace Content.Shared.Speech;
 
 /// <summary>
-///     Raised on an entity to apply speech accents to its message.
-///     Handlers should modify <see cref="Message"/> in place.
-///     Relayed through inventory (e.g. voice masks) and status effects.
+/// Raised on an entity to apply speech accents to its message.
+/// Handlers should modify <see cref="Message"/> in place.
+/// Relayed through inventory (e.g. voice masks) and status effects.
 /// </summary>
 [ByRefEvent]
 public record struct AccentGetEvent(EntityUid Entity, string Message) : IInventoryRelayEvent
diff --git a/Content.Shared/Speech/Components/ActiveListenerComponent.cs b/Content.Shared/Speech/Components/ActiveListenerComponent.cs
index fde108a817..921c6ce499 100644
--- a/Content.Shared/Speech/Components/ActiveListenerComponent.cs
+++ b/Content.Shared/Speech/Components/ActiveListenerComponent.cs
@@ -6,12 +6,12 @@ namespace Content.Shared.Speech.Components;
 /// <summary>
 /// This component is used to relay speech events to other systems.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ActiveListenerComponent : Component
 {
     /// <summary>
     /// The range in which to listen to speech.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float Range = SharedChatSystem.VoiceRange;
 }
diff --git a/Content.Shared/Speech/Components/AllCapsAccentComponent.cs b/Content.Shared/Speech/Components/AllCapsAccentComponent.cs
index 7b0c37b538..88ad1e8286 100644
--- a/Content.Shared/Speech/Components/AllCapsAccentComponent.cs
+++ b/Content.Shared/Speech/Components/AllCapsAccentComponent.cs
@@ -1,7 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
 namespace Content.Shared.Speech.Components;
 
 /// <summary>
 /// Marks a speech status effect that transforms spoken text to uppercase.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(AllCapsAccentSystem))]
 public sealed partial class AllCapsAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/BackwardsAccentComponent.cs b/Content.Shared/Speech/Components/BackwardsAccentComponent.cs
new file mode 100644
index 0000000000..8d577ccd39
--- /dev/null
+++ b/Content.Shared/Speech/Components/BackwardsAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// sdrawkcaB
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(BackwardsAccentSystem))]
+public sealed partial class BackwardsAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/BarkAccentComponent.cs b/Content.Shared/Speech/Components/BarkAccentComponent.cs
new file mode 100644
index 0000000000..8917f73464
--- /dev/null
+++ b/Content.Shared/Speech/Components/BarkAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Arf! Arso makes "L" into "R"!
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(BarkAccentSystem))]
+public sealed partial class BarkAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/BleatingAccentComponent.cs b/Content.Shared/Speech/Components/BleatingAccentComponent.cs
new file mode 100644
index 0000000000..7891dacfb7
--- /dev/null
+++ b/Content.Shared/Speech/Components/BleatingAccentComponent.cs
@@ -0,0 +1,12 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Makes this entity speak like a sheep or a goat in all chat messages it sends.
+/// Repeats the vowel in certain consonant-vowel pairs so you taaaalk liiiike thiiiis.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(BleatingAccentSystem))]
+public sealed partial class BleatingAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/BlockListeningComponent.cs b/Content.Shared/Speech/Components/BlockListeningComponent.cs
new file mode 100644
index 0000000000..472d03e16e
--- /dev/null
+++ b/Content.Shared/Speech/Components/BlockListeningComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Causes all ListenAttemptEvents to fail on the entity.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BlockListeningComponent : Component;
diff --git a/Content.Shared/Speech/Components/DamagedSiliconAccentComponent.cs b/Content.Shared/Speech/Components/DamagedSiliconAccentComponent.cs
index 919347d080..d1965b1bd9 100644
--- a/Content.Shared/Speech/Components/DamagedSiliconAccentComponent.cs
+++ b/Content.Shared/Speech/Components/DamagedSiliconAccentComponent.cs
@@ -1,79 +1,83 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
+using Content.Shared.Speech.EntitySystems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Speech.Components;
 
+/// <summary>
+/// Applies damage corruption effects to the speech.
+/// </summary>
 [RegisterComponent, NetworkedComponent]
 public sealed partial class DamagedSiliconAccentComponent : BaseAccentComponent
 {
     /// <summary>
-    ///     Enable damage corruption effects
+    /// Enable damage corruption effects
     /// </summary>
     [DataField]
     public bool EnableDamageCorruption = true;
 
     /// <summary>
-    ///     Override total damage for damage corruption effects
+    /// Override total damage for damage corruption effects
     /// </summary>
     [DataField]
     public FixedPoint2? OverrideTotalDamage;
 
     /// <summary>
-    ///     The probability that a character will be corrupted when total damage at or above <see cref="MaxDamageCorruption" />.
+    /// The probability that a character will be corrupted when total damage at or above <see cref="MaxDamageCorruption" />.
     /// </summary>
     [DataField]
     public float MaxDamageCorruption = 0.5f;
 
     /// <summary>
-    ///     Probability of character corruption will increase linearly to <see cref="MaxDamageCorruption" /> once until
-    ///     total damage is at or above this value. If null, it will use the value returned by
-    ///     DestructibleSystem.DestroyedAt, which is the damage threshold for destruction or breakage.
+    /// Probability of character corruption will increase linearly to <see cref="MaxDamageCorruption" /> once until
+    /// total damage is at or above this value. If null, it will use the value returned by
+    /// DestructibleSystem.DestroyedAt, which is the damage threshold for destruction or breakage.
     /// </summary>
     [DataField]
     public FixedPoint2? DamageAtMaxCorruption;
 
     /// <summary>
-    ///     Enable charge level corruption effects
+    /// Enable charge level corruption effects
     /// </summary>
     [DataField]
     public bool EnableChargeCorruption = true;
 
     /// <summary>
-    ///     Override charge level for charge level corruption effects
+    /// Override charge level for charge level corruption effects
     /// </summary>
     [DataField]
     public float? OverrideChargeLevel;
 
     /// <summary>
-    ///     If the power cell charge is below this value (as a fraction of maximum charge),
-    ///     power corruption will begin to be applied.
+    /// If the power cell charge is below this value (as a fraction of maximum charge),
+    /// power corruption will begin to be applied.
     /// </summary>
     [DataField]
     public float ChargeThresholdForPowerCorruption = 0.15f;
 
     /// <summary>
-    ///     Regardless of charge level, this is how many characters at the start of a message will be 100% safe
-    ///     from being dropped.
+    /// Regardless of charge level, this is how many characters at the start of a message will be 100% safe
+    /// from being dropped.
     /// </summary>
     [DataField]
     public int StartPowerCorruptionAtCharIdx = 8;
 
     /// <summary>
-    ///     The probability that a character will be dropped due to charge level will be maximum for characters past
-    ///     this index. This has the effect of longer messages dropping more characters later in the message.
+    /// The probability that a character will be dropped due to charge level will be maximum for characters past
+    /// this index. This has the effect of longer messages dropping more characters later in the message.
     /// </summary>
     [DataField]
     public int MaxPowerCorruptionAtCharIdx = 40;
 
     /// <summary>
-    ///     The maximum probability that a character will be dropped due to charge level.
+    /// The maximum probability that a character will be dropped due to charge level.
     /// </summary>
     [DataField]
     public float MaxDropProbFromPower = 0.5f;
 
     /// <summary>
-    ///     If a character is "dropped", this is the probability that the character will be turned into a period instead
-    ///     of completely deleting the character.
+    /// If a character is "dropped", this is the probability that the character will be turned into a period instead
+    /// of completely deleting the character.
     /// </summary>
     [DataField]
     public float ProbToCorruptDotFromPower = 0.6f;
diff --git a/Content.Server/Speech/Components/FrenchAccentComponent.cs b/Content.Shared/Speech/Components/FrenchAccentComponent.cs
similarity index 60%
rename from Content.Server/Speech/Components/FrenchAccentComponent.cs
rename to Content.Shared/Speech/Components/FrenchAccentComponent.cs
index 29743f2787..2bbbde42b7 100644
--- a/Content.Server/Speech/Components/FrenchAccentComponent.cs
+++ b/Content.Shared/Speech/Components/FrenchAccentComponent.cs
@@ -1,11 +1,11 @@
-using Content.Server.Speech.EntitySystems;
-using Content.Shared.Speech.Components;
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Speech.Components;
+namespace Content.Shared.Speech.Components;
 
 /// <summary>
 /// French accent replaces spoken letters. "th" becomes "z" and "H" at the start of a word becomes "'".
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
 [Access(typeof(FrenchAccentSystem))]
 public sealed partial class FrenchAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/FrontalLispComponent.cs b/Content.Shared/Speech/Components/FrontalLispComponent.cs
new file mode 100644
index 0000000000..a5082c0f5d
--- /dev/null
+++ b/Content.Shared/Speech/Components/FrontalLispComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Lithping!
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(FrontalLispSystem))]
+public sealed partial class FrontalLispComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/GermanAccentComponent.cs b/Content.Shared/Speech/Components/GermanAccentComponent.cs
new file mode 100644
index 0000000000..e7c4bb6768
--- /dev/null
+++ b/Content.Shared/Speech/Components/GermanAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Das accent, ja?
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(GermanAccentSystem))]
+public sealed partial class GermanAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/LizardAccentComponent.cs b/Content.Shared/Speech/Components/LizardAccentComponent.cs
new file mode 100644
index 0000000000..2d06c1875b
--- /dev/null
+++ b/Content.Shared/Speech/Components/LizardAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Hiss!
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(LizardAccentSystem))]
+public sealed partial class LizardAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/MeleeSpeechComponent.cs b/Content.Shared/Speech/Components/MeleeSpeechComponent.cs
index e9bea22e2d..f93d928832 100644
--- a/Content.Shared/Speech/Components/MeleeSpeechComponent.cs
+++ b/Content.Shared/Speech/Components/MeleeSpeechComponent.cs
@@ -2,19 +2,15 @@ using Content.Shared.Actions;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Speech.Components;
 
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState]
-
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class MeleeSpeechComponent : Component
 {
     /// <summary>
     /// The battlecry to be said when an entity attacks with this component
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField("Battlecry")]
     [AutoNetworkedField]
     public string? Battlecry;
@@ -22,21 +18,22 @@ public sealed partial class MeleeSpeechComponent : Component
     /// <summary>
     /// The maximum amount of characters allowed in a battlecry
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField("MaxBattlecryLength")]
     [AutoNetworkedField]
     public int MaxBattlecryLength = 12;
 
-    [DataField] public EntProtoId  ConfigureAction = "ActionConfigureMeleeSpeech";
+    [DataField]
+    public EntProtoId ConfigureAction = "ActionConfigureMeleeSpeech";
 
     /// <summary>
     /// The action to open the battlecry UI
     /// </summary>
-    [DataField("configureActionEntity")] public EntityUid? ConfigureActionEntity;
+    [DataField]
+    public EntityUid? ConfigureActionEntity;
 }
 
 /// <summary>
-/// Key representing which <see cref="PlayerBoundUserInterface"/> is currently open.
+/// Key representing which <see cref="BoundUserInterface"/> is currently open.
 /// Useful when there are multiple UI for an object. Here it's future-proofing only.
 /// </summary>
 [Serializable, NetSerializable]
@@ -49,23 +46,15 @@ public enum MeleeSpeechUiKey : byte
 /// Represents an <see cref="MeleeSpeechComponent"/> state that can be sent to the client
 /// </summary>
 [Serializable, NetSerializable]
-public sealed class MeleeSpeechBoundUserInterfaceState : BoundUserInterfaceState
+public sealed class MeleeSpeechBoundUserInterfaceState(string currentBattlecry) : BoundUserInterfaceState
 {
-    public string CurrentBattlecry { get; }
-    public MeleeSpeechBoundUserInterfaceState(string currentBattlecry)
-    {
-        CurrentBattlecry = currentBattlecry;
-    }
+    public string CurrentBattlecry { get; } = currentBattlecry;
 }
 
 [Serializable, NetSerializable]
-public sealed class MeleeSpeechBattlecryChangedMessage : BoundUserInterfaceMessage
+public sealed class MeleeSpeechBattlecryChangedMessage(string battlecry) : BoundUserInterfaceMessage
 {
-    public string Battlecry { get; }
-    public MeleeSpeechBattlecryChangedMessage(string battlecry)
-    {
-        Battlecry = battlecry;
-    }
+    public string Battlecry { get; } = battlecry;
 }
 
-public sealed partial class MeleeSpeechConfigureActionEvent : InstantActionEvent { }
+public sealed partial class MeleeSpeechConfigureActionEvent : InstantActionEvent;
diff --git a/Content.Shared/Speech/Components/MobsterAccentComponent.cs b/Content.Shared/Speech/Components/MobsterAccentComponent.cs
new file mode 100644
index 0000000000..ca1b62b61c
--- /dev/null
+++ b/Content.Shared/Speech/Components/MobsterAccentComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Nyehh, my gabagool, see?
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(MobsterAccentSystem))]
+public sealed partial class MobsterAccentComponent : BaseAccentComponent
+{
+    /// <summary>
+    /// Do you make all the rules?
+    /// </summary>
+    [DataField]
+    public bool IsBoss = true;
+}
diff --git a/Content.Shared/Speech/Components/MonkeyAccentComponent.cs b/Content.Shared/Speech/Components/MonkeyAccentComponent.cs
new file mode 100644
index 0000000000..e8e73c4112
--- /dev/null
+++ b/Content.Shared/Speech/Components/MonkeyAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// OOH AAH!
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(MonkeyAccentSystem))]
+public sealed partial class MonkeyAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/MothAccentComponent.cs b/Content.Shared/Speech/Components/MothAccentComponent.cs
new file mode 100644
index 0000000000..fd3d3317b3
--- /dev/null
+++ b/Content.Shared/Speech/Components/MothAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Buzzz!
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(MothAccentSystem))]
+public sealed partial class MothAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/MumbleAccentComponent.cs b/Content.Shared/Speech/Components/MumbleAccentComponent.cs
similarity index 63%
rename from Content.Server/Speech/Components/MumbleAccentComponent.cs
rename to Content.Shared/Speech/Components/MumbleAccentComponent.cs
index 0d809f64ac..a3f69f407b 100644
--- a/Content.Server/Speech/Components/MumbleAccentComponent.cs
+++ b/Content.Shared/Speech/Components/MumbleAccentComponent.cs
@@ -1,9 +1,14 @@
-using Content.Shared.Speech.Components;
 using Robust.Shared.Audio;
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Speech.Components;
+namespace Content.Shared.Speech.Components;
 
-[RegisterComponent]
+/// <summary>
+/// Hmmfff!
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(MumbleAccentSystem))]
 public sealed partial class MumbleAccentComponent : BaseAccentComponent
 {
     /// <summary>
diff --git a/Content.Shared/Speech/Components/OwOAccentComponent.cs b/Content.Shared/Speech/Components/OwOAccentComponent.cs
new file mode 100644
index 0000000000..f888113211
--- /dev/null
+++ b/Content.Shared/Speech/Components/OwOAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// I am not typing out an example for this one.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(OwOAccentSystem))]
+public sealed partial class OwOAccentComponent : BaseAccentComponent;
diff --git a/Content.Server/Speech/Components/ParrotAccentComponent.cs b/Content.Shared/Speech/Components/ParrotAccentComponent.cs
similarity index 84%
rename from Content.Server/Speech/Components/ParrotAccentComponent.cs
rename to Content.Shared/Speech/Components/ParrotAccentComponent.cs
index 2e10a505c6..980996c672 100644
--- a/Content.Server/Speech/Components/ParrotAccentComponent.cs
+++ b/Content.Shared/Speech/Components/ParrotAccentComponent.cs
@@ -1,11 +1,13 @@
-using Content.Shared.Speech.Components;
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Speech.Components;
+namespace Content.Shared.Speech.Components;
 
 /// <summary>
-/// Makes this entity speak like a parrot in all chat messages it sends.
+/// Makes this entity speak like a parrot in all chat messages it sends. SQUAWK!
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(ParrotAccentSystem))]
 public sealed partial class ParrotAccentComponent : BaseAccentComponent
 {
     /// <summary>
@@ -35,7 +37,8 @@ public sealed partial class ParrotAccentComponent : BaseAccentComponent
     /// <summary>
     /// Strings to use as squawking noises.
     /// </summary>
-    public readonly string[] Squawks = [
+    public readonly string[] Squawks =
+    [
         "accent-parrot-squawk-1",
         "accent-parrot-squawk-2",
         "accent-parrot-squawk-3",
@@ -45,5 +48,4 @@ public sealed partial class ParrotAccentComponent : BaseAccentComponent
         "accent-parrot-squawk-7",
         "accent-parrot-squawk-8"
     ];
-
 }
diff --git a/Content.Server/Speech/Components/PirateAccentComponent.cs b/Content.Shared/Speech/Components/PirateAccentComponent.cs
similarity index 61%
rename from Content.Server/Speech/Components/PirateAccentComponent.cs
rename to Content.Shared/Speech/Components/PirateAccentComponent.cs
index 34afabb8ee..eb34e681d1 100644
--- a/Content.Server/Speech/Components/PirateAccentComponent.cs
+++ b/Content.Shared/Speech/Components/PirateAccentComponent.cs
@@ -1,14 +1,16 @@
-using Content.Server.Speech.EntitySystems;
-using Content.Shared.Speech.Components;
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Speech.Components;
+namespace Content.Shared.Speech.Components;
 
-[RegisterComponent]
+/// <summary>
+/// Lets you speak Ratvarian!
+/// </summary>
+[RegisterComponent, NetworkedComponent]
 [Access(typeof(PirateAccentSystem))]
 public sealed partial class PirateAccentComponent : BaseAccentComponent
 {
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("yarrChance")]
+    [DataField]
     public float YarrChance = 0.5f;
 
     [ViewVariables]
diff --git a/Content.Shared/Speech/Components/RatvarianLanguageComponent.cs b/Content.Shared/Speech/Components/RatvarianLanguageComponent.cs
index ddb4ce5e90..c195c648ef 100644
--- a/Content.Shared/Speech/Components/RatvarianLanguageComponent.cs
+++ b/Content.Shared/Speech/Components/RatvarianLanguageComponent.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.GameStates;
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Speech.Components;
 
@@ -6,4 +7,5 @@ namespace Content.Shared.Speech.Components;
 /// Marks a speech status effect that transforms spoken text into Ratvarian.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
+[Access(typeof(RatvarianLanguageSystem))]
 public sealed partial class RatvarianLanguageComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/ReplacementAccentComponent.cs b/Content.Shared/Speech/Components/ReplacementAccentComponent.cs
new file mode 100644
index 0000000000..edb3d9bb3d
--- /dev/null
+++ b/Content.Shared/Speech/Components/ReplacementAccentComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Speech.Prototypes;
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Replaces full sentences or words within sentences with new strings.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(ReplacementAccentSystem))]
+public sealed partial class ReplacementAccentComponent : BaseAccentComponent
+{
+    [DataField(required: true)]
+    public ProtoId<ReplacementAccentPrototype> Accent;
+}
diff --git a/Content.Shared/Speech/Components/RussianAccentComponent.cs b/Content.Shared/Speech/Components/RussianAccentComponent.cs
new file mode 100644
index 0000000000..e210ccd434
--- /dev/null
+++ b/Content.Shared/Speech/Components/RussianAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// ЯussiДи! Becomes incomprehensible to read for anyone who actually knows cyrillic.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(RussianAccentSystem))]
+public sealed partial class RussianAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/ScrambledAccentComponent.cs b/Content.Shared/Speech/Components/ScrambledAccentComponent.cs
new file mode 100644
index 0000000000..dd82de4ccb
--- /dev/null
+++ b/Content.Shared/Speech/Components/ScrambledAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Structure is sentence weird accent this with!
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(ScrambledAccentSystem))]
+public sealed partial class ScrambledAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/SkeletonAccentComponent.cs b/Content.Shared/Speech/Components/SkeletonAccentComponent.cs
new file mode 100644
index 0000000000..d8e301feb8
--- /dev/null
+++ b/Content.Shared/Speech/Components/SkeletonAccentComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Rattle me bones!
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SkeletonAccentSystem))]
+public sealed partial class SkeletonAccentComponent : BaseAccentComponent
+{
+    /// <summary>
+    /// Chance that the message will be appended with "ACK ACK!"
+    /// </summary>
+    [DataField]
+    public float AckChance = 0.3f; // Funnier if it doesn't happen every single time
+}
diff --git a/Content.Shared/Speech/Components/SlowAccentComponent.cs b/Content.Shared/Speech/Components/SlowAccentComponent.cs
new file mode 100644
index 0000000000..51e4186bc9
--- /dev/null
+++ b/Content.Shared/Speech/Components/SlowAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Makes... the... entity... talk... like... this...
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SlowAccentSystem))]
+public sealed partial class SlowAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/SlurredAccentComponent.cs b/Content.Shared/Speech/Components/SlurredAccentComponent.cs
index 004a62a777..daf52870c8 100644
--- a/Content.Shared/Speech/Components/SlurredAccentComponent.cs
+++ b/Content.Shared/Speech/Components/SlurredAccentComponent.cs
@@ -1,6 +1,24 @@
+using Content.Shared.Speech.EntitySystems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Speech.Components;
 
+/// <summary>
+/// Go houhhm... yo'r drrunkk...
+/// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class SlurredAccentComponent : BaseAccentComponent;
+[Access(typeof(SlurredSystem))]
+public sealed partial class SlurredAccentComponent : BaseAccentComponent
+{
+    /// <summary>
+    /// Divisor applied to total seconds used to get the odds of slurred speech occuring.
+    /// </summary>
+    [DataField]
+    public float SlurredModifier = 1100f;
+
+    /// <summary>
+    /// Minimum amount of time on the slurred accent for it to start taking effect.
+    /// </summary>
+    [DataField]
+    public float SlurredThreshold = 80f;
+}
diff --git a/Content.Shared/Speech/Components/SouthernAccentComponent.cs b/Content.Shared/Speech/Components/SouthernAccentComponent.cs
new file mode 100644
index 0000000000..89543aaa9e
--- /dev/null
+++ b/Content.Shared/Speech/Components/SouthernAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Dagnabit.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SouthernAccentSystem))]
+public sealed partial class SouthernAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/SpanishAccentComponent.cs b/Content.Shared/Speech/Components/SpanishAccentComponent.cs
new file mode 100644
index 0000000000..e8227cf942
--- /dev/null
+++ b/Content.Shared/Speech/Components/SpanishAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Mios dios!
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SpanishAccentSystem))]
+public sealed partial class SpanishAccentComponent : BaseAccentComponent;
diff --git a/Content.Shared/Speech/Components/SpeakOnActionComponent.cs b/Content.Shared/Speech/Components/SpeakOnActionComponent.cs
index 3de09932e2..8a33c858b5 100644
--- a/Content.Shared/Speech/Components/SpeakOnActionComponent.cs
+++ b/Content.Shared/Speech/Components/SpeakOnActionComponent.cs
@@ -6,7 +6,8 @@ namespace Content.Shared.Speech.Components;
 /// <summary>
 /// Action components which should write a message to ICChat on use
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedSpeakOnActionSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SpeakOnActionSystem))]
 public sealed partial class SpeakOnActionComponent : Component
 {
     /// <summary>
diff --git a/Content.Shared/Speech/Components/StutteringAccentComponent.cs b/Content.Shared/Speech/Components/StutteringAccentComponent.cs
index ff64885238..1c1dc1b95d 100644
--- a/Content.Shared/Speech/Components/StutteringAccentComponent.cs
+++ b/Content.Shared/Speech/Components/StutteringAccentComponent.cs
@@ -1,8 +1,13 @@
+using Content.Shared.Speech.EntitySystems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Speech.Components;
 
+/// <summary>
+/// S-s-s-stuttering!
+/// </summary>
 [RegisterComponent, NetworkedComponent]
+[Access(typeof(StutteringSystem))]
 public sealed partial class StutteringAccentComponent : BaseAccentComponent
 {
     /// <summary>
diff --git a/Content.Shared/Speech/Components/UnblockableSpeechComponent.cs b/Content.Shared/Speech/Components/UnblockableSpeechComponent.cs
new file mode 100644
index 0000000000..842cb18e83
--- /dev/null
+++ b/Content.Shared/Speech/Components/UnblockableSpeechComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Speech.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// Makes the entity's speech unblockable by speech-blocking effects or entities.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(UnblockableSpeechSystem))]
+public sealed partial class UnblockableSpeechComponent : Component;
diff --git a/Content.Shared/Speech/Components/VocalComponent.cs b/Content.Shared/Speech/Components/VocalComponent.cs
index f41c5e7e3d..1579887fac 100644
--- a/Content.Shared/Speech/Components/VocalComponent.cs
+++ b/Content.Shared/Speech/Components/VocalComponent.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Chat.Prototypes;
-using Content.Shared.Humanoid;
+using Content.Shared.Speech.EntitySystems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -9,8 +9,8 @@ namespace Content.Shared.Speech.Components;
 /// <summary>
 ///     Component required for entities to be able to do vocal emotions.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(VocalSystem))]
 public sealed partial class VocalComponent : Component
 {
     //TODO: Wilhelm scream logic needs to be more generic
@@ -53,5 +53,5 @@ public sealed partial class VocalComponent : Component
     /// </summary>
     [DataField]
     [AutoNetworkedField]
-    public ProtoId<EmoteSoundsPrototype>? EmoteSounds = null;
+    public ProtoId<EmoteSoundsPrototype>? EmoteSounds;
 }
diff --git a/Content.Server/Speech/Components/VoiceOverrideComponent.cs b/Content.Shared/Speech/Components/VoiceOverrideComponent.cs
similarity index 82%
rename from Content.Server/Speech/Components/VoiceOverrideComponent.cs
rename to Content.Shared/Speech/Components/VoiceOverrideComponent.cs
index 349babc948..7369c12200 100644
--- a/Content.Server/Speech/Components/VoiceOverrideComponent.cs
+++ b/Content.Shared/Speech/Components/VoiceOverrideComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.Speech;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Speech.Components;
+namespace Content.Shared.Speech.Components;
 
 /// <summary>
 ///     Will change the voice of the entity that has the component (e.g radio and speech).
@@ -10,7 +10,7 @@ namespace Content.Server.Speech.Components;
 ///     Before using this component, please take a look at the the TransformSpeakerNameEvent (and the inventory relay version).
 ///     Depending on what you're doing, it could be a better choice!
 /// </remarks>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class VoiceOverrideComponent : Component
 {
     /// <summary>
@@ -18,14 +18,14 @@ public sealed partial class VoiceOverrideComponent : Component
     ///     Uses the localized version of the string and if null wont do anything.
     /// </summary>
     [DataField]
-    public string? NameOverride = null;
+    public string? NameOverride;
 
     /// <summary>
     ///     The verb that will be used insteand of an entities default one.
     ///     If null, the defaut will be used.
     /// </summary>
     [DataField]
-    public ProtoId<SpeechVerbPrototype>? SpeechVerbOverride = null;
+    public ProtoId<SpeechVerbPrototype>? SpeechVerbOverride;
 
     /// <summary>
     ///     If true, the override values (if they are not null) will be applied.
diff --git a/Content.Server/Speech/AccentSystem.cs b/Content.Shared/Speech/EntitySystems/AccentSystem.cs
similarity index 67%
rename from Content.Server/Speech/AccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/AccentSystem.cs
index 67353e8e9b..f05765b9f9 100644
--- a/Content.Server/Speech/AccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/AccentSystem.cs
@@ -1,18 +1,13 @@
 using System.Text.RegularExpressions;
 using Content.Shared.Chat;
-using Content.Shared.Speech;
 
-namespace Content.Server.Speech;
+namespace Content.Shared.Speech.EntitySystems;
 
-public sealed class AccentSystem : EntitySystem
+public sealed partial class AccentSystem : EntitySystem
 {
     public static readonly Regex SentenceRegex = new(@"(?<=[\.!\?‽])(?![\.!\?‽])", RegexOptions.Compiled);
 
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<TransformSpeechEvent>(AccentHandler);
-    }
-
+    [SubscribeLocalEvent]
     private void AccentHandler(TransformSpeechEvent args)
     {
         if (args.Cancelled)
diff --git a/Content.Server/Speech/EntitySystems/BackwardsAccentSystem.cs b/Content.Shared/Speech/EntitySystems/BackwardsAccentSystem.cs
similarity index 70%
rename from Content.Server/Speech/EntitySystems/BackwardsAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/BackwardsAccentSystem.cs
index 838e0d53d5..2bb9941898 100644
--- a/Content.Server/Speech/EntitySystems/BackwardsAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/BackwardsAccentSystem.cs
@@ -1,7 +1,6 @@
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Speech.Components;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class BackwardsAccentSystem : RelayAccentSystem<BackwardsAccentComponent>
 {
diff --git a/Content.Shared/Speech/EntitySystems/BarkAccentSystem.cs b/Content.Shared/Speech/EntitySystems/BarkAccentSystem.cs
new file mode 100644
index 0000000000..501a3a0d3a
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/BarkAccentSystem.cs
@@ -0,0 +1,43 @@
+using System.Collections.Frozen;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public sealed partial class BarkAccentSystem : RelayAccentSystem<BarkAccentComponent>
+{
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private IRobustRandom _random = default!;
+
+    private static readonly IReadOnlyList<string> Barks =
+    [
+        " Woof!", " WOOF", " wof-wof",
+    ];
+
+    private static readonly FrozenDictionary<string, string> SpecialWords =
+        new Dictionary<string, string>
+        {
+            { "ah", "arf" },
+            { "Ah", "Arf" },
+            { "oh", "oof" },
+            { "Oh", "Oof" },
+        }.ToFrozenDictionary();
+
+    public override string Accentuate(string message, Entity<BarkAccentComponent>? ent = null)
+    {
+        var random = ent.HasValue
+            ? SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Value))
+            : _random;
+
+        foreach (var (word, repl) in SpecialWords)
+        {
+            message = message.Replace(word, repl);
+        }
+
+        return message.Replace("!", random.Pick(Barks))
+            .Replace("l", "r")
+            .Replace("L", "R");
+    }
+}
diff --git a/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs b/Content.Shared/Speech/EntitySystems/BleatingAccentSystem.cs
similarity index 79%
rename from Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/BleatingAccentSystem.cs
index 0871dd1c72..4c5605a1c0 100644
--- a/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/BleatingAccentSystem.cs
@@ -1,8 +1,7 @@
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Speech.Components;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class BleatingAccentSystem : RelayAccentSystem<BleatingAccentComponent>
 {
diff --git a/Content.Shared/Speech/EntitySystems/BlockListeningSystem.cs b/Content.Shared/Speech/EntitySystems/BlockListeningSystem.cs
new file mode 100644
index 0000000000..2ae03feafd
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/BlockListeningSystem.cs
@@ -0,0 +1,12 @@
+using Content.Shared.Speech.Components;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public sealed partial class BlockListeningSystem : EntitySystem
+{
+    [SubscribeLocalEvent]
+    private void OnListenAttempt(Entity<BlockListeningComponent> ent, ref ListenAttemptEvent args)
+    {
+        args.Cancel();
+    }
+}
diff --git a/Content.Shared/Speech/EntitySystems/EmoteBlockerSystem.cs b/Content.Shared/Speech/EntitySystems/EmoteBlockerSystem.cs
index e2c9728fbc..eaa7b8e957 100644
--- a/Content.Shared/Speech/EntitySystems/EmoteBlockerSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/EmoteBlockerSystem.cs
@@ -14,26 +14,26 @@ public sealed class EmoteBlockerSystem : EntitySystem
         SubscribeLocalEvent<EmoteBlockerComponent, InventoryRelayedEvent<BeforeEmoteEvent>>(OnRelayedEmoteEvent);
     }
 
-    private static void OnRelayedEmoteEvent(Entity<EmoteBlockerComponent> entity, ref InventoryRelayedEvent<BeforeEmoteEvent> args)
+    private static void OnRelayedEmoteEvent(Entity<EmoteBlockerComponent> ent, ref InventoryRelayedEvent<BeforeEmoteEvent> args)
     {
-        OnEmoteEvent(entity, ref args.Args);
+        OnEmoteEvent(ent, ref args.Args);
     }
 
-    private static void OnEmoteEvent(Entity<EmoteBlockerComponent> entity, ref BeforeEmoteEvent args)
+    private static void OnEmoteEvent(Entity<EmoteBlockerComponent> ent, ref BeforeEmoteEvent args)
     {
-        if (entity.Comp.BlocksEmotes.Contains(args.Emote))
+        if (ent.Comp.BlocksEmotes.Contains(args.Emote))
         {
             args.Cancel();
-            args.Blocker = entity;
+            args.Blocker = ent;
             return;
         }
 
-        foreach (var blockedCat in entity.Comp.BlocksCategories)
+        foreach (var blockedCat in ent.Comp.BlocksCategories)
         {
             if (blockedCat == args.Emote.Category)
             {
                 args.Cancel();
-                args.Blocker = entity;
+                args.Blocker = ent;
                 return;
             }
         }
diff --git a/Content.Server/Speech/EmotesMenuSystem.cs b/Content.Shared/Speech/EntitySystems/EmotesMenuSystem.cs
similarity index 83%
rename from Content.Server/Speech/EmotesMenuSystem.cs
rename to Content.Shared/Speech/EntitySystems/EmotesMenuSystem.cs
index 8a4841d82a..978c75b2d9 100644
--- a/Content.Server/Speech/EmotesMenuSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/EmotesMenuSystem.cs
@@ -1,11 +1,10 @@
 using Content.Shared.Chat;
-using Content.Server.Chat.Systems;
 
-namespace Content.Server.Speech;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class EmotesMenuSystem : EntitySystem
 {
-    [Dependency] private ChatSystem _chat = default!;
+    [Dependency] private SharedChatSystem _chat = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Shared/Speech/EntitySystems/FrenchAccentSystem.cs
similarity index 71%
rename from Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/FrenchAccentSystem.cs
index 50d5961d37..be173dff30 100644
--- a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/FrenchAccentSystem.cs
@@ -1,8 +1,7 @@
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Speech.Components;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 /// <summary>
 /// System that gives the speaker a faux-French accent.
@@ -11,7 +10,7 @@ public sealed partial class FrenchAccentSystem : RelayAccentSystem<FrenchAccentC
 {
     [Dependency] private ReplacementAccentSystem _replacement = default!;
 
-    private static readonly Regex RegexTh = new(@"th", RegexOptions.IgnoreCase);
+    private static readonly Regex RegexTh = new("th", RegexOptions.IgnoreCase);
     private static readonly Regex RegexStartH = new(@"(?<!\w)h", RegexOptions.IgnoreCase);
     private static readonly Regex RegexSpacePunctuation = new(@"(?<=\w\w)[!?;:](?!\w)", RegexOptions.IgnoreCase);
 
@@ -19,7 +18,7 @@ public sealed partial class FrenchAccentSystem : RelayAccentSystem<FrenchAccentC
     {
         var msg = message;
 
-        msg = _replacement.ApplyReplacements(msg, "french");
+        msg = _replacement.ApplyReplacements(msg, "french", ent?.Owner);
 
         // replaces h with ' at the start of words.
         msg = RegexStartH.Replace(msg, "'");
@@ -31,15 +30,18 @@ public sealed partial class FrenchAccentSystem : RelayAccentSystem<FrenchAccentC
         foreach (Match match in RegexTh.Matches(msg))
         {
             var uppercase = msg.Substring(match.Index, 2).Contains("TH");
-            var Z = uppercase ? "Z" : "z";
-            var S = uppercase ? "S" : "s";
+            var z = uppercase ? "Z" : "z";
+            var s = uppercase ? "S" : "s";
             var idxLetter = match.Index + 2;
 
             // If th is alone, just do 'z
-            if (msg.Length <= idxLetter) {
-                msg = msg.Substring(0, match.Index) + "'" + Z;
-            } else {
-                var c = "aeiouy".Contains(msg.Substring(idxLetter, 1).ToLower()) ? Z : S;
+            if (msg.Length <= idxLetter)
+            {
+                msg = msg.Substring(0, match.Index) + "'" + z;
+            }
+            else
+            {
+                var c = "aeiouy".Contains(msg.Substring(idxLetter, 1).ToLower()) ? z : s;
                 msg = msg.Substring(0, match.Index) + "'" + c + msg.Substring(idxLetter);
             }
         }
diff --git a/Content.Shared/Speech/EntitySystems/FrontalLispSystem.cs b/Content.Shared/Speech/EntitySystems/FrontalLispSystem.cs
new file mode 100644
index 0000000000..f14711341f
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/FrontalLispSystem.cs
@@ -0,0 +1,25 @@
+using System.Text.RegularExpressions;
+using Content.Shared.Speech.Components;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public sealed class FrontalLispSystem : RelayAccentSystem<FrontalLispComponent>
+{
+    // @formatter:off
+    private static readonly Regex RegexUpperTh = new("[T]+[Ss]+|[S]+[Cc]+(?=[IiEeYy]+)|[C]+(?=[IiEeYy]+)|[P][Ss]+|([S]+[Tt]+|[T]+)(?=[Ii]+[Oo]+[Uu]*[Nn]*)|[C]+[Hh]+(?=[Ii]*[Ee]*)|[Z]+|[S]+|[X]+(?=[Ee]+)");
+    private static readonly Regex RegexLowerTh = new("[t]+[s]+|[s]+[c]+(?=[iey]+)|[c]+(?=[iey]+)|[p][s]+|([s]+[t]+|[t]+)(?=[i]+[o]+[u]*[n]*)|[c]+[h]+(?=[i]*[e]*)|[z]+|[s]+|[x]+(?=[e]+)");
+    private static readonly Regex RegexUpperEcks = new("[E]+[Xx]+[Cc]*|[X]+");
+    private static readonly Regex RegexLowerEcks = new("[e]+[x]+[c]*|[x]+");
+    // @formatter:on
+
+    public override string Accentuate(string message, Entity<FrontalLispComponent>? ent = null)
+    {
+        // handles ts, sc(i|e|y), c(i|e|y), ps, st(io(u|n)), ch(i|e), z, s
+        message = RegexUpperTh.Replace(message, "TH");
+        message = RegexLowerTh.Replace(message, "th");
+        // handles ex(c), x
+        message = RegexUpperEcks.Replace(message, "EKTH");
+        message = RegexLowerEcks.Replace(message, "ekth");
+        return message;
+    }
+}
diff --git a/Content.Server/Speech/EntitySystems/GermanAccentSystem.cs b/Content.Shared/Speech/EntitySystems/GermanAccentSystem.cs
similarity index 82%
rename from Content.Server/Speech/EntitySystems/GermanAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/GermanAccentSystem.cs
index 47868dd9ff..83adebe110 100644
--- a/Content.Server/Speech/EntitySystems/GermanAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/GermanAccentSystem.cs
@@ -1,14 +1,15 @@
 using System.Text;
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class GermanAccentSystem : RelayAccentSystem<GermanAccentComponent>
 {
+    [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IRobustRandom _random = default!;
     [Dependency] private ReplacementAccentSystem _replacement = default!;
 
@@ -19,11 +20,15 @@ public sealed partial class GermanAccentSystem : RelayAccentSystem<GermanAccentC
     {
         var msg = message;
 
+        var random = ent.HasValue
+            ? SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Value))
+            : _random;
+
         // rarely, "the" should become "das" instead of "ze"
         // TODO: The ReplacementAccentSystem should have random replacements this built-in.
         foreach (Match match in RegexThe.Matches(msg))
         {
-            if (_random.Prob(0.3f))
+            if (random.Prob(0.3f))
             {
                 // just shift T, H and E over to D, A and S to preserve capitalization
                 msg = msg.Substring(0, match.Index) +
@@ -35,7 +40,7 @@ public sealed partial class GermanAccentSystem : RelayAccentSystem<GermanAccentC
         }
 
         // now, apply word replacements
-        msg = _replacement.ApplyReplacements(msg, "german");
+        msg = _replacement.ApplyReplacements(msg, "german", ent?.Owner);
 
         // replace th with zh (for zhis, zhat, etc. the => ze is handled by replacements already)
         var msgBuilder = new StringBuilder(msg);
@@ -51,7 +56,7 @@ public sealed partial class GermanAccentSystem : RelayAccentSystem<GermanAccentC
         {
             if (umlautCooldown == 0)
             {
-                if (_random.Prob(0.1f)) // 10% of all eligible vowels become umlauts)
+                if (random.Prob(0.1f)) // 10% of all eligible vowels become umlauts)
                 {
                     msgBuilder[i] = msgBuilder[i] switch
                     {
diff --git a/Content.Server/Speech/EntitySystems/ListeningSystem.cs b/Content.Shared/Speech/EntitySystems/ListeningSystem.cs
similarity index 80%
rename from Content.Server/Speech/EntitySystems/ListeningSystem.cs
rename to Content.Shared/Speech/EntitySystems/ListeningSystem.cs
index d05e4fb2eb..23ea4340b1 100644
--- a/Content.Server/Speech/EntitySystems/ListeningSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/ListeningSystem.cs
@@ -1,28 +1,24 @@
-using Content.Server.Chat.Systems;
 using Content.Shared.Chat;
-using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 /// <summary>
-///     This system redirects local chat messages to listening entities (e.g., radio microphones).
+/// This system redirects local chat messages to listening entities (e.g., radio microphones).
 /// </summary>
 public sealed partial class ListeningSystem : EntitySystem
 {
     [Dependency] private SharedTransformSystem _xforms = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<EntitySpokeEvent>(OnSpeak);
-    }
-
+    [SubscribeLocalEvent]
     private void OnSpeak(EntitySpokeEvent ev)
     {
         PingListeners(ev.Source, ev.Message, ev.ObfuscatedMessage);
     }
 
+    /// <summary>
+    /// Sends a speech message to entities listening within range.
+    /// </summary>
     public void PingListeners(EntityUid source, string message, string? obfuscatedMessage)
     {
         // TODO whispering / audio volume? Microphone sensitivity?
@@ -54,7 +50,7 @@ public sealed partial class ListeningSystem : EntitySystem
                 continue;
             }
 
-            if (obfuscatedEv != null && distance > ChatSystem.WhisperClearRange)
+            if (obfuscatedEv != null && distance > SharedChatSystem.WhisperClearRange)
                 RaiseLocalEvent(listenerUid, obfuscatedEv);
             else
                 RaiseLocalEvent(listenerUid, ev);
diff --git a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs b/Content.Shared/Speech/EntitySystems/LizardAccentSystem.cs
similarity index 97%
rename from Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/LizardAccentSystem.cs
index 963f99ce4e..825a9bb1d9 100644
--- a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/LizardAccentSystem.cs
@@ -1,9 +1,9 @@
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
+using Content.Shared.Speech.Components;
 using Content.Shared.Speech.EntitySystems;
 using Robust.Shared.Random;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class LizardAccentSystem : RelayAccentSystem<LizardAccentComponent>
 {
diff --git a/Content.Shared/Speech/EntitySystems/MeleeSpeechSystem.cs b/Content.Shared/Speech/EntitySystems/MeleeSpeechSystem.cs
new file mode 100644
index 0000000000..7e25d0c5cb
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/MeleeSpeechSystem.cs
@@ -0,0 +1,85 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Actions;
+using Content.Shared.Database;
+using Content.Shared.Speech.Components;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public sealed partial class MeleeSpeechSystem : EntitySystem
+{
+    [Dependency] private ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private SharedActionsSystem _action = default!;
+    [Dependency] private SharedUserInterfaceSystem _ui = default!;
+
+    [SubscribeLocalEvent]
+    private void OnComponentMapInit(Entity<MeleeSpeechComponent> ent, ref MapInitEvent args)
+    {
+        _action.AddAction(ent, ref ent.Comp.ConfigureActionEntity, ent.Comp.ConfigureAction, ent);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnGetActions(Entity<MeleeSpeechComponent> ent, ref GetItemActionsEvent args)
+    {
+        args.AddAction(ref ent.Comp.ConfigureActionEntity, ent.Comp.ConfigureAction);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnBattlecryChanged(Entity<MeleeSpeechComponent> ent, ref MeleeSpeechBattlecryChangedMessage args)
+    {
+        var battlecry = args.Battlecry;
+        if (battlecry.Length > ent.Comp.MaxBattlecryLength)
+            battlecry = battlecry[..ent.Comp.MaxBattlecryLength];
+
+        TryChangeBattlecry(ent.AsNullable(), battlecry);
+    }
+
+    /// <summary>
+    /// Attempts to open the Battlecry UI.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnConfigureAction(Entity<MeleeSpeechComponent> ent, ref MeleeSpeechConfigureActionEvent args)
+    {
+        TryOpenUi(args.Performer, ent.AsNullable());
+    }
+
+    /// <summary>
+    /// Attempts to open the Battlecry UI for a user.
+    /// </summary>
+    public void TryOpenUi(EntityUid user, Entity<MeleeSpeechComponent?> source)
+    {
+        if (!Resolve(source, ref source.Comp))
+            return;
+
+        if (!TryComp<ActorComponent>(user, out var actor))
+            return;
+
+        _ui.TryToggleUi(source.Owner, MeleeSpeechUiKey.Key, actor.PlayerSession);
+    }
+
+    /// <summary>
+    /// Attempts to change the battlecry of an entity.
+    /// Returns true/false.
+    /// </summary>
+    /// <remarks>
+    /// Logs changes to an entity's battlecry
+    /// </remarks>
+    public bool TryChangeBattlecry(Entity<MeleeSpeechComponent?> ent, string? battlecry)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        battlecry = !string.IsNullOrWhiteSpace(battlecry) ? battlecry.Trim() : null;
+
+        if (ent.Comp.Battlecry == battlecry)
+            return true;
+
+        ent.Comp.Battlecry = battlecry;
+        Dirty(ent);
+        _adminLogger.Add(LogType.ItemConfigure,
+            LogImpact.Medium,
+            $" {ToPrettyString(ent):entity}'s battlecry has been changed to {battlecry}");
+
+        return true;
+    }
+}
diff --git a/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs b/Content.Shared/Speech/EntitySystems/MobsterAccentSystem.cs
similarity index 83%
rename from Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/MobsterAccentSystem.cs
index 48d0ff88df..6b94012fe9 100644
--- a/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/MobsterAccentSystem.cs
@@ -1,10 +1,11 @@
 using System.Linq;
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class MobsterAccentSystem : RelayAccentSystem<MobsterAccentComponent>
 {
@@ -16,6 +17,8 @@ public sealed partial class MobsterAccentSystem : RelayAccentSystem<MobsterAccen
     private static readonly Regex RegexFirstWord = new(@"^(\S+)");
     private static readonly Regex RegexLastWord = new(@"(\S+)$");
     private static readonly Regex RegexLastPunctuation = new(@"([.!?]+$)(?!.*[.!?])|(?<![.!?])$");
+
+    [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IRobustRandom _random = default!;
     [Dependency] private ReplacementAccentSystem _replacement = default!;
 
@@ -25,8 +28,12 @@ public sealed partial class MobsterAccentSystem : RelayAccentSystem<MobsterAccen
         // Do text manipulations first
         // Then prefix/suffix funnyies
 
+        var random = ent.HasValue
+            ? SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Value))
+            : _random;
+
         // direct word replacements
-        var msg = _replacement.ApplyReplacements(message, "mobster");
+        var msg = _replacement.ApplyReplacements(message, "mobster", ent?.Owner);
 
         // thinking -> thinkin'
         // king -> king
@@ -40,12 +47,12 @@ public sealed partial class MobsterAccentSystem : RelayAccentSystem<MobsterAccen
         msg = RegexUpperAr.Replace(msg, "AH");
 
         // Prefix
-        if (_random.Prob(0.15f))
+        if (random.Prob(0.15f))
         {
             //Checks if the first word of the sentence is all caps
             //So the prefix can be allcapped and to not resanitize the captial
             var firstWordAllCaps = !RegexFirstWord.Match(msg).Value.Any(char.IsLower);
-            var pick = _random.Next(1, 2);
+            var pick = random.Next(1, 2);
 
             // Reverse sanitize capital
             var prefix = Loc.GetString($"accent-mobster-prefix-{pick}");
@@ -60,22 +67,23 @@ public sealed partial class MobsterAccentSystem : RelayAccentSystem<MobsterAccen
         msg = msg[0].ToString().ToUpper() + msg.Remove(0, 1);
 
         // Suffixes
-        if (_random.Prob(0.4f))
+        if (random.Prob(0.4f))
         {
             //Checks if the last word of the sentence is all caps
             //So the suffix can be allcapped
             var lastWordAllCaps = !RegexLastWord.Match(msg).Value.Any(char.IsLower);
-            var suffix = "";
+            string suffix;
             if (ent.HasValue && ent.Value.Comp.IsBoss)
             {
-                var pick = _random.Next(1, 4);
+                var pick = random.Next(1, 4);
                 suffix = Loc.GetString($"accent-mobster-suffix-boss-{pick}");
             }
             else
             {
-                var pick = _random.Next(1, 3);
+                var pick = random.Next(1, 3);
                 suffix = Loc.GetString($"accent-mobster-suffix-minion-{pick}");
             }
+
             if (lastWordAllCaps)
                 suffix = suffix.ToUpper();
             msg = RegexLastPunctuation.Replace(msg, suffix);
diff --git a/Content.Server/Speech/EntitySystems/MonkeyAccentSystem.cs b/Content.Shared/Speech/EntitySystems/MonkeyAccentSystem.cs
similarity index 74%
rename from Content.Server/Speech/EntitySystems/MonkeyAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/MonkeyAccentSystem.cs
index 3ce489a98a..1deeee8d94 100644
--- a/Content.Server/Speech/EntitySystems/MonkeyAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/MonkeyAccentSystem.cs
@@ -1,16 +1,22 @@
 using System.Text;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class MonkeyAccentSystem : RelayAccentSystem<MonkeyAccentComponent>
 {
+    [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IRobustRandom _random = default!;
 
     public override string Accentuate(string message, Entity<MonkeyAccentComponent>? ent = null)
     {
+        var random = ent.HasValue
+            ? SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Value))
+            : _random;
+
         var words = message.Split();
         var accentedMessage = new StringBuilder(message.Length + 2);
 
@@ -18,7 +24,7 @@ public sealed partial class MonkeyAccentSystem : RelayAccentSystem<MonkeyAccentC
         {
             var word = words[i];
 
-            if (_random.NextDouble() >= 0.5)
+            if (random.NextDouble() >= 0.5)
             {
                 if (word.Length > 1)
                 {
@@ -27,7 +33,7 @@ public sealed partial class MonkeyAccentSystem : RelayAccentSystem<MonkeyAccentC
                         accentedMessage.Append('У');  // Corvax-Localization
                     }
 
-                    if (_random.NextDouble() >= 0.3)
+                    if (random.NextDouble() >= 0.3)
                         accentedMessage.Append('К');  // Corvax-Localization
                 }
                 else
@@ -37,7 +43,7 @@ public sealed partial class MonkeyAccentSystem : RelayAccentSystem<MonkeyAccentC
             {
                 foreach (var __ in word)
                 {
-                    if (_random.NextDouble() >= 0.8)
+                    if (random.NextDouble() >= 0.8)
                         accentedMessage.Append('Г');  // Corvax-Localization
                     else
                         accentedMessage.Append('А');  // Corvax-Localization
diff --git a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs b/Content.Shared/Speech/EntitySystems/MothAccentSystem.cs
similarity index 88%
rename from Content.Server/Speech/EntitySystems/MothAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/MothAccentSystem.cs
index b94d4467ae..476dfc0ef1 100644
--- a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/MothAccentSystem.cs
@@ -1,16 +1,16 @@
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
+using Content.Shared.Speech.Components;
 using Content.Shared.Speech.EntitySystems;
 using Robust.Shared.Random;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class MothAccentSystem : RelayAccentSystem<MothAccentComponent>
 {
     [Dependency] private IRobustRandom _random = default!; // Corvax-Localization
 
-    private static readonly Regex RegexLowerBuzz = new Regex("z{1,3}");
-    private static readonly Regex RegexUpperBuzz = new Regex("Z{1,3}");
+    private static readonly Regex RegexLowerBuzz = new("z{1,3}");
+    private static readonly Regex RegexUpperBuzz = new("Z{1,3}");
 
     // Corvax-Localization-Start
     private static readonly Regex _regexLowerZh = new Regex("ж+");
diff --git a/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs b/Content.Shared/Speech/EntitySystems/MumbleAccentSystem.cs
similarity index 79%
rename from Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/MumbleAccentSystem.cs
index 7cf1ce3320..f5fd2dceb8 100644
--- a/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/MumbleAccentSystem.cs
@@ -1,16 +1,12 @@
-using Content.Server.Chat.Systems;
-using Content.Server.Speech.Components;
+using Content.Shared.Speech.Components;
 using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
-using Content.Shared.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
-using Robust.Shared.Prototypes;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class MumbleAccentSystem : RelayAccentSystem<MumbleAccentComponent>
 {
-    [Dependency] private ChatSystem _chat = default!;
+    [Dependency] private SharedChatSystem _chat = default!;
     [Dependency] private ReplacementAccentSystem _replacement = default!;
 
     public override void Initialize()
@@ -39,6 +35,6 @@ public sealed partial class MumbleAccentSystem : RelayAccentSystem<MumbleAccentC
 
     public override string Accentuate(string message, Entity<MumbleAccentComponent>? ent = null)
     {
-        return _replacement.ApplyReplacements(message, "mumble");
+        return _replacement.ApplyReplacements(message, "mumble", ent?.Owner);
     }
 }
diff --git a/Content.Shared/Speech/EntitySystems/OwOAccentSystem.cs b/Content.Shared/Speech/EntitySystems/OwOAccentSystem.cs
new file mode 100644
index 0000000000..73dcd80cb0
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/OwOAccentSystem.cs
@@ -0,0 +1,42 @@
+using System.Collections.Frozen;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public sealed partial class OwOAccentSystem : RelayAccentSystem<OwOAccentComponent>
+{
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private IRobustRandom _random = default!;
+
+    private static readonly IReadOnlyList<string> Faces =
+    [
+        " (•`ω´•)", " ;;w;;", " owo", " UwU", " >w<", " ^w^",
+    ];
+
+    private static readonly FrozenDictionary<string, string> SpecialWords =
+        new Dictionary<string, string>
+        {
+            { "you", "wu" },
+        }.ToFrozenDictionary();
+
+    public override string Accentuate(string message, Entity<OwOAccentComponent>? ent = null)
+    {
+        var random = ent.HasValue
+            ? SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Value))
+            : _random;
+
+        foreach (var (word, repl) in SpecialWords)
+        {
+            message = message.Replace(word, repl);
+        }
+
+        return message.Replace("!", random.Pick(Faces))
+            .Replace("r", "w")
+            .Replace("R", "W")
+            .Replace("l", "w")
+            .Replace("L", "W");
+    }
+}
diff --git a/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs b/Content.Shared/Speech/EntitySystems/ParrotAccentSystem.cs
similarity index 62%
rename from Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/ParrotAccentSystem.cs
index fffe1875cf..4d5eb3edbe 100644
--- a/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/ParrotAccentSystem.cs
@@ -1,25 +1,27 @@
 using System.Linq;
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class ParrotAccentSystem : RelayAccentSystem<ParrotAccentComponent>
 {
-    private static readonly Regex WordCleanupRegex = new Regex("[^A-Za-z0-9 -]");
+    private static readonly Regex WordCleanupRegex = new("[^A-Za-z0-9 -]");
 
-    [Dependency] private IRobustRandom _random = default!;
+    [Dependency] private IGameTiming _timing = default!;
 
     public override string Accentuate(string message, Entity<ParrotAccentComponent>? ent = null)
     {
-        // TODO: Make this accent possible to apply without an entity with the component.
         if (ent == null)
             return message;
 
+        var random = SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Value));
+
         // Sometimes repeat the longest word at the end of the message, after a squawk! SQUAWK! Sometimes!
-        if (_random.Prob(ent.Value.Comp.LongestWordRepeatChance))
+        if (random.Prob(ent.Value.Comp.LongestWordRepeatChance))
         {
             // Don't count non-alphanumeric characters as parts of words
             var cleaned = WordCleanupRegex.Replace(message, string.Empty);
@@ -27,6 +29,7 @@ public sealed partial class ParrotAccentSystem : RelayAccentSystem<ParrotAccentC
             var words = cleaned.Split(null).Reverse();
             // Find longest word
             var longest = words.MaxBy(word => word.Length);
+
             if (longest?.Length >= ent.Value.Comp.LongestWordMinLength)
             {
                 message = EnsurePunctuation(message);
@@ -34,21 +37,21 @@ public sealed partial class ParrotAccentSystem : RelayAccentSystem<ParrotAccentC
                 // Capitalize the first letter of the repeated word
                 longest = string.Concat(longest[0].ToString().ToUpper(), longest.AsSpan(1));
 
-                message = string.Format("{0} {1} {2}!", message, GetRandomSquawk(ent.Value), longest);
+                message = $"{message} {GetRandomSquawk(ent.Value)} {longest}!";
                 return message; // No more changes, or it's too much
             }
         }
 
-        if (_random.Prob(ent.Value.Comp.SquawkPrefixChance))
+        if (random.Prob(ent.Value.Comp.SquawkPrefixChance))
         {
-            // AWWK! Sometimes add a squawk at the begining of the message
-            message = string.Format("{0} {1}", GetRandomSquawk(ent.Value), message);
+            // AWWK! Sometimes add a squawk at the beginning of the message
+            message = $"{GetRandomSquawk(ent.Value)} {message}";
         }
         else
         {
             // Otherwise add a squawk at the end of the message! RAWWK!
             message = EnsurePunctuation(message);
-            message = string.Format("{0} {1}", message, GetRandomSquawk(ent.Value));
+            message = $"{message} {GetRandomSquawk(ent.Value)}";
         }
 
         return message;
@@ -59,16 +62,17 @@ public sealed partial class ParrotAccentSystem : RelayAccentSystem<ParrotAccentC
     /// </summary>
     private string EnsurePunctuation(string message)
     {
-        if (!message.EndsWith('!') && !message.EndsWith('?') && !message.EndsWith('.'))
-            return message + '!';
-        return message;
+        return message.EndsWith('!') || message.EndsWith('?') || message.EndsWith('.')
+            ? message
+            : message + '!';
     }
 
     /// <summary>
     /// Returns a random, localized squawk sound.
     /// </summary>
-    private string GetRandomSquawk(Entity<ParrotAccentComponent> entity)
+    private string GetRandomSquawk(Entity<ParrotAccentComponent> ent)
     {
-        return Loc.GetString(_random.Pick(entity.Comp.Squawks));
+        var random = SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent));
+        return Loc.GetString(random.Pick(ent.Comp.Squawks));
     }
 }
diff --git a/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs b/Content.Shared/Speech/EntitySystems/PirateAccentSystem.cs
similarity index 60%
rename from Content.Server/Speech/EntitySystems/PirateAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/PirateAccentSystem.cs
index aa7ed96529..88de28e174 100644
--- a/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/PirateAccentSystem.cs
@@ -1,32 +1,39 @@
 using System.Linq;
-using Content.Server.Speech.Components;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 using System.Text.RegularExpressions;
-using Content.Shared.Speech.EntitySystems;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class PirateAccentSystem : RelayAccentSystem<PirateAccentComponent>
 {
     private static readonly Regex FirstWordAllCapsRegex = new(@"^(\S+)");
 
+    [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IRobustRandom _random = default!;
     [Dependency] private ReplacementAccentSystem _replacement = default!;
 
-    // converts left word when typed into the right word. For example typing you becomes ye.
+    // Converts left word when typed into the right word. For example typing you becomes ye.
     public override string Accentuate(string message, Entity<PirateAccentComponent>? ent = null)
     {
-        var msg = _replacement.ApplyReplacements(message, "pirate");
+        var random = ent.HasValue
+            ? SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Value))
+            : _random;
 
-        if (!_random.Prob(ent.HasValue ? ent.Value.Comp.YarrChance : 0.5f))
+        var msg = _replacement.ApplyReplacements(message, "pirate", ent?.Owner);
+
+        if (!random.Prob(ent.HasValue ? ent.Value.Comp.YarrChance : 0.5f))
             return msg;
-        //Checks if the first word of the sentence is all caps
-        //So the prefix can be allcapped and to not resanitize the captial
+
+        // Checks if the first word of the sentence is all caps
+        // So the prefix can be allcapped and to not resanitize the captial
         var firstWordAllCaps = !FirstWordAllCapsRegex.Match(msg).Value.Any(char.IsLower);
 
         if (ent.HasValue)
         {
-            var pick = _random.Pick(ent.Value.Comp.PirateWords);
+            var pick = random.Pick(ent.Value.Comp.PirateWords);
             var pirateWord = Loc.GetString(pick);
             // Reverse sanitize capital
             if (!firstWordAllCaps)
diff --git a/Content.Shared/Speech/EntitySystems/SharedRatvarianLanguageSystem.cs b/Content.Shared/Speech/EntitySystems/RatvarianLanguageSystem.cs
similarity index 87%
rename from Content.Shared/Speech/EntitySystems/SharedRatvarianLanguageSystem.cs
rename to Content.Shared/Speech/EntitySystems/RatvarianLanguageSystem.cs
index 969af67990..73447ff5f1 100644
--- a/Content.Shared/Speech/EntitySystems/SharedRatvarianLanguageSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/RatvarianLanguageSystem.cs
@@ -7,14 +7,14 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Speech.EntitySystems;
 
-public abstract partial class SharedRatvarianLanguageSystem : RelayAccentSystem<RatvarianLanguageComponent>
+public sealed partial class RatvarianLanguageSystem : RelayAccentSystem<RatvarianLanguageComponent>
 {
     public static readonly EntProtoId Ratvarian = "StatusEffectRatvarianLanguage";
 
-    [Dependency] protected StatusEffectsSystem Status = default!;
+    [Dependency] private StatusEffectsSystem _statusEffect = default!;
 
-    protected override Type[] AccentBefore => [typeof(SharedSlurredSystem), typeof(SharedStutteringSystem)];
-    protected override Type[] RelayAccentBefore => [typeof(SharedSlurredSystem), typeof(SharedStutteringSystem)];
+    protected override Type[] AccentBefore => [typeof(SlurredSystem), typeof(StutteringSystem)];
+    protected override Type[] RelayAccentBefore => [typeof(SlurredSystem), typeof(StutteringSystem)];
 
     // This is the word of Ratvar and those who speak it shall abide by His rules:
     /*
@@ -40,14 +40,6 @@ public abstract partial class SharedRatvarianLanguageSystem : RelayAccentSystem<
     private static readonly Regex TomyPattern = new(@"(to|my)\s", RegexOptions.Compiled | RegexOptions.IgnoreCase);
     private static readonly Regex ProperNouns = new("(ratvar)|(nezbere)|(sevtuq)|(nzcrentr)|(inath-neq)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-    /// <summary>
-    /// Applies or refreshes the Ratvarian speech status effect on an entity.
-    /// </summary>
-    [PublicAPI]
-    public virtual void DoRatvarian(EntityUid uid, TimeSpan time, bool refresh)
-    {
-    }
-
     public override string Accentuate(string message, Entity<RatvarianLanguageComponent>? ent = null)
     {
         var ruleTranslation = message;
@@ -105,4 +97,16 @@ public abstract partial class SharedRatvarianLanguageSystem : RelayAccentSystem<
 
         return finalMessage.ToString().Trim();
     }
+
+    /// <summary>
+    /// Applies or refreshes the Ratvarian speech status effect on an entity.
+    /// </summary>
+    [PublicAPI]
+    public void DoRatvarian(EntityUid uid, TimeSpan time, bool refresh)
+    {
+        if (refresh)
+            _statusEffect.TryUpdateStatusEffectDuration(uid, Ratvarian, time);
+        else
+            _statusEffect.TryAddStatusEffectDuration(uid, Ratvarian, time);
+    }
 }
diff --git a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Shared/Speech/EntitySystems/ReplacementAccentSystem.cs
similarity index 77%
rename from Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/ReplacementAccentSystem.cs
index e40af39fa1..854e37b958 100644
--- a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/ReplacementAccentSystem.cs
@@ -1,14 +1,14 @@
 using System.Linq;
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
-using Content.Server.Speech.Prototypes;
-using Content.Shared.Speech;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
+using Content.Shared.Speech.Prototypes;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 // TODO: Code in-game languages and make this a language
 /// <summary>
@@ -16,6 +16,7 @@ namespace Content.Server.Speech.EntitySystems;
 /// </summary>
 public sealed partial class ReplacementAccentSystem : RelayAccentSystem<ReplacementAccentComponent>
 {
+    [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IRobustRandom _random = default!;
 
     private readonly Dictionary<ProtoId<ReplacementAccentPrototype>, (Regex regex, string replacement)[]>
@@ -40,26 +41,40 @@ public sealed partial class ReplacementAccentSystem : RelayAccentSystem<Replacem
         if (ent == null)
             return message;
 
-        return ApplyReplacements(message, ent.Value.Comp.Accent);
+        return ApplyReplacements(message, ent.Value.Comp.Accent, ent.Value.Owner);
     }
 
     /// <summary>
-    ///     Attempts to apply a given replacement accent prototype to a message.
+    /// Applies a replacement accent to an entity.
     /// </summary>
     [PublicAPI]
-    public string ApplyReplacements(string message, string accent)
+    public void ApplyAccent(EntityUid uid, string accent)
+    {
+        var component = EnsureComp<ReplacementAccentComponent>(uid);
+        component.Accent = accent;
+        Dirty(uid, component);
+    }
+
+    /// <summary>
+    /// Attempts to apply a given replacement accent prototype to a message.
+    /// </summary>
+    [PublicAPI]
+    public string ApplyReplacements(string message, string accent, EntityUid? uid = null)
     {
         if (!ProtoMan.TryIndex<ReplacementAccentPrototype>(accent, out var prototype))
             return message;
 
-        if (!_random.Prob(prototype.ReplacementChance))
+        var random = uid != null
+            ? SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(uid.Value))
+            : _random;
+        if (!random.Prob(prototype.ReplacementChance))
             return message;
 
         // Prioritize fully replacing if that exists--
         // ideally both aren't used at the same time (but we don't have a way to enforce that in serialization yet)
         if (prototype.FullReplacements != null)
         {
-            return prototype.FullReplacements.Length != 0 ? Loc.GetString(_random.Pick(prototype.FullReplacements)) : "";
+            return prototype.FullReplacements.Length != 0 ? Loc.GetString(random.Pick(prototype.FullReplacements)) : "";
         }
 
         // Prohibition of repeated word replacements.
@@ -73,10 +88,10 @@ public sealed partial class ReplacementAccentSystem : RelayAccentSystem<Replacem
             // this is kind of slow but its not that bad
             // essentially: go over all matches, try to match capitalization where possible, then replace
             // rather than using regex.replace
-            for (int i = regex.Count(maskMessage); i > 0; i--)
+            for (var i = regex.Count(maskMessage); i > 0; i--)
             {
                 // fetch the match again as the character indices may have changed
-                Match match = regex.Match(maskMessage);
+                var match = regex.Match(maskMessage);
                 var replacement = replace;
 
                 // Intelligently replace capitalization
@@ -109,11 +124,11 @@ public sealed partial class ReplacementAccentSystem : RelayAccentSystem<Replacem
 
     private (Regex regex, string replacement)[] GetCachedReplacements(ReplacementAccentPrototype prototype)
     {
-        if (!_cachedReplacements.TryGetValue(prototype.ID, out var replacements))
-        {
-            replacements = GenerateCachedReplacements(prototype);
-            _cachedReplacements.Add(prototype.ID, replacements);
-        }
+        if (_cachedReplacements.TryGetValue(prototype.ID, out var replacements))
+            return replacements;
+
+        replacements = GenerateCachedReplacements(prototype);
+        _cachedReplacements.Add(prototype.ID, replacements);
         return replacements;
     }
 
@@ -122,7 +137,9 @@ public sealed partial class ReplacementAccentSystem : RelayAccentSystem<Replacem
         if (prototype.WordReplacements is not { } replacements)
             return [];
 
-        return replacements.Select(kv =>
+        return
+        [
+            .. replacements.Select(kv =>
             {
                 var (first, replace) = kv;
                 var firstLoc = Loc.GetString(first);
@@ -132,8 +149,8 @@ public sealed partial class ReplacementAccentSystem : RelayAccentSystem<Replacem
 
                 return (regex, replaceLoc);
 
-            })
-            .ToArray();
+            }),
+        ];
     }
 
     private void OnPrototypesReloaded(PrototypesReloadedEventArgs obj)
@@ -141,4 +158,3 @@ public sealed partial class ReplacementAccentSystem : RelayAccentSystem<Replacem
         _cachedReplacements.Clear();
     }
 }
-
diff --git a/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs b/Content.Shared/Speech/EntitySystems/RussianAccentSystem.cs
similarity index 84%
rename from Content.Server/Speech/EntitySystems/RussianAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/RussianAccentSystem.cs
index b58dc9bb45..3d6686f1ad 100644
--- a/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/RussianAccentSystem.cs
@@ -1,9 +1,7 @@
 using System.Text;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Speech.Components;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class RussianAccentSystem : RelayAccentSystem<RussianAccentComponent>
 {
@@ -11,7 +9,7 @@ public sealed partial class RussianAccentSystem : RelayAccentSystem<RussianAccen
 
     public override string Accentuate(string message, Entity<RussianAccentComponent>? ent = null)
     {
-        var accentedMessage = new StringBuilder(_replacement.ApplyReplacements(message, "russian"));
+        var accentedMessage = new StringBuilder(_replacement.ApplyReplacements(message, "russian", ent?.Owner));
 
         for (var i = 0; i < accentedMessage.Length; i++)
         {
diff --git a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs b/Content.Shared/Speech/EntitySystems/ScrambledAccentSystem.cs
similarity index 67%
rename from Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/ScrambledAccentSystem.cs
index 459f15bdbf..654024a29b 100644
--- a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/ScrambledAccentSystem.cs
@@ -1,30 +1,36 @@
 using System.Linq;
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class ScrambledAccentSystem : RelayAccentSystem<ScrambledAccentComponent>
 {
     private static readonly Regex RegexLoneI = new(@"(?<=\ )i(?=[\ \.\?]|$)");
 
+    [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IRobustRandom _random = default!;
 
     public override string Accentuate(string message, Entity<ScrambledAccentComponent>? ent = null)
     {
+        var random = ent.HasValue
+            ? SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Value))
+            : _random;
+
         var words = message.ToLower().Split();
 
         if (words.Length < 2)
         {
-            var pick = _random.Next(1, 8);
+            var pick = random.Next(1, 8);
             // If they try to weasel out of it by saying one word at a time we give them this.
             return Loc.GetString($"accent-scrambled-words-{pick}");
         }
 
         // Scramble the words
-        var scrambled = words.OrderBy(x => _random.Next()).ToArray();
+        var scrambled = words.OrderBy(_ => random.Next()).ToArray();
 
         var msg = string.Join(" ", scrambled);
 
diff --git a/Content.Shared/Speech/EntitySystems/SharedDamagedSiliconAccentSystem.cs b/Content.Shared/Speech/EntitySystems/SharedDamagedSiliconAccentSystem.cs
new file mode 100644
index 0000000000..8369ad1425
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/SharedDamagedSiliconAccentSystem.cs
@@ -0,0 +1,122 @@
+using System.Text;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Systems;
+using Content.Shared.FixedPoint;
+using Content.Shared.Power.EntitySystems;
+using Content.Shared.PowerCell;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public abstract partial class SharedDamagedSiliconAccentSystem : RelayAccentSystem<DamagedSiliconAccentComponent>
+{
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private SharedBatterySystem _battery = default!;
+    [Dependency] private PowerCellSystem _powerCell = default!;
+    [Dependency] private DamageableSystem _damageable = default!;
+
+    protected override Type[] AccentAfter => [typeof(ReplacementAccentSystem)];
+    protected override Type[] RelayAccentAfter => [typeof(ReplacementAccentSystem)];
+
+    public override string Accentuate(string message, Entity<DamagedSiliconAccentComponent>? ent = null)
+    {
+        if (ent == null)
+            return message;
+
+        var uid = ent.Value.Owner;
+        if (ent.Value.Comp.EnableChargeCorruption)
+        {
+            var currentChargeLevel = 0.0f;
+            if (ent.Value.Comp.OverrideChargeLevel.HasValue)
+            {
+                currentChargeLevel = ent.Value.Comp.OverrideChargeLevel.Value;
+            }
+            else if (_powerCell.TryGetBatteryFromSlot(uid, out var battery))
+            {
+                currentChargeLevel = _battery.GetChargeLevel(battery.Value.AsNullable());
+            }
+            currentChargeLevel = Math.Clamp(currentChargeLevel, 0.0f, 1.0f);
+            // Corrupt due to low power (drops characters on longer messages)
+            message = CorruptPower(message, currentChargeLevel, ent.Value);
+        }
+
+        if (ent.Value.Comp.EnableDamageCorruption)
+        {
+            var damage = FixedPoint2.Zero;
+            if (ent.Value.Comp.OverrideTotalDamage.HasValue)
+            {
+                damage = ent.Value.Comp.OverrideTotalDamage.Value;
+            }
+            else if (TryComp<DamageableComponent>(uid, out var damageable))
+            {
+                damage = _damageable.GetTotalDamage((uid, damageable));
+            }
+            // Corrupt due to damage (drop, repeat, replace with symbols)
+            message = CorruptDamage(message, damage, ent.Value);
+        }
+
+        return message;
+    }
+
+    protected virtual string CorruptDamage(string message, FixedPoint2 totalDamage, Entity<DamagedSiliconAccentComponent> ent)
+    {
+        return message;
+    }
+
+    /// <summary>
+    /// Corrupts a message based on the entity's charge level.
+    /// </summary>
+    public string CorruptPower(string message, float chargeLevel, Entity<DamagedSiliconAccentComponent> ent)
+    {
+        // The first idxMin characters are SAFE
+        var idxMin = ent.Comp.StartPowerCorruptionAtCharIdx;
+        // Probability will max at idxMax
+        var idxMax = ent.Comp.MaxPowerCorruptionAtCharIdx;
+
+        // Fast bails, would not have an effect
+        if (chargeLevel > ent.Comp.ChargeThresholdForPowerCorruption || message.Length < idxMin)
+        {
+            return message;
+        }
+
+        var outMsg = new StringBuilder();
+
+        var maxDropProb = ent.Comp.MaxDropProbFromPower * (1.0f - chargeLevel / ent.Comp.ChargeThresholdForPowerCorruption);
+
+        var idx = -1;
+        foreach (var letter in message)
+        {
+            idx++;
+            if (idx < idxMin) // Fast character, no effect
+            {
+                outMsg.Append(letter);
+                continue;
+            }
+
+            // use an x^2 interpolation to increase the drop probability until we hit idxMax
+            var probToDrop = idx >= idxMax
+                ? maxDropProb
+                : (float)Math.Pow(((double)idx - idxMin) / (idxMax - idxMin), 2.0) * maxDropProb;
+            // Ensure we're in the range for Prob()
+            probToDrop = Math.Clamp(probToDrop, 0.0f, 1.0f);
+
+            var random = SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent));
+            if (random.Prob(probToDrop)) // Lose a character
+            {
+                // Additional chance to change to dot for flavor instead of full drop
+                if (random.Prob(ent.Comp.ProbToCorruptDotFromPower))
+                {
+                    outMsg.Append('.');
+                }
+            }
+            else // Character is safe
+            {
+                outMsg.Append(letter);
+            }
+        }
+        return outMsg.ToString();
+    }
+}
diff --git a/Content.Shared/Speech/EntitySystems/SharedMeleeSpeechSystem.cs b/Content.Shared/Speech/EntitySystems/SharedMeleeSpeechSystem.cs
deleted file mode 100644
index 21841ef0ac..0000000000
--- a/Content.Shared/Speech/EntitySystems/SharedMeleeSpeechSystem.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Speech.EntitySystems;
-
-public abstract class SharedMeleeSpeechSystem : EntitySystem
-{
-}
diff --git a/Content.Shared/Speech/EntitySystems/SharedSlurredSystem.cs b/Content.Shared/Speech/EntitySystems/SharedSlurredSystem.cs
deleted file mode 100644
index b53a7743ee..0000000000
--- a/Content.Shared/Speech/EntitySystems/SharedSlurredSystem.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.Speech.Components;
-using Content.Shared.StatusEffect;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Speech.EntitySystems;
-
-public abstract class SharedSlurredSystem : RelayAccentSystem<SlurredAccentComponent>
-{
-    public static readonly EntProtoId Stutter = "StatusEffectSlurred";
-
-    public virtual void DoSlur(EntityUid uid, TimeSpan time, StatusEffectsComponent? status = null) { }
-}
diff --git a/Content.Shared/Speech/EntitySystems/SharedSpeakOnActionSystem.cs b/Content.Shared/Speech/EntitySystems/SharedSpeakOnActionSystem.cs
deleted file mode 100644
index 075d336cc4..0000000000
--- a/Content.Shared/Speech/EntitySystems/SharedSpeakOnActionSystem.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Shared.Chasm;
-using Content.Shared.Speech.Components;
-using Content.Shared.Speech.Muting;
-using System;
-
-namespace Content.Shared.Speech.EntitySystems;
-
-/// <summary>
-/// Once the chat refactor has happened, move the code from
-/// <see cref="Content.Server.Speech.EntitySystems.SpeakOnUseSystem"/>
-/// to here and set this class to sealed.
-/// </summary>
-public abstract class SharedSpeakOnActionSystem : EntitySystem;
diff --git a/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs b/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs
deleted file mode 100644
index 06871aad09..0000000000
--- a/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Shared.Speech.Components;
-using Content.Shared.StatusEffectNew;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Speech.EntitySystems;
-
-public abstract partial class SharedStutteringSystem : RelayAccentSystem<StutteringAccentComponent>
-{
-    public static readonly EntProtoId Stuttering = "StatusEffectStutter";
-
-    [Dependency] protected StatusEffectsSystem Status = default!;
-
-    // For code in shared... I imagine we ain't getting accent prediction anytime soon so let's not bother.
-    public virtual void DoStutter(EntityUid uid, TimeSpan time, bool refresh)
-    {
-    }
-
-    public virtual void DoRemoveStutterTime(EntityUid uid, TimeSpan timeRemoved)
-    {
-    }
-
-    public virtual void DoRemoveStutter(EntityUid uid)
-    {
-    }
-}
diff --git a/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs b/Content.Shared/Speech/EntitySystems/SkeletonAccentSystem.cs
similarity index 52%
rename from Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/SkeletonAccentSystem.cs
index 655ad4aec5..852f18ee79 100644
--- a/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/SkeletonAccentSystem.cs
@@ -1,20 +1,25 @@
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class SkeletonAccentSystem : RelayAccentSystem<SkeletonAccentComponent>
 {
+    [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IRobustRandom _random = default!;
     [Dependency] private ReplacementAccentSystem _replacement = default!;
 
-    [GeneratedRegex(@"(?<!\w)[^aeiou]one", RegexOptions.IgnoreCase, "en-US")]
-    private static partial Regex BoneRegex();
+    private static readonly Regex BoneRegex = new(@"(?<!\w)[^aeiou]one", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
     public override string Accentuate(string message, Entity<SkeletonAccentComponent>? ent = null)
     {
+        var random = ent.HasValue
+            ? SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Value))
+            : _random;
+
         // Order:
         // Do character manipulations first
         // Then direct word/phrase replacements
@@ -24,16 +29,15 @@ public sealed partial class SkeletonAccentSystem : RelayAccentSystem<SkeletonAcc
 
         // Character manipulations:
         // At the start of words, any non-vowel + "one" becomes "bone", e.g. tone -> bone ; lonely -> bonely; clone -> clone (remains unchanged).
-        msg = BoneRegex().Replace(msg, "bone");
+        msg = BoneRegex.Replace(msg, "bone");
 
         // apply word replacements
-        msg = _replacement.ApplyReplacements(msg, "skeleton");
+        msg = _replacement.ApplyReplacements(msg, "skeleton", ent?.Owner);
 
         // Suffix:
-        if (_random.Prob(ent.HasValue ? ent.Value.Comp.ackChance : 0.3f))
-        {
-            msg += (" " + Loc.GetString("skeleton-suffix")); // e.g. "We only want to socialize. ACK ACK!"
-        }
+        if (random.Prob(ent.HasValue ? ent.Value.Comp.AckChance : 0.3f))
+            msg += " " + Loc.GetString("skeleton-suffix"); // e.g. "We only want to socialize. ACK ACK!"
+
         return msg;
     }
 }
diff --git a/Content.Server/Speech/EntitySystems/SlowAccentSystem.cs b/Content.Shared/Speech/EntitySystems/SlowAccentSystem.cs
similarity index 87%
rename from Content.Server/Speech/EntitySystems/SlowAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/SlowAccentSystem.cs
index a92839c213..7c8d86ba02 100644
--- a/Content.Server/Speech/EntitySystems/SlowAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/SlowAccentSystem.cs
@@ -1,8 +1,7 @@
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Speech.Components;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class SlowAccentSystem : RelayAccentSystem<SlowAccentComponent>
 {
diff --git a/Content.Server/Speech/EntitySystems/SlurredSystem.cs b/Content.Shared/Speech/EntitySystems/SlurredSystem.cs
similarity index 56%
rename from Content.Server/Speech/EntitySystems/SlurredSystem.cs
rename to Content.Shared/Speech/EntitySystems/SlurredSystem.cs
index b8ecbfdad2..84f13a5e9c 100644
--- a/Content.Server/Speech/EntitySystems/SlurredSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/SlurredSystem.cs
@@ -1,63 +1,34 @@
 using System.Text;
-using Content.Shared.Speech;
+using Content.Shared.Random.Helpers;
 using Content.Shared.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffectNew;
 using Content.Shared.StatusEffectNew.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using Robust.Shared.Prototypes;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
-public sealed partial class SlurredSystem : SharedSlurredSystem
+public sealed partial class SlurredSystem : RelayAccentSystem<SlurredAccentComponent>
 {
+    public static readonly EntProtoId Stutter = "StatusEffectSlurred";
+
     [Dependency] private StatusEffectsSystem _status = default!;
-    [Dependency] private IRobustRandom _random = default!;
     [Dependency] private IGameTiming _timing = default!;
 
-    /// <summary>
-    /// Divisor applied to total seconds used to get the odds of slurred speech occuring.
-    /// </summary>
-    private const float SlurredModifier = 1100f;
-
-    /// <summary>
-    /// Minimum amount of time on the slurred accent for it to start taking effect.
-    /// </summary>
-    private const float SlurredThreshold = 80f;
-
-    /// <summary>
-    ///     Slur chance scales with the time remaining on any status effect with the SlurredAccentComponent.
-    ///     Typically, this is equivalent to "drunkenness" on the DrunkStatusEffect
-    /// </summary>
-    private float GetProbabilityScale(EntityUid uid)
+    public override string Accentuate(string message, Entity<SlurredAccentComponent>? ent = null)
     {
-        if (!TryComp<StatusEffectComponent>(uid, out var component) || component.AppliedTo == null)
-            return 0;
+        if (ent == null)
+            return message;
 
-        if (!_status.TryGetMaxTime<SlurredAccentComponent>(component.AppliedTo.Value, out var time))
-            return 0;
-
-        // This is a magic number. Why this value? No clue it was made 3 years before I refactored this.
-        var magic = time.Item2 == null ? SlurredModifier : (float) (time.Item2 - _timing.CurTime).Value.TotalSeconds - SlurredThreshold;
-
-        return Math.Clamp(magic / SlurredModifier, 0f, 1f);
-    }
-
-    // TODO: Make this accent possible to use without a status effect
-    protected override void OnAccent(Entity<SlurredAccentComponent> ent, ref AccentGetEvent args)
-    {
-        var scale = GetProbabilityScale(ent);
-        args.Message = Accentuate(args.Message, scale);
-    }
-
-    private string Accentuate(string message, float scale)
-    {
+        var scale = GetProbabilityScale(ent.Value);
+        var random = SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Value));
         var sb = new StringBuilder();
 
         // This is pretty much ported from TG.
         foreach (var character in message)
         {
-            if (_random.Prob(scale / 3f))
+            if (random.Prob(scale / 3f))
             {
                 var lower = char.ToLowerInvariant(character);
                 var newString = lower switch
@@ -79,7 +50,7 @@ public sealed partial class SlurredSystem : SharedSlurredSystem
                 sb.Append(newString);
             }
 
-            if (_random.Prob(scale / 20f))
+            if (random.Prob(scale / 20f))
             {
                 if (character == ' ')
                 {
@@ -92,13 +63,13 @@ public sealed partial class SlurredSystem : SharedSlurredSystem
                 }
             }
 
-            if (!_random.Prob(scale * 3/20))
+            if (!random.Prob(scale * 3 / 20))
             {
                 sb.Append(character);
                 continue;
             }
 
-            var next = _random.Next(1, 3) switch
+            var next = random.Next(1, 3) switch
             {
                 1 => "'",
                 2 => $"{character}{character}",
@@ -110,4 +81,24 @@ public sealed partial class SlurredSystem : SharedSlurredSystem
 
         return sb.ToString();
     }
+
+    /// <summary>
+    /// Slur chance scales with the time remaining on any status effect with the SlurredAccentComponent.
+    /// Typically, this is equivalent to "drunkenness" on the DrunkStatusEffect
+    /// </summary>
+    private float GetProbabilityScale(Entity<SlurredAccentComponent> ent)
+    {
+        if (!TryComp<StatusEffectComponent>(ent, out var component) || component.AppliedTo == null)
+            return 1f;
+
+        if (!_status.TryGetMaxTime<SlurredAccentComponent>(component.AppliedTo.Value, out var time))
+            return 1f;
+
+        // This is a magic number. Why this value? No clue it was made 3 years before I refactored this.
+        var magic = time.Item2 == null
+            ? ent.Comp.SlurredModifier
+            : (float)(time.Item2 - _timing.CurTime).Value.TotalSeconds - ent.Comp.SlurredThreshold;
+
+        return Math.Clamp(magic / ent.Comp.SlurredModifier, 0f, 1f);
+    }
 }
diff --git a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs b/Content.Shared/Speech/EntitySystems/SouthernAccentSystem.cs
similarity index 89%
rename from Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/SouthernAccentSystem.cs
index ef56a0264a..b77e465628 100644
--- a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/SouthernAccentSystem.cs
@@ -1,8 +1,7 @@
 using System.Text.RegularExpressions;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Speech.Components;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed partial class SouthernAccentSystem : RelayAccentSystem<SouthernAccentComponent>
 {
@@ -17,7 +16,7 @@ public sealed partial class SouthernAccentSystem : RelayAccentSystem<SouthernAcc
 
     public override string Accentuate(string message, Entity<SouthernAccentComponent>? ent = null)
     {
-        message = _replacement.ApplyReplacements(message, "southern");
+        message = _replacement.ApplyReplacements(message, "southern", ent?.Owner);
 
         //They shoulda started runnin' an' hidin' from me!
         message = RegexLowerIng.Replace(message, "in'");
diff --git a/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs b/Content.Shared/Speech/EntitySystems/SpanishAccentSystem.cs
similarity index 94%
rename from Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs
rename to Content.Shared/Speech/EntitySystems/SpanishAccentSystem.cs
index e68d23a190..3d77840656 100644
--- a/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/SpanishAccentSystem.cs
@@ -1,9 +1,8 @@
 using System.Text.RegularExpressions;
 using System.Text;
-using Content.Server.Speech.Components;
-using Content.Shared.Speech.EntitySystems;
+using Content.Shared.Speech.Components;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed class SpanishAccentSystem : RelayAccentSystem<SpanishAccentComponent>
 {
@@ -50,6 +49,7 @@ public sealed class SpanishAccentSystem : RelayAccentSystem<SpanishAccentCompone
                     _ => ' '
                 });
             }
+
             if (toInsert.Length == 0)
                 msg.Append(s);
             else
diff --git a/Content.Shared/Speech/EntitySystems/SpeakOnActionSystem.cs b/Content.Shared/Speech/EntitySystems/SpeakOnActionSystem.cs
new file mode 100644
index 0000000000..6880ef9edf
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/SpeakOnActionSystem.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Speech.Components;
+using Content.Shared.Actions.Events;
+using Content.Shared.Chat;
+using Content.Shared.Speech.Muting;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public sealed partial class SpeakOnActionSystem : EntitySystem
+{
+    [Dependency] private SharedChatSystem _chat = default!;
+
+    [SubscribeLocalEvent]
+    private void OnActionPerformed(Entity<SpeakOnActionComponent> ent, ref ActionPerformedEvent args)
+    {
+        var user = args.Performer;
+
+        // If we can't speak, we can't speak.
+        if (!HasComp<SpeechComponent>(user) || HasComp<MutedComponent>(user))
+            return;
+
+        if (string.IsNullOrWhiteSpace(ent.Comp.Sentence))
+            return;
+
+        _chat.TrySendInGameICMessage(user, Loc.GetString(ent.Comp.Sentence), InGameICChatType.Speak, false);
+    }
+}
diff --git a/Content.Shared/Speech/EntitySystems/SpeechNoiseSystem.cs b/Content.Shared/Speech/EntitySystems/SpeechNoiseSystem.cs
new file mode 100644
index 0000000000..ea5f99e66f
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/SpeechNoiseSystem.cs
@@ -0,0 +1,70 @@
+using Content.Shared.Chat;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public sealed partial class SpeechSoundSystem : EntitySystem
+{
+    [Dependency] private IGameTiming _gameTiming = default!;
+    [Dependency] private SharedAudioSystem _audio = default!;
+
+    [SubscribeLocalEvent]
+    private void OnEntitySpoke(Entity<SpeechComponent> ent, ref EntitySpokeEvent args)
+    {
+        if (ent.Comp.SpeechSounds == null)
+            return;
+
+        var currentTime = _gameTiming.CurTime;
+        var cooldown = TimeSpan.FromSeconds(ent.Comp.SoundCooldownTime);
+
+        // Ensure more than the cooldown time has passed since last speaking
+        if (currentTime - ent.Comp.LastTimeSoundPlayed < cooldown)
+            return;
+
+        var sound = GetSpeechSound(ent, args.Message);
+        ent.Comp.LastTimeSoundPlayed = currentTime;
+        _audio.PlayPredicted(sound, ent, ent);
+    }
+
+    /// <summary>
+    /// Gets the speech sound for a message.
+    /// </summary>
+    public SoundSpecifier? GetSpeechSound(Entity<SpeechComponent> ent, string message)
+    {
+        if (ent.Comp.SpeechSounds == null)
+            return null;
+
+        // Play speech sound
+        var prototype = ProtoMan.Index<SpeechSoundsPrototype>(ent.Comp.SpeechSounds);
+
+        // Different sounds for ask/exclaim based on last character
+        var contextSound = message[^1] switch
+        {
+            '?' => prototype.AskSound,
+            '!' => prototype.ExclaimSound,
+            _ => prototype.SaySound
+        };
+
+        // Use exclaim sound if most characters are uppercase.
+        var uppercaseCount = 0;
+        foreach (var t in message)
+        {
+            if (char.IsUpper(t))
+                uppercaseCount++;
+        }
+
+        if (uppercaseCount > message.Length / 2)
+        {
+            contextSound = prototype.ExclaimSound;
+        }
+
+        var random = SharedRandomExtensions.PredictedRandom(_gameTiming, GetNetEntity(ent));
+        var scale = (float)random.NextGaussian(1, prototype.Variation);
+        contextSound.Params = ent.Comp.AudioParams.WithPitchScale(scale);
+        return contextSound;
+    }
+}
diff --git a/Content.Shared/Speech/EntitySystems/StutteringSystem.cs b/Content.Shared/Speech/EntitySystems/StutteringSystem.cs
new file mode 100644
index 0000000000..1a0624372b
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/StutteringSystem.cs
@@ -0,0 +1,73 @@
+using System.Text;
+using System.Text.RegularExpressions;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
+using Content.Shared.StatusEffectNew;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public sealed partial class StutteringSystem : RelayAccentSystem<StutteringAccentComponent>
+{
+    public static readonly EntProtoId StutterEffect = "StatusEffectSlurred";
+
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
+
+    // Regex of characters to stutter.
+    private static readonly Regex Stutter = new("[b-df-hj-np-tv-wxyz]",
+        RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+    public override string Accentuate(string message, Entity<StutteringAccentComponent>? ent = null)
+    {
+        if (ent == null)
+            return message;
+
+        var random = SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Value));
+        var length = message.Length;
+        var finalMessage = new StringBuilder();
+
+        for (var i = 0; i < length; i++)
+        {
+            var newLetter = message[i].ToString();
+            if (Stutter.IsMatch(newLetter) && random.Prob(ent.Value.Comp.MatchRandomProb))
+            {
+                if (random.Prob(ent.Value.Comp.FourRandomProb))
+                {
+                    newLetter = $"{newLetter}-{newLetter}-{newLetter}-{newLetter}";
+                }
+                else if (random.Prob(ent.Value.Comp.ThreeRandomProb))
+                {
+                    newLetter = $"{newLetter}-{newLetter}-{newLetter}";
+                }
+                else if (random.Prob(ent.Value.Comp.CutRandomProb))
+                {
+                    newLetter = "";
+                }
+                else
+                {
+                    newLetter = $"{newLetter}-{newLetter}";
+                }
+            }
+
+            finalMessage.Append(newLetter);
+        }
+
+        return finalMessage.ToString();
+    }
+
+    /// <summary>
+    /// Applies or refreshes the stuttering speech status effect on an entity.
+    /// </summary>
+    [PublicAPI]
+    public void DoStutter(EntityUid uid, TimeSpan time, bool refresh)
+    {
+        if (refresh)
+            _statusEffects.TryUpdateStatusEffectDuration(uid, StutterEffect, time);
+        else
+            _statusEffects.TryAddStatusEffectDuration(uid, StutterEffect, time);
+    }
+}
diff --git a/Content.Shared/Speech/EntitySystems/UnblockableSpeechSystem.cs b/Content.Shared/Speech/EntitySystems/UnblockableSpeechSystem.cs
new file mode 100644
index 0000000000..90580e593a
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/UnblockableSpeechSystem.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Speech.Components;
+using Content.Shared.Chat;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public sealed partial class UnblockableSpeechSystem : EntitySystem
+{
+    [SubscribeLocalEvent]
+    private void OnCheck(Entity<UnblockableSpeechComponent> ent, ref CheckIgnoreSpeechBlockerEvent args)
+    {
+        args.IgnoreBlocker = true;
+    }
+}
diff --git a/Content.Shared/Speech/EntitySystems/VocalSystem.cs b/Content.Shared/Speech/EntitySystems/VocalSystem.cs
new file mode 100644
index 0000000000..f241debe1e
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/VocalSystem.cs
@@ -0,0 +1,124 @@
+using Content.Shared.Actions;
+using Content.Shared.Chat;
+using Content.Shared.Chat.Prototypes;
+using Content.Shared.Humanoid;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Speech.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public sealed partial class VocalSystem : EntitySystem
+{
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private SharedAudioSystem _audio = default!;
+    [Dependency] private SharedChatSystem _chat = default!;
+    [Dependency] private SharedActionsSystem _actions = default!;
+
+    [SubscribeLocalEvent]
+    private void OnMapInit(Entity<VocalComponent> ent, ref MapInitEvent args)
+    {
+        // try to add scream action when vocal comp added
+        _actions.AddAction(ent.Owner, ref ent.Comp.EmoteActionEntity, ent.Comp.EmoteAction);
+        Dirty(ent);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnShutdown(Entity<VocalComponent> ent, ref ComponentShutdown args)
+    {
+        // remove scream action when component removed
+        _actions.RemoveAction(ent.Owner, ent.Comp.EmoteActionEntity);
+        Dirty(ent);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnVoiceChanged(Entity<VocalComponent> ent, ref VoiceChangedEvent args)
+    {
+        LoadSounds(ent, args.NewVoice);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnEmote(Entity<VocalComponent> ent, ref EmoteEvent args)
+    {
+        if (args.Handled || !args.Emote.Category.HasFlag(EmoteCategory.Vocal))
+            return;
+
+        // snowflake case for wilhelm scream easter egg
+        if (args.Emote == ent.Comp.ScreamId)
+        {
+            args.Handled = TryPlayScreamSound(ent, GetEntity(args.Source));
+            return;
+        }
+
+        if (ent.Comp.EmoteSounds is not { } sounds)
+            return;
+
+        // just play regular sound based on emote proto
+        args.Handled = _chat.TryPlayEmoteSound(ent.Owner, ProtoMan.Index(sounds), args.Emote);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnEmoteAction(Entity<VocalComponent> ent, ref EmoteActionEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        _chat.TryEmoteWithChat(ent.Owner, args.Emote);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Copy this component's datafields from one entity to another.
+    /// This can't use CopyComp because of the ScreamActionEntity DataField, which should not be copied.
+    /// </summary>
+    [PublicAPI]
+    public void CopyComponent(Entity<VocalComponent?> source, EntityUid target)
+    {
+        if (!Resolve(source, ref source.Comp))
+            return;
+
+        var targetComp = EnsureComp<VocalComponent>(target);
+        targetComp.ScreamId = source.Comp.ScreamId;
+        targetComp.Wilhelm = source.Comp.Wilhelm;
+        targetComp.WilhelmProbability = source.Comp.WilhelmProbability;
+        LoadSounds((target, targetComp));
+
+        Dirty(target, targetComp);
+    }
+
+    private bool TryPlayScreamSound(Entity<VocalComponent> ent, EntityUid user)
+    {
+        var random = SharedRandomExtensions.PredictedRandom(_timing, GetNetEntity(ent.Owner), GetNetEntity(user));
+        if (random.Prob(ent.Comp.WilhelmProbability))
+        {
+            _audio.PlayPredicted(ent.Comp.Wilhelm, ent.Owner, user, ent.Comp.Wilhelm.Params);
+            return true;
+        }
+
+        if (ent.Comp.EmoteSounds is not { } sounds)
+            return false;
+
+        return _chat.TryPlayEmoteSound(ent.Owner, ProtoMan.Index(sounds), ent.Comp.ScreamId);
+    }
+
+    /// <summary>
+    /// This only works on Humanoids. Mobs should have emoteSounds on <see cref="VocalComponent"/> set directly instead.
+    /// </summary>
+    private void LoadSounds(Entity<VocalComponent> ent, ProtoId<EmoteSoundsPrototype>? protoId = null)
+    {
+        if (!TryComp<HumanoidProfileComponent>(ent.Owner, out var humanoid))
+            return;
+
+        protoId ??= humanoid.Voice;
+
+        if (!ProtoMan.HasIndex(protoId))
+            return;
+
+        ent.Comp.EmoteSounds = protoId;
+        Dirty(ent);
+    }
+}
diff --git a/Content.Shared/Speech/EntitySystems/VoiceOverrideSystem.cs b/Content.Shared/Speech/EntitySystems/VoiceOverrideSystem.cs
new file mode 100644
index 0000000000..a1d6f291cf
--- /dev/null
+++ b/Content.Shared/Speech/EntitySystems/VoiceOverrideSystem.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Chat;
+using Content.Shared.Speech.Components;
+
+namespace Content.Shared.Speech.EntitySystems;
+
+public sealed partial class VoiceOverrideSystem : EntitySystem
+{
+    [SubscribeLocalEvent]
+    private void OnTransformSpeakerName(Entity<VoiceOverrideComponent> ent, ref TransformSpeakerNameEvent args)
+    {
+        if (!ent.Comp.Enabled)
+            return;
+
+        args.VoiceName = ent.Comp.NameOverride ?? args.VoiceName;
+        args.SpeechVerb = ent.Comp.SpeechVerbOverride ?? args.SpeechVerb;
+    }
+}
diff --git a/Content.Shared/Speech/EntitySystems/SharedListenWireAction.cs b/Content.Shared/Speech/ListenWireAction.cs
similarity index 100%
rename from Content.Shared/Speech/EntitySystems/SharedListenWireAction.cs
rename to Content.Shared/Speech/ListenWireAction.cs
diff --git a/Content.Server/Speech/Prototypes/ReplacementAccentPrototype.cs b/Content.Shared/Speech/Prototypes/ReplacementAccentPrototype.cs
similarity index 61%
rename from Content.Server/Speech/Prototypes/ReplacementAccentPrototype.cs
rename to Content.Shared/Speech/Prototypes/ReplacementAccentPrototype.cs
index cde4baeb2f..dc541e0a1b 100644
--- a/Content.Server/Speech/Prototypes/ReplacementAccentPrototype.cs
+++ b/Content.Shared/Speech/Prototypes/ReplacementAccentPrototype.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Speech.Prototypes;
+namespace Content.Shared.Speech.Prototypes;
 
 [Prototype("accent")]
 public sealed partial class ReplacementAccentPrototype : IPrototype
@@ -11,14 +11,14 @@ public sealed partial class ReplacementAccentPrototype : IPrototype
     public string ID { get; private set; } = default!;
 
     /// <summary>
-    ///     If this array is non-null, the full text of anything said will be randomly replaced with one of these words.
+    /// If this array is non-null, the full text of anything said will be randomly replaced with one of these words.
     /// </summary>
     [DataField]
     public string[]? FullReplacements;
 
     /// <summary>
-    ///     If this dictionary is non-null and <see cref="FullReplacements"/> is null, any keys surrounded by spaces
-    ///     (words) will be replaced by the value, attempting to intelligently keep capitalization.
+    /// If this dictionary is non-null and <see cref="FullReplacements"/> is null, any keys surrounded by spaces
+    /// (words) will be replaced by the value, attempting to intelligently keep capitalization.
     /// </summary>
     [DataField]
     public Dictionary<string, string>? WordReplacements;
diff --git a/Content.Shared/Speech/EntitySystems/SharedSpeechWireAction.cs b/Content.Shared/Speech/SpeechWireAction.cs
similarity index 100%
rename from Content.Shared/Speech/EntitySystems/SharedSpeechWireAction.cs
rename to Content.Shared/Speech/SpeechWireAction.cs
diff --git a/Content.Shared/Stacks/SharedStackSystem.API.cs b/Content.Shared/Stacks/SharedStackSystem.API.cs
index 3459f4f0dc..96a13e3ac2 100644
--- a/Content.Shared/Stacks/SharedStackSystem.API.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.API.cs
@@ -120,7 +120,7 @@ public abstract partial class SharedStackSystem
     {
         transferred = 0;
 
-        if (donor == recipient)
+        if (donor.Owner == recipient.Owner)
             return false;
 
         // Recipient is being torn down, don't give it anything.
diff --git a/Content.Shared/Station/SharedStationSystem.cs b/Content.Shared/Station/SharedStationSystem.cs
index ef1a69661f..8de80602ff 100644
--- a/Content.Shared/Station/SharedStationSystem.cs
+++ b/Content.Shared/Station/SharedStationSystem.cs
@@ -1,8 +1,10 @@
 using System.Linq;
 using Content.Shared.Station.Components;
 using JetBrains.Annotations;
+using Robust.Shared.Collections;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Player;
 
 namespace Content.Shared.Station;
 
@@ -10,8 +12,14 @@ public abstract partial class SharedStationSystem : EntitySystem
 {
     [Dependency] private SharedMapSystem _map = default!;
     [Dependency] private MetaDataSystem _meta = default!;
+    [Dependency] private SharedTransformSystem _transform = default!;
+    [Dependency] private ISharedPlayerManager _player = default!;
 
-    [Dependency] private EntityQuery<StationMemberComponent> _stationMemberQuery = default!;
+    [Dependency] private EntityQuery<StationMemberComponent> _stationMemberQuery;
+    [Dependency] private EntityQuery<MapGridComponent> _gridQuery;
+
+    private ValueList<MapId> _mapIds;
+    private ValueList<(Box2Rotated Bounds, MapId MapId)> _gridBounds;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -177,6 +185,104 @@ public abstract partial class SharedStationSystem : EntitySystem
     }
 
     /// <summary>
+    /// Tries to retrieve a filter for everything in the station the source is on.
+    /// </summary>
+    /// <param name="source">The entity to use to find the station.</param>
+    /// <param name="range">The range around the station</param>
+    /// <returns></returns>
+    public Filter GetInOwningStation(EntityUid source, float range = 32f)
+    {
+        var station = GetOwningStation(source);
+
+        if (TryComp<StationDataComponent>(station, out var data))
+        {
+            return GetInStation(data);
+        }
+
+        return Filter.Empty();
+    }
+
+    /// <summary>
+    /// Retrieves a filter for everything in a particular station or near its member grids.
+    /// </summary>
+    public Filter GetInStation(StationDataComponent dataComponent, float range = 32f)
+    {
+        var filter = Filter.Empty();
+        _mapIds.Clear();
+
+        // First collect all valid map IDs where station grids exist
+        foreach (var gridUid in dataComponent.Grids)
+        {
+            if (!TryComp(gridUid, out TransformComponent? xform))
+                continue;
+
+            var mapId = xform.MapID;
+            if (!_mapIds.Contains(mapId))
+                _mapIds.Add(mapId);
+        }
+
+        // Cache the rotated bounds for each grid
+        _gridBounds.Clear();
+
+        foreach (var gridUid in dataComponent.Grids)
+        {
+            if (!_gridQuery.TryComp(gridUid, out var grid) ||
+                !TryComp(gridUid, out TransformComponent? gridXform))
+            {
+                continue;
+            }
+
+            var (worldPos, worldRot) = _transform.GetWorldPositionRotation(gridXform);
+            var localBounds = grid.LocalAABB.Enlarged(range);
+
+            // Create a rotated box using the grid's transform
+            var rotatedBounds = new Box2Rotated(
+                localBounds,
+                worldRot,
+                worldPos);
+
+            _gridBounds.Add((rotatedBounds, gridXform.MapID));
+        }
+
+        foreach (var session in Filter.GetAllPlayers(_player))
+        {
+            var entity = session.AttachedEntity;
+            if (entity == null || !TryComp(entity, out TransformComponent? xform))
+                continue;
+
+            var mapId = xform.MapID;
+
+            if (!_mapIds.Contains(mapId))
+                continue;
+
+            // Check if the player is directly on any station grid
+            var gridUid = xform.GridUid;
+            if (gridUid != null && dataComponent.Grids.Contains(gridUid.Value))
+            {
+                filter.AddPlayer(session);
+                continue;
+            }
+
+            // If not directly on a grid, check against cached rotated bounds
+            var position = _transform.GetWorldPosition(xform);
+
+            foreach (var (bounds, boundsMapId) in _gridBounds)
+            {
+                // Skip bounds on different maps
+                if (boundsMapId != mapId)
+                    continue;
+
+                if (!bounds.Contains(position))
+                    continue;
+
+                filter.AddPlayer(session);
+                break;
+            }
+        }
+
+        return filter;
+    }
+
     /// Returns true if a entity's parent is the station, and false if the entity is not on the station
     /// </summary>
     /// <param name="entity">The entity to check if is on a grid</param>
diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Suicide/SharedSuicideSystem.cs
similarity index 97%
rename from Content.Shared/Chat/SharedSuicideSystem.cs
rename to Content.Shared/Suicide/SharedSuicideSystem.cs
index 01f88d9276..c7e7206f0d 100644
--- a/Content.Shared/Chat/SharedSuicideSystem.cs
+++ b/Content.Shared/Suicide/SharedSuicideSystem.cs
@@ -6,9 +6,9 @@ using Content.Shared.Damage.Systems;
 using Content.Shared.Mobs.Components;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Chat;
+namespace Content.Shared.Suicide;
 
-public sealed partial class SharedSuicideSystem : EntitySystem
+public abstract partial class SharedSuicideSystem : EntitySystem
 {
     private static readonly ProtoId<DamageTypePrototype> FallbackDamageType = "Blunt";
 
diff --git a/Content.Shared/Temperature/Components/EntityHeaterComponent.cs b/Content.Shared/Temperature/Components/EntityHeaterComponent.cs
index 6cf97a0534..76bb4f4ba7 100644
--- a/Content.Shared/Temperature/Components/EntityHeaterComponent.cs
+++ b/Content.Shared/Temperature/Components/EntityHeaterComponent.cs
@@ -16,7 +16,7 @@ public sealed partial class EntityHeaterComponent : Component
     /// Low and medium are 33% and 66% respectively.
     /// </summary>
     [DataField]
-    public float Power = 2400f;
+    public float Power = 12000f;
 
     /// <summary>
     /// Current setting of the heater. If it is off or unpowered it won't heat anything.
diff --git a/Content.Shared/Temperature/Components/TemperatureComponent.cs b/Content.Shared/Temperature/Components/TemperatureComponent.cs
index fd79c4b4b2..00b0cf2934 100644
--- a/Content.Shared/Temperature/Components/TemperatureComponent.cs
+++ b/Content.Shared/Temperature/Components/TemperatureComponent.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Atmos;
+using Content.Shared.Temperature.HeatContainer;
+using Content.Shared.Temperature.Systems;
 
 namespace Content.Shared.Temperature.Components;
 
@@ -7,23 +9,31 @@ namespace Content.Shared.Temperature.Components;
 /// informing others of the current temperature.
 /// </summary>
 [RegisterComponent]
-public sealed partial class TemperatureComponent : Component
+[Access(typeof(SharedTemperatureSystem))]
+public sealed partial class TemperatureComponent : Component, IHeatContainer
 {
     /// <summary>
-    /// Surface temperature which is modified by the environment.
+    /// The specific heat capacity of this entity in J/(kg*K). Humans are about 3kJ/(kg*K)
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float CurrentTemperature = Atmospherics.T20C;
+    [DataField]
+    public float SpecificHeat = 3000f;
+
+    [DataField]
+    public float HeatCapacity { get; set; }
+
+    [DataField]
+    public float Temperature { get; set; } = Atmospherics.T20C;
 
     /// <summary>
-    /// Heat capacity per kg of mass.
+    /// Thermal Conductivity in W/(K*m^2).
+    /// Human skin is about 0.3 W/(m*K)
+    /// Divide that by the thickness of skin of about 2mm giving us a final value of 150
+    /// Source: https://pmc.ncbi.nlm.nih.gov/articles/PMC8953946/
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float SpecificHeat = 50f;
-
-    /// <summary>
-    /// How well does the air surrounding you merge into your body temperature?
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float AtmosTemperatureTransferEfficiency = 0.1f;
+    /// <remarks>
+    /// This value should be multiplied by a surface area value based on the amount of area in contact.
+    /// For Atmospherics, this is typically 2m^2, the surface area of the average body.
+    /// </remarks>
+    [DataField]
+    public float ThermalConductivity = 150f;
 }
diff --git a/Content.Shared/Temperature/Systems/SharedEntityHeaterSystem.cs b/Content.Shared/Temperature/Systems/SharedEntityHeaterSystem.cs
index 9a8dc57d4b..848052ebf6 100644
--- a/Content.Shared/Temperature/Systems/SharedEntityHeaterSystem.cs
+++ b/Content.Shared/Temperature/Systems/SharedEntityHeaterSystem.cs
@@ -88,8 +88,8 @@ public abstract partial class SharedEntityHeaterSystem : EntitySystem
         // Just think of the load as a little LED, or bad wiring, or something.
         return setting switch
         {
-            EntityHeaterSetting.Low => max / 3f,
-            EntityHeaterSetting.Medium => max * 2f / 3f,
+            EntityHeaterSetting.Low => max / 4f,
+            EntityHeaterSetting.Medium => max / 2f,
             EntityHeaterSetting.High => max,
             _ => 0.01f,
         };
diff --git a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
index 32c370d220..375579c6bc 100644
--- a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
+++ b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
@@ -1,9 +1,10 @@
 using System.Linq;
-using Content.Shared.Atmos;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Temperature.Components;
+using Content.Shared.Temperature.HeatContainer;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Events;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Temperature.Systems;
@@ -27,11 +28,33 @@ public abstract partial class SharedTemperatureSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<TemperatureSpeedComponent, OnTemperatureChangeEvent>(OnTemperatureChanged);
+        SubscribeLocalEvent<TemperatureComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<TemperatureComponent, MassDataChangedEvent>(OnMassDataChanged);
+        SubscribeLocalEvent<TemperatureSpeedComponent, TemperatureChangedEvent>(OnTemperatureChanged);
         SubscribeLocalEvent<TemperatureSpeedComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
     }
 
-    private void OnTemperatureChanged(Entity<TemperatureSpeedComponent> ent, ref OnTemperatureChangeEvent args)
+    /// <remarks>
+    /// Calculates the HeatCapacity for this entity based on its SpecificHeat and mass.
+    /// This is a carryover from the old TemperatureSystem.
+    /// If this entity does not have a <see cref="PhysicsComponent"/>, then it assumes it's 1kg.
+    /// </remarks>
+    protected virtual void OnMapInit(Entity<TemperatureComponent> entity, ref MapInitEvent args)
+    {
+        // We calculate the heat capacity for our entity by multiplying its mass by its specific heat.
+        // If the entity has no mass, we assume it's 1 kilogram.
+        var mass = CompOrNull<PhysicsComponent>(entity)?.FixturesMass ?? 1f;
+
+        // TODO: This assumes this is temperature for the whole body, but ideally we want it split into surface and internal temperature!
+        entity.Comp.HeatCapacity = mass * entity.Comp.SpecificHeat;
+    }
+
+    private void OnMassDataChanged(Entity<TemperatureComponent> entity, ref MassDataChangedEvent args)
+    {
+        entity.Comp.HeatCapacity = args.NewMass * entity.Comp.SpecificHeat;
+    }
+
+    private void OnTemperatureChanged(Entity<TemperatureSpeedComponent> ent, ref TemperatureChangedEvent args)
     {
         foreach (var (threshold, modifier) in ent.Comp.Thresholds)
         {
@@ -82,18 +105,107 @@ public abstract partial class SharedTemperatureSystem : EntitySystem
         }
     }
 
-    public virtual void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false, TemperatureComponent? temperature = null)
+    /// <summary>
+    /// Conducts heat between an entity with TemperatureComponent and another <see cref="HeatContainer"/>
+    /// </summary>
+    /// <param name="entity">Entity we're conducting heat with</param>
+    /// <param name="heatContainer">Heat container which is conducting heat with our entity</param>
+    /// <param name="deltaT">The amount of time that the heat is allowed to conduct, in seconds. This value should be small.</param>
+    /// <param name="heatTransferMod">An optional heat transfer modifier for this exchange</param>
+    /// <param name="ignoreHeatResistance">Whether we should avoid raising an event which checks for conduction modifiers on our entity.</param>
+    /// <returns>Returns the amount of heat exchanged, in Joules. A positive value means the entity lost heat energy.</returns>
+    public float ConductHeat<T>(Entity<TemperatureComponent?> entity, ref T heatContainer, float deltaT, float heatTransferMod = 1f, bool ignoreHeatResistance = false) where T : IHeatContainer
     {
+        if (!TemperatureQuery.Resolve(entity, ref entity.Comp, false)
+            || MathHelper.CloseTo(entity.Comp.Temperature, heatContainer.Temperature))
+            return 0f;
 
-    }
-
-    public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, PhysicsComponent? physics = null)
-    {
-        if (!TemperatureQuery.Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
+        var conductance = entity.Comp.ThermalConductivity * heatTransferMod;
+        if (!ignoreHeatResistance)
         {
-            return Atmospherics.MinimumHeatCapacity;
+            var ev = new BeforeHeatExchangeEvent();
+            RaiseLocalEvent(entity, ref ev);
+            conductance *= ev.HeatTransferModifier;
         }
 
-        return comp.SpecificHeat * physics.FixturesMass;
+        var lastTemp = entity.Comp.Temperature;
+        var heatEx = HeatContainerHelpers.ConductHeat(ref entity.Comp, ref heatContainer, deltaT, conductance);
+
+        var changeEv = new TemperatureChangedEvent(entity.Comp.Temperature, lastTemp);
+        RaiseLocalEvent(entity, ref changeEv, broadcast: true);
+        return heatEx;
+    }
+
+    /// <summary>
+    /// Conducts heat for an entity with a TemperatureComponent to a source at a fixed temperature.
+    /// </summary>
+    /// <param name="entity">Entity we're conducting heat with</param>
+    /// <param name="temperature">Temperature this entity is being exposed to</param>
+    /// <param name="deltaT">The amount of time that the heat is allowed to conduct, in seconds. This value should be small.</param>
+    /// <param name="heatTransferMod">An optional heat transfer modifier for this exchange</param>
+    /// <param name="ignoreHeatResistance">Whether we should avoid raising an event which checks for conduction modifiers on our entity.</param>
+    /// <returns>Returns the amount of heat exchanged, in Joules. A positive value means the entity lost heat energy.</returns>
+    public float ConductHeat(Entity<TemperatureComponent?> entity, float temperature, float deltaT, float heatTransferMod = 1f, bool ignoreHeatResistance = false)
+    {
+        if (!TemperatureQuery.Resolve(entity, ref entity.Comp, false)
+            || MathHelper.CloseTo(entity.Comp.Temperature, temperature))
+            return 0f;
+
+        var conductance = entity.Comp.ThermalConductivity * heatTransferMod;
+        if (!ignoreHeatResistance)
+        {
+            var ev = new BeforeHeatExchangeEvent();
+            RaiseLocalEvent(entity, ref ev);
+            conductance *= ev.HeatTransferModifier;
+        }
+
+        var lastTemp = entity.Comp.Temperature;
+        var heatEx =  HeatContainerHelpers.ConductHeat(ref entity.Comp, temperature, deltaT, conductance);
+
+        var changeEv = new TemperatureChangedEvent(entity.Comp.Temperature, lastTemp);
+        RaiseLocalEvent(entity, ref changeEv, broadcast: true);
+        return heatEx;
+    }
+
+    /// <summary>
+    /// Adds or removes the specified amount of heat from an entity.
+    /// </summary>
+    /// <param name="entity">Entity whose temperature we're modifying.</param>
+    /// <param name="heatAmount">The change in heat.</param>
+    /// <param name="ignoreHeatResistance">Whether we should avoid raising an event to modify the conductance of our entity.</param>
+    /// <returns>Returns the amount of heat that was actually added, after applying heat resistances.</returns>
+    public float ChangeHeat(Entity<TemperatureComponent?> entity, float heatAmount, bool ignoreHeatResistance = false)
+    {
+        if (!TemperatureQuery.Resolve(entity, ref entity.Comp, false) || heatAmount == 0f)
+            return 0f;
+
+        if (!ignoreHeatResistance)
+        {
+            var ev = new BeforeHeatExchangeEvent();
+            RaiseLocalEvent(entity, ref ev );
+            heatAmount *= ev.HeatTransferModifier;
+        }
+
+        var lastTemp = entity.Comp.Temperature;
+        HeatContainerHelpers.AddHeat(ref entity.Comp, heatAmount);
+
+        var changeEv = new TemperatureChangedEvent(entity.Comp.Temperature, lastTemp);
+        RaiseLocalEvent(entity, ref changeEv, broadcast: true);
+
+        return heatAmount;
+    }
+
+    /// <summary>
+    /// Protected because you should not be calling this. Sets heat to a new value.
+    /// </summary>
+    protected void SetTemperature(Entity<TemperatureComponent?> entity, float temp)
+    {
+        if (!TemperatureQuery.Resolve(entity, ref entity.Comp))
+            return;
+
+        var lastTemp = entity.Comp.Temperature;
+        entity.Comp.Temperature = temp;
+        var changeEv = new TemperatureChangedEvent(entity.Comp.Temperature, lastTemp);
+        RaiseLocalEvent(entity, ref changeEv, broadcast: true);
     }
 }
diff --git a/Content.Shared/Temperature/TemperatureEvents.cs b/Content.Shared/Temperature/TemperatureEvents.cs
index 7a26d07e30..5f596b1b7f 100644
--- a/Content.Shared/Temperature/TemperatureEvents.cs
+++ b/Content.Shared/Temperature/TemperatureEvents.cs
@@ -2,29 +2,29 @@ using Content.Shared.Inventory;
 
 namespace Content.Shared.Temperature;
 
-public sealed class ModifyChangedTemperatureEvent : EntityEventArgs, IInventoryRelayEvent
+/// <summary>
+/// This event is raised before heat is exchanged so that the conductance of the exchange can be changed.
+/// </summary>
+[ByRefEvent]
+public record struct BeforeHeatExchangeEvent() : IInventoryRelayEvent
 {
     public SlotFlags TargetSlots { get; } = ~SlotFlags.POCKET;
 
-    public float TemperatureDelta;
-
-    public ModifyChangedTemperatureEvent(float temperature)
-    {
-        TemperatureDelta = temperature;
-    }
+    /// <summary>
+    /// A multiplicative modifier for heat transfers on the entity this event is being raised to.
+    /// </summary>
+    public float HeatTransferModifier = 1f;
 }
 
-public sealed class OnTemperatureChangeEvent : EntityEventArgs
+/// <summary>
+/// This event is raised after heat is exchanged to inform other systems that temperature has changed.
+/// </summary>
+/// <param name="CurrentTemperature">Current temperature of this entity.</param>
+/// <param name="LastTemperature">Previous temperature of this entity.</param>
+[ByRefEvent]
+public record struct TemperatureChangedEvent(float CurrentTemperature, float LastTemperature)
 {
-    public readonly float CurrentTemperature;
-    public readonly float LastTemperature;
-    public readonly float TemperatureDelta;
-
-    public OnTemperatureChangeEvent(float current, float last, float delta)
-    {
-        CurrentTemperature = current;
-        LastTemperature = last;
-        TemperatureDelta = delta;
-    }
+    public readonly float CurrentTemperature = CurrentTemperature;
+    public readonly float LastTemperature = LastTemperature;
+    public readonly float TemperatureDelta = CurrentTemperature - LastTemperature;
 }
-
diff --git a/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
similarity index 59%
rename from Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
rename to Content.Shared/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
index 3b66a8d5c0..55125edde9 100644
--- a/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
@@ -1,14 +1,13 @@
-using Content.Server.AlertLevel;
-using Content.Shared.Trigger;
+using Content.Shared.AlertLevel;
 using Content.Shared.Trigger.Components.Effects;
-using Content.Server.Station.Systems;
+using Content.Shared.Station;
 
-namespace Content.Server.Trigger.Systems;
+namespace Content.Shared.Trigger.Systems;
 
 public sealed partial class AlertLevelChangeOnTriggerSystem : EntitySystem
 {
-    [Dependency] private AlertLevelSystem _alertLevelSystem = default!;
-    [Dependency] private StationSystem _station = default!;
+    [Dependency] private AlertLevelSystem _alertLevel = default!;
+    [Dependency] private SharedStationSystem _station = default!;
 
     public override void Initialize()
     {
@@ -26,7 +25,13 @@ public sealed partial class AlertLevelChangeOnTriggerSystem : EntitySystem
         if (stationUid == null)
             return;
 
-        _alertLevelSystem.SetLevel(stationUid.Value, ent.Comp.Level, ent.Comp.PlaySound, ent.Comp.Announce, ent.Comp.Force);
+        _alertLevel.SetLevel(
+            stationUid.Value,
+            ent.Comp.Level,
+            playSound: ent.Comp.PlaySound,
+            announce: ent.Comp.Announce,
+            force: ent.Comp.Force);
+
         args.Handled = true;
     }
 }
diff --git a/Content.Shared/Wagging/WaggingComponent.cs b/Content.Shared/Wagging/WaggingComponent.cs
index 4173cb5173..c96884a265 100644
--- a/Content.Shared/Wagging/WaggingComponent.cs
+++ b/Content.Shared/Wagging/WaggingComponent.cs
@@ -1,38 +1,50 @@
 using Content.Shared.Body;
-using Content.Shared.Chat.Prototypes;
 using Content.Shared.Humanoid;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Wagging;
 
 /// <summary>
 /// An emoting wag for markings.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true)]
+[Access(typeof(WaggingSystem))]
 public sealed partial class WaggingComponent : Component
 {
-    [DataField]
+    /// <summary>
+    /// The prototype id of the wagging action.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public EntProtoId Action = "ActionToggleWagging";
 
-    [DataField]
+    /// <summary>
+    /// Reference to the action entity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public EntityUid? ActionEntity;
 
-    [DataField]
+    /// <summary>
+    /// The visual layer of the tail marking.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public HumanoidVisualLayers Layer = HumanoidVisualLayers.Tail;
 
-    [DataField]
+    /// <summary>
+    /// The organ category to which the tail is attached.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public ProtoId<OrganCategoryPrototype> Organ = "Torso";
 
     /// <summary>
-    /// Suffix to add to get the animated marking.
+    /// The suffix to add to get the animated marking.
     /// </summary>
+    [DataField, AutoNetworkedField]
     public string Suffix = "Animated";
 
     /// <summary>
-    /// Is the entity currently wagging.
+    /// Whether the entity is currently wagging.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool Wagging = false;
 }
diff --git a/Content.Server/Wagging/WaggingSystem.cs b/Content.Shared/Wagging/WaggingSystem.cs
similarity index 66%
rename from Content.Server/Wagging/WaggingSystem.cs
rename to Content.Shared/Wagging/WaggingSystem.cs
index 8aa401e571..7b227bedf7 100644
--- a/Content.Server/Wagging/WaggingSystem.cs
+++ b/Content.Shared/Wagging/WaggingSystem.cs
@@ -1,34 +1,26 @@
-using Content.Server.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Body;
 using Content.Shared.Cloning.Events;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Mobs;
 using Content.Shared.Toggleable;
-using Content.Shared.Wagging;
-using Robust.Shared.Prototypes;
+using JetBrains.Annotations;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Wagging;
+namespace Content.Shared.Wagging;
 
 /// <summary>
-/// Adds an action to toggle wagging animation for tails markings that supporting this
+/// Adds an action to toggle the wagging animation for tails markings that support it.
 /// </summary>
 public sealed partial class WaggingSystem : EntitySystem
 {
-    [Dependency] private ActionsSystem _actions = default!;
+    [Dependency] private SharedActionsSystem _actions = default!;
     [Dependency] private SharedVisualBodySystem _visualBody = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<WaggingComponent, MapInitEvent>(OnWaggingMapInit);
-        SubscribeLocalEvent<WaggingComponent, ComponentShutdown>(OnWaggingShutdown);
-        SubscribeLocalEvent<WaggingComponent, ToggleActionEvent>(OnWaggingToggle);
-        SubscribeLocalEvent<WaggingComponent, MobStateChangedEvent>(OnMobStateChanged);
-        SubscribeLocalEvent<WaggingComponent, CloningEvent>(OnCloning);
-    }
-
+    /// <summary>
+    /// Copies the component and its values to the clone.
+    /// </summary>
+    [SubscribeLocalEvent]
     private void OnCloning(Entity<WaggingComponent> ent, ref CloningEvent args)
     {
         if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
@@ -43,35 +35,64 @@ public sealed partial class WaggingSystem : EntitySystem
         AddComp(args.CloneUid, cloneComp, true);
     }
 
+    /// <summary>
+    /// Adds the wagging action during initialization.
+    /// </summary>
+    [SubscribeLocalEvent]
     private void OnWaggingMapInit(Entity<WaggingComponent> ent, ref MapInitEvent args)
     {
         _actions.AddAction(ent, ref ent.Comp.ActionEntity, ent.Comp.Action, ent);
+        DirtyField(ent.AsNullable(), nameof(WaggingComponent.ActionEntity));
     }
 
+    /// <summary>
+    /// Removes the wagging action during shutdown.
+    /// </summary>
+    [SubscribeLocalEvent]
     private void OnWaggingShutdown(Entity<WaggingComponent> ent, ref ComponentShutdown args)
     {
         _actions.RemoveAction(ent.Owner, ent.Comp.ActionEntity);
     }
 
+    /// <summary>
+    /// Attempts to toggle the wagging action.
+    /// </summary>
+    [SubscribeLocalEvent]
     private void OnWaggingToggle(Entity<WaggingComponent> ent, ref ToggleActionEvent args)
     {
         if (args.Handled)
             return;
 
-        TryToggleWagging(ent.AsNullable());
+        if (!TryToggleWagging(ent.AsNullable()))
+            return;
+
+        args.Handled = true;
     }
 
+    /// <summary>
+    /// Tries to disable wagging when the mob state changes.
+    /// </summary>
+    [SubscribeLocalEvent]
     private void OnMobStateChanged(Entity<WaggingComponent> ent, ref MobStateChangedEvent args)
     {
-        if (ent.Comp.Wagging)
-            TryToggleWagging(ent.AsNullable());
+        TryToggleWagging(ent.AsNullable(), false);
     }
 
-    private bool TryToggleWagging(Entity<WaggingComponent?> ent)
+    /// <summary>
+    /// If <see cref="desired"/> provided - attempts to set wagging to it, otherwise tries to toggle wagging.
+    /// </summary>
+    /// <param name="ent">The entity to toggle.</param>
+    /// <param name="desired">The desired wagging state.</param>
+    /// <returns>Whether wagging was toggled.</returns>
+    [PublicAPI]
+    public bool TryToggleWagging(Entity<WaggingComponent?> ent, bool? desired = null)
     {
         if (!Resolve(ent, ref ent.Comp))
             return false;
 
+        if (desired == ent.Comp.Wagging)
+            return false;
+
         if (!_visualBody.TryGatherMarkingsData(ent.Owner,
                 [ent.Comp.Layer],
                 out _,
@@ -85,14 +106,15 @@ public sealed partial class WaggingSystem : EntitySystem
             return false;
 
         ent.Comp.Wagging = !ent.Comp.Wagging;
+        DirtyField(ent, nameof(WaggingComponent.Wagging));
 
         markingsSet = markingsSet.ShallowClone();
-        foreach (var (layers, markings) in markingsSet)
+        foreach (var (layers, _) in markingsSet)
         {
             markingsSet[layers] = markingsSet[layers].ShallowClone();
             var layerMarkings = markingsSet[layers];
 
-            for (int i = 0; i < layerMarkings.Count; i++)
+            for (var i = 0; i < layerMarkings.Count; i++)
             {
                 var currentMarkingId = layerMarkings[i].MarkingId;
                 string newMarkingId;
@@ -128,6 +150,7 @@ public sealed partial class WaggingSystem : EntitySystem
         {
             [ent.Comp.Organ] = markingsSet
         });
+
         return true;
     }
 }
diff --git a/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactComponent.cs b/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactComponent.cs
index ce037c7c2e..144dccc546 100644
--- a/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Artifact/Components/XenoArtifactComponent.cs
@@ -166,6 +166,30 @@ public sealed partial class XenoArtifactComponent : Component
     /// </summary>
     [DataField]
     public EntProtoId<InstantActionComponent> SelfActivateAction = "ActionArtifactActivate";
+
+    /// <summary>
+    /// Message shown on artifact unlock beginning.
+    /// </summary>
+    [DataField]
+    public LocId? UnlockBeginMsg = "artifact-unlock-state-begin";
+
+    /// <summary>
+    /// Message shown on trigger being applied successfully whilst the artifact is unlocking.
+    /// </summary>
+    [DataField]
+    public LocId? UnlockContinueMsg = "artifact-unlock-state-continue";
+
+    /// <summary>
+    /// Message shown on artifact unlocking ending successfully.
+    /// </summary>
+    [DataField]
+    public LocId? UnlockSuccessMsg = "artifact-unlock-state-end-success";
+
+    /// <summary>
+    /// Message shown on artifact unlocking ending with failure.
+    /// </summary>
+    [DataField]
+    public LocId? UnlockFailureMsg = "artifact-unlock-state-end-failure";
 }
 
 /// <summary>
diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs
index e521e93a4e..b2be023a83 100644
--- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs
+++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs
@@ -65,7 +65,7 @@ public abstract partial class SharedXenoArtifactSystem
     /// </summary>
     public void FinishUnlockingState(Entity<XenoArtifactUnlockingComponent, XenoArtifactComponent> ent)
     {
-        string unlockAttemptResultMsg;
+        string? unlockAttemptResultMsg;
         XenoArtifactComponent artifactComponent = ent;
         XenoArtifactUnlockingComponent unlockingComponent = ent;
 
@@ -74,7 +74,7 @@ public abstract partial class SharedXenoArtifactSystem
         {
             SetNodeUnlocked((ent, artifactComponent), node.Value);
             ActivateNode((ent, ent), (node.Value, node.Value), null, null, Transform(ent).Coordinates, false);
-            unlockAttemptResultMsg = "artifact-unlock-state-end-success";
+            unlockAttemptResultMsg = artifactComponent.UnlockSuccessMsg;
 
             // as an experiment - unlocking node doesn't activate it, activation is left for player to decide.
             // var activated = ActivateNode((ent, artifactComponent), node.Value, null, null, Transform(ent).Coordinates, false);
@@ -83,13 +83,15 @@ public abstract partial class SharedXenoArtifactSystem
         }
         else
         {
-            unlockAttemptResultMsg = "artifact-unlock-state-end-failure";
+            unlockAttemptResultMsg = artifactComponent.UnlockFailureMsg;
             soundEffect = unlockingComponent.UnlockActivationFailedSound;
         }
 
         if (_net.IsServer)
         {
-            _popup.PopupEntity(Loc.GetString(unlockAttemptResultMsg), ent);
+            if (unlockAttemptResultMsg != null)
+                _popup.PopupEntity(Loc.GetString(unlockAttemptResultMsg), ent);
+
             _audio.PlayPvs(soundEffect, ent.Owner);
         }
 
diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAT.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAT.cs
index 4d9e2e6df4..e8573d2a2a 100644
--- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAT.cs
+++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAT.cs
@@ -70,8 +70,9 @@ public abstract partial class SharedXenoArtifactSystem
             unlockingComp.EndTime = _timing.CurTime + ent.Comp.UnlockStateDuration;
             Log.Debug($"{ToPrettyString(ent)} entered unlocking state");
 
-            if (_net.IsServer)
-                _popup.PopupEntity(Loc.GetString("artifact-unlock-state-begin"), ent);
+            if (ent.Comp.UnlockBeginMsg != null)
+                _popup.PopupEntity(Loc.GetString(ent.Comp.UnlockBeginMsg), ent);
+
             Dirty(ent);
         }
         else if (node != null)
@@ -87,6 +88,9 @@ public abstract partial class SharedXenoArtifactSystem
                )
                 // we add time on each new trigger, if it is not going to fail us
                 unlockingComp.EndTime += ent.Comp.UnlockStateIncrementPerNode;
+
+            if (ent.Comp.UnlockContinueMsg != null)
+                _popup.PopupEntity(Loc.GetString(ent.Comp.UnlockContinueMsg), ent);
         }
 
         if (node != null && unlockingComp.TriggeredNodeIndexes.Add(GetIndex(ent, node.Value)))
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2c899faf6b..39faa92f08 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4050,18 +4050,11 @@ Entries:
   id: 9734
   time: '2026-06-02T01:31:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44210
-- author: Princess-Cheeseballs
-  changes:
-  - message: Explosive resistance now stacks with other damage resistances.
-    type: Tweak
-  id: 9735
-  time: '2026-06-02T03:02:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/40090
 - author: YoungThugSS14
   changes:
   - message: Organs are edible again
     type: Fix
-  id: 9736
+  id: 9735
   time: '2026-06-02T04:23:18.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44197
 - author: ScarKy0
@@ -4069,14 +4062,14 @@ Entries:
   - message: The "Crit Anomalies" objective will now correctly randomize the number
       of anomalies to crit.
     type: Fix
-  id: 9737
+  id: 9736
   time: '2026-06-03T19:22:13.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44228
 - author: matriotic
   changes:
   - message: Added drum kit. It can be ordered in cargo for 1500 spesos.
     type: Add
-  id: 9738
+  id: 9737
   time: '2026-06-04T17:50:48.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42987
 - author: portfiend
@@ -4090,252 +4083,252 @@ Entries:
       to do so. The only mobs that should need meatspiking to butcher are humanoid
       species, monkeys, kobolds, scurrets, and xenos.
     type: Fix
-  id: 9739
+  id: 9738
   time: '2026-06-04T21:18:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44225
 - author: maland1
   changes:
   - message: Updated Traitor guidebook to properly describe uplinks.
     type: Tweak
-  id: 9740
+  id: 9739
   time: '2026-06-04T22:38:24.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44240
 - author: PJB3005
   changes:
   - message: Ghosts can now click a follow button next to chat messages to jump there immediately! Can be turned off in settings.
     type: Add
-  id: 9741
+  id: 9740
   time: '2026-06-12T16:19:35.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44284
 - author: riccardi48
   changes:
   - message: Force gun's sprite now changes on use
     type: Fix
-  id: 9742
+  id: 9741
   time: '2026-06-15T17:27:47.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/14
 - author: jessicamaybe
   changes:
   - message: Removed the action from winter coats. You can still use the verb to toggle them.
     type: Remove
-  id: 9743
+  id: 9742
   time: '2026-06-15T22:17:21.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/24
 - author: riccardi48
   changes:
   - message: Fixed modifier color for plant metabolism effects
     type: Fix
-  id: 9744
+  id: 9743
   time: '2026-06-15T22:32:18.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/13
 - author: whatston3
   changes:
   - message: Moproaches will now properly clean up spills, and spider bites carry toxin again.
     type: Fix
-  id: 9745
+  id: 9744
   time: '2026-06-16T00:46:10.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/41
 - author: mnva0
   changes:
   - message: Scarves now help insulate from cold temperatures. This is equivalent to the protection of winter boots.
     type: Tweak
-  id: 9746
+  id: 9745
   time: '2026-06-16T10:11:47.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/47
 - author: ScarKy0
   changes:
   - message: Handheld Mortars and Juicers now work again.
     type: Fix
-  id: 9747
+  id: 9746
   time: '2026-06-16T23:55:43.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/50
 - author: chromiumboy
   changes:
   - message: Things travelling long distances through the disposal network should no longer cause disposal pipes to spontaneously unanchor, unless they are genuinely trapped in a loop.
     type: Fix
-  id: 9748
+  id: 9747
   time: '2026-06-17T14:28:11.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/3
 - author: kontakt
   changes:
   - message: Borgs no long destroy their posi when engaging martyr module.
     type: Fix
-  id: 9749
+  id: 9748
   time: '2026-06-18T02:55:28.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/84
 - author: riccardi48
   changes:
   - message: Fixed a bug which prevented departments from canceling their own orders from their departments request console
     type: Fix
-  id: 9750
+  id: 9749
   time: '2026-06-18T21:16:10.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/11
 - author: riccardi48
   changes:
   - message: The approval section on order labels will now be filled out correctly.
     type: Fix
-  id: 9751
+  id: 9750
   time: '2026-06-18T22:40:33.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/15
 - author: rumaks-xyz
   changes:
   - message: Tasers are no longer available in security lockers
     type: Remove
-  id: 9752
+  id: 9751
   time: '2026-06-19T02:01:18.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/67
 - author: jessicamaybe
   changes:
   - message: Ambient music should now play in their proper locations
     type: Fix
-  id: 9753
+  id: 9752
   time: '2026-06-19T02:51:42.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/28
 - author: YoungThugSS14
   changes:
   - message: The Wand of Entrance is no longer in the random magic item spell pool, note the Staff of Entrance is.
     type: Tweak
-  id: 9754
+  id: 9753
   time: '2026-06-19T10:01:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43933
 - author: iaada
   changes:
   - message: Atmospheric entities have been given their own category in the construction menu filter.
     type: Add
-  id: 9755
+  id: 9754
   time: '2026-06-20T02:04:31.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/94
 - author: RemFexxel
   changes:
   - message: Edited Space Law for better readability.
     type: Tweak
-  id: 9756
+  id: 9755
   time: '2026-06-20T13:50:49.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/1
 - author: ThatGuyUSA
   changes:
   - message: Fixed janitorial winter coat in-hand sprite.
     type: Fix
-  id: 9757
+  id: 9756
   time: '2026-06-20T14:47:54.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/128
 - author: insoPL
   changes:
   - message: Directional arrows were added to recyclers
     type: Add
-  id: 9758
+  id: 9757
   time: '2026-06-20T22:03:52.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/118
 - author: Festivite
   changes:
   - message: Fixed an inconsistent lighter outline coloring on the HOP's job icon.
     type: Fix
-  id: 9759
+  id: 9758
   time: '2026-06-21T19:04:30.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44292
 - author: ArtisticRoomba
   changes:
   - message: Filled foolboxes have slightly less items in them, as there was a chance to overfill the box and spawn an item outside of it.
     type: Tweak
-  id: 9760
+  id: 9759
   time: '2026-06-21T21:09:18.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44134
 - author: whatston3
   changes:
   - message: The ID card console now correctly sets and clears accesses that any privileged ID has, and respects existing accesses the console cannot set.
     type: Fix
-  id: 9761
+  id: 9760
   time: '2026-06-21T23:23:19.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44016
 - author: murolem
   changes:
   - message: Added recipe history to the construction menu.
     type: Add
-  id: 9762
+  id: 9761
   time: '2026-06-22T15:04:31.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/8
 - author: korczoczek
   changes:
   - message: When slicing something inside a container, the resultant slices will now fill out the space where the whole food item used to be instead of dropping onto the floor
     type: Tweak
-  id: 9763
+  id: 9762
   time: '2026-06-22T23:11:50.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/160
 - author: insoPL
   changes:
   - message: Virtual items can not longer be ejected from cryo
     type: Fix
-  id: 9764
+  id: 9763
   time: '2026-06-23T17:00:19.0000000+00:00'
   url: https://github.com/space-wizards-federation/space-station-14/pull/175
 - author: riccardi48
   changes:
   - message: Tabletop piece moving is now predicted correctly
     type: Fix
-  id: 9765
+  id: 9764
   time: '2026-06-27T11:34:50.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44348
 - author: ketufaispikinut
   changes:
   - message: Mailing unit has been resprited.
     type: Tweak
-  id: 9766
+  id: 9765
   time: '2026-06-27T15:21:15.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44350
 - author: metalgearsloth
   changes:
   - message: AFK users will now be kicked. Before the kick a window will popup to mark that they're not AFK.
     type: Add
-  id: 9767
+  id: 9766
   time: '2026-06-28T04:32:13.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44353
 - author: Samuka-C
   changes:
   - message: RD's teleporter can no longer be used to create portals in different grids by placing both portals in the same grid then spliting the grid.
     type: Fix
-  id: 9768
+  id: 9767
   time: '2026-06-28T05:05:58.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44360
 - author: Xeri7
   changes:
   - message: Made Sprite Fade only happen when there is something there.
     type: Tweak
-  id: 9769
+  id: 9768
   time: '2026-06-29T06:11:38.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37907
 - author: eoineoineoin
   changes:
   - message: Fixed bug where APCs could turn on during a station power-off event
     type: Fix
-  id: 9770
+  id: 9769
   time: '2026-06-29T11:37:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/32130
 - author: DevArchwave
   changes:
   - message: Construction ghosts of pipes and some other things should display correctly again.
     type: Fix
-  id: 9771
+  id: 9770
   time: '2026-06-29T12:22:14.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44086
 - author: ThatGuyUSA
   changes:
   - message: Holoparasites and their injectors are now predicted.
     type: Tweak
-  id: 9772
+  id: 9771
   time: '2026-06-29T21:25:47.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43519
 - author: whatston3
   changes:
   - message: Cows, pigs and goats can eat just about anything again.
     type: Fix
-  id: 9773
+  id: 9772
   time: '2026-06-29T21:30:12.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44427
 - author: Centronias
   changes:
   - message: The "emergency EVA suit" and "paramedic void suit" once again have actions to toggle their helmets, like hardsuits.
     type: Fix
-  id: 9774
+  id: 9773
   time: '2026-06-29T22:06:53.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44425
 - author: Ewanderer
@@ -4344,35 +4337,35 @@ Entries:
     type: Add
   - message: Ammonia now needs heat to synthesize!
     type: Tweak
-  id: 9775
+  id: 9774
   time: '2026-06-30T07:57:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43736
 - author: ketufaispikinut
   changes:
   - message: Player zombies become ghost roles too.
     type: Tweak
-  id: 9776
+  id: 9775
   time: '2026-06-30T18:51:13.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43905
 - author: themias
   changes:
   - message: Popup messages for welders and lighters show the correct item name
     type: Fix
-  id: 9777
+  id: 9776
   time: '2026-06-30T20:47:43.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44121
 - author: IntegerTempest
   changes:
   - message: Various aggressive mobs and critters now can see in the dark.
     type: Add
-  id: 9778
+  id: 9777
   time: '2026-06-30T21:36:18.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39403
 - author: AndrewFenriz
   changes:
   - message: Tether Guns and Force Guns are now crafted without a pre-installed battery
     type: Tweak
-  id: 9779
+  id: 9778
   time: '2026-07-01T01:15:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43936
 - author: ZigTag
@@ -4381,42 +4374,42 @@ Entries:
     type: Add
   - message: Game now supports having multiple voice sets per species
     type: Tweak
-  id: 9780
+  id: 9779
   time: '2026-07-01T03:46:28.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40593
 - author: psykana
   changes:
   - message: Speedloaders now update revolver chambers correctly.
     type: Fix
-  id: 9781
+  id: 9780
   time: '2026-07-01T05:22:51.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43259
 - author: LordKnish
   changes:
   - message: Revenant ability icons now fill their action buttons.
     type: Fix
-  id: 9782
+  id: 9781
   time: '2026-07-01T05:41:13.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44258
 - author: evrys
   changes:
   - message: Fixed "point at location" binding so it can be used on inventory items too
     type: Fix
-  id: 9783
+  id: 9782
   time: '2026-07-01T06:57:39.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43747
 - author: Centronias
   changes:
   - message: The Smartfridge's sprite now properly reflects whether or not the fridge is powered.
     type: Fix
-  id: 9784
+  id: 9783
   time: '2026-07-01T08:07:19.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43917
 - author: qwerltaz
   changes:
   - message: Chat highlights now highlight your name again.
     type: Fix
-  id: 9785
+  id: 9784
   time: '2026-07-01T08:39:51.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43911
 - author: ProPeperos
@@ -4425,221 +4418,212 @@ Entries:
     type: Add
   - message: Instrument from cargo has been tweaked and reduced in price
     type: Tweak
-  id: 9786
+  id: 9785
   time: '2026-07-01T11:03:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43949
 - author: notquitehadouken
   changes:
   - message: Revenants no longer collide with regular ghosts.
     type: Fix
-  id: 9787
+  id: 9786
   time: '2026-07-01T21:18:47.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42869
 - author: B-Kirill
   changes:
   - message: Electrified objects, such as airlocks, now properly shock when activated via world activation hotkey.
     type: Fix
-  id: 9788
+  id: 9787
   time: '2026-07-02T02:47:26.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42657
 - author: jessicamaybe
   changes:
   - message: Ghost warp to most followed works again
     type: Fix
-  id: 9789
+  id: 9788
   time: '2026-07-02T04:53:31.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44464
-- author: insoPL
-  changes:
-  - message: Borgs drop some steel and scrap electronics when gibbed
-    type: Tweak
-  - message: Borgs now drop their hats when gibbed
-    type: Fix
-  id: 9790
-  time: '2026-07-02T09:20:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/42439
 - author: ProPeperos
   changes:
   - message: You can no longer rotate stairs
     type: Fix
   - message: You can no longer rotate catwalks
     type: Fix
-  id: 9791
+  id: 9789
   time: '2026-07-02T19:27:05.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44471
 - author: CrimsonVengeance
   changes:
   - message: Fixed OrganBaseTorso to be Inedible.
     type: Fix
-  id: 9792
+  id: 9790
   time: '2026-07-02T21:41:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44300
 - author: Samuka-C
   changes:
   - message: Unanchored gas miners no longer say they are active when in fact they are not.
     type: Fix
-  id: 9793
+  id: 9791
   time: '2026-07-02T22:35:28.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44394
 - author: murolem
   changes:
   - message: Added randomizer lock buttons to the character editor screen. The buttons allow you to lock selected values when when randomizing (for example - species).
     type: Add
-  id: 9794
+  id: 9792
   time: '2026-07-02T23:56:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44363
 - author: Samuka-C
   changes:
   - message: Fix not moving in the direction you were walking after slipping.
     type: Fix
-  id: 9795
+  id: 9793
   time: '2026-07-03T02:49:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44478
 - author: Nem
   changes:
   - message: Ending an expedition early by jumping to the expedition again will no longer drop you on the Nukie planet map.
     type: Fix
-  id: 9796
+  id: 9794
   time: '2026-07-03T09:22:23.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44482
 - author: Verbalase
   changes:
   - message: Minor change in the rules about grammar.
     type: Tweak
-  id: 9797
+  id: 9795
   time: '2026-07-03T13:04:57.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44477
 - author: ScarKy0
   changes:
   - message: Ghost pointlight has been replaced by a new half-bright mode.
     type: Tweak
-  id: 9798
+  id: 9796
   time: '2026-07-03T13:40:10.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44442
 - author: Krunklehorn
   changes:
   - message: Mobs that don't have hands can once again exit closed containers.
     type: Fix
-  id: 9799
+  id: 9797
   time: '2026-07-04T03:43:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37250
 - author: themias
   changes:
   - message: The space dragon's fire breath now plays its sound.
     type: Fix
-  id: 9800
+  id: 9798
   time: '2026-07-04T19:51:50.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43539
 - author: sudobeans
   changes:
   - message: Main guidebook window doen't reset when re-opened.
     type: Tweak
-  id: 9801
+  id: 9799
   time: '2026-07-04T22:30:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37235
 - author: c4llv07e
   changes:
   - message: Fixed character selection bug when sometimes spawning with different characters!
     type: Fix
-  id: 9802
+  id: 9800
   time: '2026-07-05T14:15:05.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39382
 - author: ScarKy0
   changes:
   - message: Wearing critters on your head no longer grants nightvision.
     type: Fix
-  id: 9803
+  id: 9801
   time: '2026-07-05T15:35:29.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44501
 - author: Samuka-C
   changes:
   - message: All shotguns, the Hristov, and the PKA now feature custom ammo counters.
     type: Add
-  id: 9804
+  id: 9802
   time: '2026-07-05T15:51:39.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44476
 - author: SlamBamActionman
   changes:
   - message: Dwarves are now shortened via sprite displacement, rather than being scaled.
     type: Tweak
-  id: 9805
+  id: 9803
   time: '2026-07-05T22:34:43.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43816
 - author: Samuka-C
   changes:
   - message: Added a accessibility option to remove the noise from night vision overlay.
     type: Add
-  id: 9806
+  id: 9804
   time: '2026-07-06T12:57:59.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44526
 - author: SlamBamActionman
   changes:
   - message: Grids and wrecks in space can now be pulled using a grappling hook while wearing magboots/being rooted.
     type: Add
-  id: 9807
+  id: 9805
   time: '2026-07-06T13:46:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43746
 - author: sowelipililimute
   changes:
   - message: Reagents now display a textual description of their colour when inspected, for colourblind people
     type: Add
-  id: 9808
+  id: 9806
   time: '2026-07-07T03:09:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38789
 - author: sowelipililimute
   changes:
   - message: Added a table of contents to each guidebook entry
     type: Add
-  id: 9809
+  id: 9807
   time: '2026-07-07T03:09:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/35316
 - author: spderman3333
   changes:
   - message: Fixed characters exceeding the maximum character limit not being able to be deleted.
     type: Fix
-  id: 9810
+  id: 9808
   time: '2026-07-08T13:11:24.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44558
 - author: 0-Anon
   changes:
   - message: Added another source of chlorine and mercury in the form of centrifuging pest killer.
     type: Add
-  id: 9811
+  id: 9809
   time: '2026-07-09T00:53:23.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43725
 - author: ScarKy0
   changes:
   - message: Mortar and pestle & handheld juicer audio will no longer loop endlessly.
     type: Fix
-  id: 9812
+  id: 9810
   time: '2026-07-09T16:37:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44574
 - author: mqole
   changes:
   - message: Reduced motion effect options have been moved to their own checkboxes. You might need to adjust your settings!
     type: Tweak
-  id: 9813
+  id: 9811
   time: '2026-07-09T16:45:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44589
 - author: psykana
   changes:
   - message: Nuclear operatives no longer get a minor win just for surviving. If crew escapes, winner is decided based on the location of the disk.
     type: Tweak
-  id: 9814
+  id: 9812
   time: '2026-07-09T20:52:30.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39715
 - author: AftrLite
   changes:
   - message: Removed straps from backpack sprites
     type: Tweak
-  id: 9815
+  id: 9813
   time: '2026-07-10T02:23:11.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44583
 - author: CroilBird
   changes:
   - message: Canister valve logs now only show gases that were present in the canister mixture.
     type: Tweak
-  id: 9816
+  id: 9814
   time: '2026-07-10T13:00:29.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44598
 - author: Princess-Cheeseballs
@@ -4652,35 +4636,35 @@ Entries:
     type: Tweak
   - message: Sliceable foods now properly retain their parent reagent's contents
     type: Fix
-  id: 9817
+  id: 9815
   time: '2026-07-10T19:51:20.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44087
 - author: MilenVolf
   changes:
   - message: Recycling jackboots / high heels / combat boots with items inside now will drop them instead of deleting.
     type: Fix
-  id: 9818
+  id: 9816
   time: '2026-07-10T20:04:27.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44486
 - author: Krunklehorn
   changes:
   - message: Gyroscopes now throttle down on smaller shuttles, making them much easier to use.
     type: Add
-  id: 9819
+  id: 9817
   time: '2026-07-11T04:23:59.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37419
 - author: slarticodefast
   changes:
   - message: Fixed multiple popups revealing the player's identity if it is hidden.
     type: Fix
-  id: 9820
+  id: 9818
   time: '2026-07-11T14:28:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44572
 - author: B_Kirill
   changes:
   - message: Fixed client mispredicts when moving multiple items into or out of storage at once.
     type: Fix
-  id: 9821
+  id: 9819
   time: '2026-07-11T14:43:03.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44612
 - author: insoPL
@@ -4689,42 +4673,42 @@ Entries:
     type: Tweak
   - message: Borgs no longer drop default modules on gib
     type: Tweak
-  id: 9822
+  id: 9820
   time: '2026-07-11T16:56:43.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43876
 - author: Crotalus
   changes:
   - message: Add filtering / sorting support to end of round player manifest
     type: Tweak
-  id: 9823
+  id: 9821
   time: '2026-07-11T20:49:43.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39165
 - author: Ewanderer
   changes:
   - message: You can no longer blow yourself up with the micro bomb implant while pacified.
     type: Tweak
-  id: 9824
+  id: 9822
   time: '2026-07-11T22:09:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44198
 - author: Coolsurf6
   changes:
   - message: Removed liquid gas canisters from being purchased by Cargo.
     type: Remove
-  id: 9825
+  id: 9823
   time: '2026-07-12T21:02:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44587
 - author: B_Kirill
   changes:
   - message: Fixed hand labeler showing "Removed label successfully" when there was no label to remove.
     type: Fix
-  id: 9826
+  id: 9824
   time: '2026-07-13T06:27:40.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44630
 - author: SPCR
   changes:
   - message: Fixed beards showing through helmets
     type: Fix
-  id: 9827
+  id: 9825
   time: '2026-07-13T08:06:02.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44599
 - author: TriviaSolari
@@ -4733,14 +4717,14 @@ Entries:
     type: Add
   - message: The "Long Over Eye" and "Very Long Over Eye" human hairstyles now have an optional highlight stripe.
     type: Tweak
-  id: 9828
+  id: 9826
   time: '2026-07-13T08:19:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44111
 - author: Hitlinemoss
   changes:
   - message: The Viper and Pulse Carbine now default to full-auto mode.
     type: Tweak
-  id: 9829
+  id: 9827
   time: '2026-07-13T10:24:12.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42830
 - author: slarticodefast, psykana
@@ -4753,44 +4737,37 @@ Entries:
     type: Fix
   - message: Fixed rigged stunbatons exploding if you look at them funny.
     type: Fix
-  id: 9830
+  id: 9828
   time: '2026-07-13T18:38:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43117
 - author: M4rchy-S
   changes:
   - message: Smart Fridge UI could show empty items when it is not
     type: Fix
-  id: 9831
+  id: 9829
   time: '2026-07-13T18:45:51.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44648
 - author: murolem
   changes:
   - message: Added two new teleport buttons to the ghost warp screen - warp to Random and warp to Random Followed. Triple the warp!
     type: Add
-  id: 9832
+  id: 9830
   time: '2026-07-13T20:41:45.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44499
 - author: Hitlinemoss
   changes:
   - message: Senior courier ID cards now have a unique sprite, as with other senior ID cards.
     type: Fix
-  id: 9833
+  id: 9831
   time: '2026-07-13T22:22:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41842
-- author: B_Kirill
-  changes:
-  - message: 'Added new not fun meteors variations: flesh and kudzu meteors.'
-    type: Add
-  id: 9834
-  time: '2026-07-14T03:55:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37716
 - author: AsnDen
   changes:
   - message: Faxes now are visually turned off when there is no power
     type: Fix
   - message: Faxes are colored again
     type: Fix
-  id: 9835
+  id: 9832
   time: '2026-07-14T05:19:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38387
 - author: Princess-Cheeseballs
@@ -4799,28 +4776,28 @@ Entries:
     type: Tweak
   - message: Many lesser used shields have had their health increased, but are now worse at blocking damage.
     type: Tweak
-  id: 9836
+  id: 9833
   time: '2026-07-14T12:14:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44628
 - author: TiniestShark
   changes:
   - message: Vox hardsuits now have added tail states and properly hide a Vox's tail when in use.
     type: Add
-  id: 9837
+  id: 9834
   time: '2026-07-14T16:24:02.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42704
 - author: SlamBamActionman
   changes:
   - message: Grappling hooks no longer move grids if both the hook and user are on the same grid.
     type: Fix
-  id: 9838
+  id: 9835
   time: '2026-07-14T16:48:28.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44564
 - author: whatston3
   changes:
   - message: Constructed lights and cameras now must be placed against a wall.
     type: Add
-  id: 9839
+  id: 9836
   time: '2026-07-14T21:15:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44669
 - author: TriviaSolari
@@ -4831,189 +4808,189 @@ Entries:
     type: Add
   - message: Silicons can now select multiple laws to announce at once, with a randomized delay between each message
     type: Tweak
-  id: 9840
+  id: 9837
   time: '2026-07-15T03:04:04.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42806
 - author: Crude Oil
   changes:
   - message: Fixed crawl slowdown remaining after standing up
     type: Fix
-  id: 9841
+  id: 9838
   time: '2026-07-15T13:29:45.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44683
 - author: Hitlinemoss
   changes:
   - message: Unknown shuttles and most antagonist ghostroles no longer spawn while the evac shuttle is inbound, docked, or in transit.
     type: Tweak
-  id: 9842
+  id: 9839
   time: '2026-07-15T14:11:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42196
 - author: SlamBamActionman
   changes:
   - message: Glue and lube now apply their effects immediately when used on a held item.
     type: Tweak
-  id: 9843
+  id: 9840
   time: '2026-07-16T15:31:45.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44552
 - author: ketufaispikinut
   changes:
   - message: Player-controlled zombies no longer show up in the ghost role menu.
     type: Fix
-  id: 9844
+  id: 9841
   time: '2026-07-16T18:51:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44691
 - author: Crude Oil
   changes:
   - message: Skeletons rattle when screaming again
     type: Fix
-  id: 9845
+  id: 9842
   time: '2026-07-16T20:19:04.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44689
 - author: mirrorcult
   changes:
   - message: Doafter progress bar animation now has a fade in & fade out
     type: Tweak
-  id: 9846
+  id: 9843
   time: '2026-07-16T22:14:20.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44701
 - author: B_Kirill
   changes:
   - message: Fixed puddles not being removed when tile changes to lattice.
     type: Fix
-  id: 9847
+  id: 9844
   time: '2026-07-17T04:53:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44715
 - author: psykana
   changes:
   - message: Station announcements are now also audible on the hull of the station
     type: Fix
-  id: 9848
+  id: 9845
   time: '2026-07-17T05:06:38.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44686
 - author: Hitlinemoss
   changes:
   - message: Most job descriptions in the Loadout menu have been adjusted for added clarity.
     type: Tweak
-  id: 9849
+  id: 9846
   time: '2026-07-17T05:20:29.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44646
 - author: Princess-Cheeseballs
   changes:
   - message: Shields that are deactivated no longer block damage
     type: Fix
-  id: 9850
+  id: 9847
   time: '2026-07-17T07:20:32.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44700
 - author: ProPeperos
   changes:
   - message: Signs and posters no longer display "unanchored" message
     type: Fix
-  id: 9851
+  id: 9848
   time: '2026-07-17T15:01:51.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44491
 - author: YoungThugSS14
   changes:
   - message: Holoparasites now play a sound when released.
     type: Tweak
-  id: 9852
+  id: 9849
   time: '2026-07-17T15:06:44.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44703
 - author: MidZik
   changes:
   - message: Shimmer effect on an invisible ninja, stealth cardboard box, and invisible crate is now much subtler.
     type: Tweak
-  id: 9853
+  id: 9850
   time: '2026-07-17T16:41:29.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/35575
 - author: Steffo99
   changes:
   - message: Improved the graphics of Space Villain!
     type: Tweak
-  id: 9854
+  id: 9851
   time: '2026-07-17T16:50:08.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40963
 - author: Steffo99
   changes:
   - message: Added functionality to the LMTR wire of Space Villain!
     type: Add
-  id: 9855
+  id: 9852
   time: '2026-07-17T17:03:11.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40961
 - author: ProPeperos
   changes:
   - message: Fire alarms are now placed closer to the side of the wall
     type: Tweak
-  id: 9856
+  id: 9853
   time: '2026-07-17T18:43:00.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44707
 - author: jessicamaybe
   changes:
   - message: Space music no longer plays if you are a ghost
     type: Tweak
-  id: 9857
+  id: 9854
   time: '2026-07-17T19:25:04.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44696
 - author: ProPeperos
   changes:
   - message: Thrusters no longer have a bit of a pipe sticking out of them
     type: Tweak
-  id: 9858
+  id: 9855
   time: '2026-07-17T19:25:43.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44731
 - author: muburu
   changes:
   - message: Slimepeople can change their eye color again.
     type: Fix
-  id: 9859
+  id: 9856
   time: '2026-07-17T21:22:29.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44508
 - author: whatston3
   changes:
   - message: Batches of mail are no longer addressed to just one person.
     type: Fix
-  id: 9860
+  id: 9857
   time: '2026-07-17T22:11:39.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44728
 - author: mrhappypenguin
   changes:
   - message: Added option to toggle head-related transfer function (HRTF) audio.
     type: Add
-  id: 9861
+  id: 9858
   time: '2026-07-17T23:46:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44187
 - author: Bef1234
   changes:
   - message: Adjusted 80s Hair to be consistent
     type: Tweak
-  id: 9862
+  id: 9859
   time: '2026-07-18T02:15:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43854
 - author: cashew-42
   changes:
   - message: Fixed metamorphic glass not displaying drink names.
     type: Fix
-  id: 9863
+  id: 9860
   time: '2026-07-18T03:14:31.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44741
 - author: whatston3
   changes:
   - message: Revenants are now teleported by portals on collision, and can traverse through portals via alt-click/right-click.
     type: Add
-  id: 9864
+  id: 9861
   time: '2026-07-18T03:44:30.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44457
 - author: noxypaws
   changes:
   - message: Added a fretless bass guitar instrument
     type: Add
-  id: 9865
+  id: 9862
   time: '2026-07-18T04:04:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43996
 - author: peaceful-joules
   changes:
   - message: Fixed some device having wrong sprites after reconnecting
     type: Fix
-  id: 9866
+  id: 9863
   time: '2026-07-18T04:11:30.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44708
 - author: Princess-Cheeseballs
@@ -5022,56 +4999,56 @@ Entries:
     type: Tweak
   - message: Skeletons are now flammable.
     type: Tweak
-  id: 9867
+  id: 9864
   time: '2026-07-18T04:25:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43730
 - author: AgentSmithRadio
   changes:
   - message: Rebalanced the contents of the Getmore Bakemore crate.
     type: Tweak
-  id: 9868
+  id: 9865
   time: '2026-07-18T05:03:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42296
 - author: andersonhunter
   changes:
   - message: Removed damage from toy swords
     type: Tweak
-  id: 9869
+  id: 9866
   time: '2026-07-18T05:07:30.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43110
 - author: puwa-puwa
   changes:
   - message: Lockable machines (such as emitters) must now be unlocked before being deconstructed
     type: Tweak
-  id: 9870
+  id: 9867
   time: '2026-07-18T05:16:45.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43099
 - author: AndrewFenriz, EmoGarbage404
   changes:
   - message: Added wheelchairs and the janicart. Coming to a station near you!
     type: Add
-  id: 9871
+  id: 9868
   time: '2026-07-18T18:17:29.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43527
 - author: whatston3
   changes:
   - message: The ore processor produces the correct amount of refined material when smelting in batches.
     type: Fix
-  id: 9872
+  id: 9869
   time: '2026-07-18T19:11:15.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44753
 - author: iaada
   changes:
   - message: The agent ID has a new UI.
     type: Tweak
-  id: 9873
+  id: 9870
   time: '2026-07-18T20:06:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39769
 - author: Hitlinemoss
   changes:
   - message: More names have been added to the pool of random names for borgs, dragons, the station AI, syndicate agents, and xenoborgs.
     type: Add
-  id: 9874
+  id: 9871
   time: '2026-07-18T21:52:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44251
 - author: Hitlinemoss
@@ -5080,30 +5057,23 @@ Entries:
     type: Add
   - message: Canes have been moved from the "Trinkets" loadout tab to the "Assistive items" tab.
     type: Tweak
-  id: 9875
+  id: 9872
   time: '2026-07-19T00:40:20.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41264
-- author: Starlight991
-  changes:
-  - message: 'Slimes can now be summoned using chemistry: Cognizine creates a friendly slime, while Vestine creates a hostile one.'
-    type: Add
-  id: 9876
-  time: '2026-07-19T01:23:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36673
 - author: Absotively
   changes:
   - message: Battlecry changes don't require pressing enter, are visible on battlecry window reopen
     type: Tweak
   - message: Can't enter too-long battlecry that then gets cut off
     type: Tweak
-  id: 9877
+  id: 9873
   time: '2026-07-19T01:24:05.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40337
 - author: Varen
   changes:
   - message: Dual-port air vents now function as expected with air alarms, without other device linking
     type: Tweak
-  id: 9878
+  id: 9874
   time: '2026-07-19T01:46:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38941
 - author: widgetbeck, mqole
@@ -5112,14 +5082,14 @@ Entries:
     type: Add
   - message: Added a 'Lock Markings' button to the character randomizer settings.
     type: Add
-  id: 9879
+  id: 9875
   time: '2026-07-19T03:45:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38528
 - author: '[redacted]'
   changes:
   - message: Fake mindshield implant now shows a pop-up when toggled on or off, including when auto-toggled by the Chameleon implant controller.
     type: Fix
-  id: 9880
+  id: 9876
   time: '2026-07-19T21:04:03.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43100
 - author: AsnDen
@@ -5130,28 +5100,28 @@ Entries:
     type: Tweak
   - message: Visual bag with mop and bucket overlapping on janitorial trolley was fixed.
     type: Fix
-  id: 9881
+  id: 9877
   time: '2026-07-19T21:06:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39416
 - author: Hitlinemoss
   changes:
   - message: Nanotrasen's standard-issue survival boxes are now smaller, but no longer contain food, water bottles, or emergency flares. (Survival boxes used by nukies and wizards remain the same.)
     type: Tweak
-  id: 9882
+  id: 9878
   time: '2026-07-19T22:52:06.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41664
 - author: Pok27
   changes:
   - message: There are now more item status in hands
     type: Add
-  id: 9883
+  id: 9879
   time: '2026-07-19T23:56:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39264
 - author: ketufaispikinut
   changes:
   - message: Added guardians (holoparasites) for wizards that can be bought for 2 Wiz€oin™.
     type: Add
-  id: 9884
+  id: 9880
   time: '2026-07-20T00:45:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44624
 - author: Hitlinemoss
@@ -5172,28 +5142,28 @@ Entries:
     type: Remove
   - message: The boxes crate and security supplies crate have been removed from the cargo request console.
     type: Remove
-  id: 9885
+  id: 9881
   time: '2026-07-20T02:36:38.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42712
 - author: AreYouConfused
   changes:
   - message: chameleon kit presets should fill every slot for every option.
     type: Fix
-  id: 9886
+  id: 9882
   time: '2026-07-20T05:59:24.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44789
 - author: mqole
   changes:
   - message: Human characters can once again have coloured eyes.
     type: Fix
-  id: 9887
+  id: 9883
   time: '2026-07-20T18:28:14.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44809
 - author: AndrewFenriz
   changes:
   - message: The cardboard box no longer slides.
     type: Fix
-  id: 9888
+  id: 9884
   time: '2026-07-21T00:28:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43532
 - author: riccardi48
@@ -5202,41 +5172,41 @@ Entries:
     type: Tweak
   - message: You can now split the number of items in a stack to fully pick it up.
     type: Tweak
-  id: 9889
+  id: 9885
   time: '2026-07-21T00:28:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44662
 - author: ProPeperos
   changes:
   - message: Fire Helmets now have small power cell instead of medium one.
     type: Tweak
-  id: 9890
+  id: 9886
   time: '2026-07-21T02:20:53.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44811
 - author: Nox38
   changes:
   - message: The visor of a security helmet can now be toggled in its context menu.
     type: Add
-  id: 9891
+  id: 9887
   time: '2026-07-22T08:29:23.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38108
 - author: whatston3
   changes:
   - message: Pipes no longer take longer to reanchor after unanchoring while at high pressure.
     type: Fix
-  id: 9892
+  id: 9888
   time: '2026-07-22T23:35:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44387
 - author: whatston3
   changes:
   - message: The recycler now spills again when reclaiming drainable items.
     type: Fix
-  id: 9893
+  id: 9889
   time: '2026-07-23T01:06:57.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/44344
 - author: B_Kirill
   changes:
   - message: Added sharpness adjustment option to graphics settings.
     type: Add
-  id: 9894
+  id: 9890
   time: '2026-07-23T06:39:04.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43315
diff --git a/Resources/ConfigPresets/WizardsDen/lizard.toml b/Resources/ConfigPresets/WizardsDen/lizard.toml
index cc849e435d..229732362a 100644
--- a/Resources/ConfigPresets/WizardsDen/lizard.toml
+++ b/Resources/ConfigPresets/WizardsDen/lizard.toml
@@ -3,7 +3,7 @@
 # Nothing specific yet
 
 [game]
-hostname = "[EN] Wizard's Den Lizard [US West]"
+hostname = "[EN] Wizard's Den Lizard [NA West]"
 panic_bunker.enabled = false
 panic_bunker.disable_with_admins = false
 panic_bunker.enable_without_admins = false
diff --git a/Resources/ConfigPresets/WizardsDen/raptor.toml b/Resources/ConfigPresets/WizardsDen/raptor.toml
new file mode 100644
index 0000000000..2c2e7cdfd3
--- /dev/null
+++ b/Resources/ConfigPresets/WizardsDen/raptor.toml
@@ -0,0 +1,23 @@
+# Configuration preset used on Wizard's Den Raptor
+
+[game]
+hostname = "[EN] Wizard's Den Raptor [NA East]"
+desc = "Official English server for Space Station 14.\nVanilla, roleplay ruleset.\n\nPlease report bugs on our GitHub, forum, or community Discord."
+panic_bunker.enabled = false
+panic_bunker.disable_with_admins = false
+panic_bunker.enable_without_admins = false
+panic_bunker.custom_reason = ""
+
+[hub]
+tags = "lang:en,region:am_n_e,rp:low"
+
+[server]
+# This needs to be specified even though it's identical to the hostname, because fallback lobby name is "Lobby <hostname>" which would be too long and go out of bounds
+lobby_name = "[EN] Wizard's Den Raptor [NA East]"
+force_client_hud_version_watermark = true
+
+[chat]
+motd = ""
+
+[feedback]
+valid_origins = "wizden wizden_master"
diff --git a/Resources/ConfigPresets/WizardsDen/salamander.toml b/Resources/ConfigPresets/WizardsDen/salamander.toml
index 7112fc8d8b..69e9f342d5 100644
--- a/Resources/ConfigPresets/WizardsDen/salamander.toml
+++ b/Resources/ConfigPresets/WizardsDen/salamander.toml
@@ -2,7 +2,7 @@
 
 [game]
 desc = "Official English Space Station 14 servers. Medium roleplay ruleset. Open to anyone with at least 20 hours of playtime on any Wizard's Den server. Freely joinable when the player count is less than 15 players."
-hostname = "[EN][MRP] Wizard's Den Salamander [US West]"
+hostname = "[EN][MRP] Wizard's Den Salamander [NA West]"
 round_restart_time = 300
 
 [server]
diff --git a/Resources/Locale/en-US/alert-levels/alert-levels.ftl b/Resources/Locale/en-US/alert-levels/alert-levels.ftl
index 9476a95a20..31b2470acc 100644
--- a/Resources/Locale/en-US/alert-levels/alert-levels.ftl
+++ b/Resources/Locale/en-US/alert-levels/alert-levels.ftl
@@ -28,7 +28,7 @@ alert-level-gamma-announcement = Central Command has ordered the Gamma security
 alert-level-gamma-instructions = All civilians are to immediately seek their nearest head for transportation to a secure location.
 
 alert-level-delta = Delta
-alert-level-delta-announcement = The station is currently under threat of imminent destruction. Crewmembers are advised to listen to heads of staff for more information.
+alert-level-delta-nuke-announcement = The station is currently under threat of imminent destruction. Crewmembers are advised to listen to heads of staff for more information.
 alert-level-delta-instructions = Crewmembers are advised to listen to heads of staff for more information.
 
 alert-level-epsilon = Epsilon
diff --git a/Resources/Locale/en-US/body/commands.ftl b/Resources/Locale/en-US/body/commands.ftl
new file mode 100644
index 0000000000..e170e7e62a
--- /dev/null
+++ b/Resources/Locale/en-US/body/commands.ftl
@@ -0,0 +1,23 @@
+command-description-body-insert =
+    Inserts the given organ into the body.
+
+command-description-body-organs =
+    Returns all organs contained within the body.
+
+command-description-organ-parent =
+    Returns the parent of the organ.
+
+command-description-organ-children =
+    Returns the children of the organ.
+
+command-description-organ-detach =
+    (DEBUG ONLY) Detaches an organ from its current body into a detached body.
+
+command-description-organ-attach =
+    Attaches an organ to another organ.
+
+command-description-organ-is =
+    Returns if an organ is the given type.
+
+command-description-organ-of_type =
+    Filters to organs of the given type.
diff --git a/Resources/Locale/en-US/instruments/instruments-component.ftl b/Resources/Locale/en-US/instruments/instruments-component.ftl
index 76cfb28166..330246d8a9 100644
--- a/Resources/Locale/en-US/instruments/instruments-component.ftl
+++ b/Resources/Locale/en-US/instruments/instruments-component.ftl
@@ -7,21 +7,44 @@ instruments-component-menu-no-midi-support = MIDI support is currently not
                                              If on Linux, you may need to install
                                              FluidSynth or a development package
                                              for FluidSynth.
-instruments-component-menu-input-button = MIDI Input
-instruments-component-menu-band-button = Join Band
-instruments-component-menu-play-button = Play MIDI
+instruments-component-menu-play-tab-title = Play
+instruments-component-menu-config-tab-title = Configuration
+instruments-component-menu-midi-source-button = MIDI Source
+instruments-component-menu-unknown-midi-source-button = Unknown
+instruments-component-menu-input-midi-source-button = Input
+instruments-component-menu-band-midi-source-button = Band
+instruments-component-menu-file-midi-source-button = Files
+instruments-component-menu-play-stop-button = Play
 instruments-component-menu-loop-button = Loop
-instruments-component-menu-channels-button = Channels
-instruments-component-menu-stop-button = Stop
-instruments-component-band-menu = Choose band leader
-instrument-component-band-refresh = Refresh
+instruments-component-menu-shuffle-button = Shuffle
+instruments-component-menu-channels-label = Channels [italic](updated on playback)[/italic]
+instruments-component-menu-files-track-playtime-seconds-minutes = {$currentMinutes}:{$currentSeconds}/{$totalMinutes}:{$totalSeconds}
+instruments-component-menu-files-track-playtime-seconds-minutes-hours = {$currentHours}:{$currentMinutes}:{$currentSeconds}/{$totalHours}:{$totalMinutes}:{$totalSeconds}
+instruments-component-menu-files-file-remove-disabled-info = Stop playback and select an item to remove it.
+instruments-component-menu-files-add-button = Add
+instruments-component-menu-files-remove-button = Remove
+instruments-component-menu-files-rename-button = Rename
+instruments-component-menu-files-rename-dialog-title = Rename file
+instruments-component-menu-files-rename-dialog-prompt = New name
+instruments-component-menu-files-filter = Filter...
+instruments-component-menu-files-error = Operation failed due to an unexpected error.
+instruments-component-menu-input-notice-label = Connect a MIDI device to your PC
+                                                and play some music.
+instruments-component-band-title-label = Bands
+instruments-component-band-refresh = Refresh
 instruments-component-channels-menu = MIDI Channel Selection
-instrument-component-channel-name = MIDI Channel {$number}
-instruments-component-channels-all-button = All
-instruments-component-channels-clear-button = Clear
-instruments-component-channels-track-names-toggle = Show Track Names
-instruments-component-channels-single = {$channel} {$name}
-instruments-component-channels-multi = {$channel} {$name} ({$other})
+instruments-component-channels-all-button = On
+instruments-component-channels-clear-button = Off
+instruments-component-channels-all-channels-label = All Channels
+instruments-component-channels-name-display-selector-label = Display Name
+instruments-component-channels-name-display-selector-track-button = Track
+instruments-component-channels-name-display-selector-program-button = Program
+instruments-component-channels-name-display-selector-instrument-button = Instrument
+instruments-component-midi-file-collection-label = MIDI Collection
+instruments-component-midi-file-collection-size-label = {$count} MIDI files loaded
+instruments-component-midi-file-collection-open-dir-button = Open Folder
+instruments-component-midi-file-collection-reload-button = Reload Collection
+instruments-component-midi-file-collection-delete-all-button = Clear Collection
 
 
 # SwappableInstrumentComponent
diff --git a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
index 030bd61be7..0b82c7fb95 100644
--- a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
+++ b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
@@ -7,4 +7,3 @@ station-event-meteor-cow-start-announcement = The station is colliding with an u
 station-event-meteor-clown-start-announcement = The station is colliding with an unidentified swarm of debris. HONK! Evacuate laughing gas storage immediately.
 station-event-meteor-potato-start-announcement = The station is colliding with an unidentified swarm of debris. High starch content detected.
 station-event-fun-swarm-start-announcement = The station is colliding with an unidentified swarm of debris. Please panic appropriately.
-station-event-bio-swarm-start-announcement = Meteors have been detected on collision course with the station. Biological activity detected.
diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl
index 90029b282c..c131be8859 100644
--- a/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl
+++ b/Resources/Locale/en-US/xenoarchaeology/artifact-component.ftl
@@ -4,6 +4,7 @@ artifact-verb-activate = Activate artifact
 
 ### Unlocking
 artifact-unlock-state-begin = It begins to shift in strange ways...
+artifact-unlock-state-continue = The shifting continues, intensifying...
 artifact-unlock-state-end-success = It slows down, visibly changed.
 artifact-unlock-state-end-failure = It slows down before uneventfully stopping.
 
diff --git a/Resources/Maps/Ruins/displaced_telescience.yml b/Resources/Maps/Ruins/displaced_telescience.yml
index 4fc7c9286f..e1c7b80008 100644
--- a/Resources/Maps/Ruins/displaced_telescience.yml
+++ b/Resources/Maps/Ruins/displaced_telescience.yml
@@ -1,10 +1,10 @@
 meta:
   format: 7
   category: Grid
-  engineVersion: 282.0.0
+  engineVersion: 284.0.0
   forkId: ""
   forkVersion: ""
-  time: 07/17/2026 15:32:24
+  time: 07/25/2026 02:47:37
   entityCount: 485
 maps: []
 grids:
@@ -1827,7 +1827,7 @@ entities:
       pos: -1.5,-7.5
     - type: Door
       state: Opening
-      secondsUntilStateChange: -5859.55
+      secondsUntilStateChange: -5958.768
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -4033,13 +4033,10 @@ entities:
       canCollide: False
     - type: InsideEntityStorage
       storage: 477
-- proto: IntercomAll
+- proto: IntercomScience
   entities:
   - uid: 469
     components:
-    - type: MetaData
-      name: emergency intercom
-      desc: An intercom for emergency situations. It's in pristine condition.
     - type: Transform
       parent: 1
       rot: 3.141592653589793 rad
@@ -4283,7 +4280,7 @@ entities:
     - type: Transform
       parent: 1
       rot: 3.141592653589793 rad
-      pos: 6.482854,-4.201713
+      pos: 6.5,-4.5
 - proto: PosterLegit50thAnniversaryVintageReprint
   entities:
   - uid: 350
@@ -4300,7 +4297,7 @@ entities:
     - type: Transform
       parent: 1
       rot: 3.141592653589793 rad
-      pos: 1.3414617,-9.541878
+      pos: 1.5,-9.5
 - proto: PosterLegitJustAWeekAway
   entities:
   - uid: 354
@@ -4308,7 +4305,7 @@ entities:
     - type: Transform
       parent: 1
       rot: 1.5707963267948966 rad
-      pos: 1.769932,-9.483023
+      pos: 1.5,-9.5
 - proto: PosterLegitSafetyEyeProtection
   entities:
   - uid: 352
@@ -4316,7 +4313,7 @@ entities:
     - type: Transform
       parent: 1
       rot: -1.5707963267948966 rad
-      pos: 6.431637,-3.7712698
+      pos: 6.5,-3.5
 - proto: PosterLegitSafetyInternals
   entities:
   - uid: 351
@@ -4324,7 +4321,7 @@ entities:
     - type: Transform
       parent: 1
       rot: -1.5707963267948966 rad
-      pos: 6.5175743,-3.3569915
+      pos: 6.5,-3.5
 - proto: PosterLegitScience
   entities:
   - uid: 348
@@ -4332,7 +4329,7 @@ entities:
     - type: Transform
       parent: 1
       rot: -1.5707963267948966 rad
-      pos: -4.598712,-4.6862397
+      pos: -4.5,-4.5
 - proto: PottedPlantBioluminscent
   entities:
   - uid: 356
@@ -4720,26 +4717,26 @@ entities:
     - type: Transform
       parent: 1
       rot: 3.141592653589793 rad
-      pos: -4.5,0.35
+      pos: -4.5,0.5
 - proto: SignScience
   entities:
   - uid: 467
     components:
     - type: Transform
       parent: 1
-      pos: -1.5797484,-9.469645
+      pos: -1.5,-9.5
 - proto: SignSecureSmallRed
   entities:
   - uid: 392
     components:
     - type: Transform
       parent: 1
-      pos: -1.5,-6.75
+      pos: -1.5,-6.5
   - uid: 393
     components:
     - type: Transform
       parent: 1
-      pos: 6.5,-8.25
+      pos: 6.5,-8.5
 - proto: SMESBasic
   entities:
   - uid: 394
diff --git a/Resources/Prototypes/AlertLevels/alert_levels.yml b/Resources/Prototypes/AlertLevels/alert_levels.yml
index 980ab60c84..6aa6b6e684 100644
--- a/Resources/Prototypes/AlertLevels/alert_levels.yml
+++ b/Resources/Prototypes/AlertLevels/alert_levels.yml
@@ -1,72 +1,107 @@
-- type: alertLevels
-  id: stationAlerts
-  defaultLevel: green
-  levels:
-    green:
-      announcement: alert-level-green-announcement
-      color: Green
-      emergencyLightColor: LawnGreen
-      shuttleTime: 600
-    blue:
-      announcement: alert-level-blue-announcement
-      sound: /Audio/Misc/bluealert.ogg
-      color: DodgerBlue
-      forceEnableEmergencyLights: true
-      emergencyLightColor: DodgerBlue
-      shuttleTime: 600
-    violet:
-      announcement: alert-level-violet-announcement
-      sound: /Audio/Misc/notice1.ogg
-      color: Violet
-      emergencyLightColor: Violet
-      forceEnableEmergencyLights: true
-      shuttleTime: 600
-    yellow:
-      announcement: alert-level-yellow-announcement
-      sound: /Audio/Misc/notice1.ogg
-      color: Yellow
-      emergencyLightColor: Goldenrod
-      forceEnableEmergencyLights: true
-      shuttleTime: 600
-    red:
-      announcement: alert-level-red-announcement
-      sound: /Audio/Misc/redalert.ogg
-      color: Red
-      emergencyLightColor: Red
-      forceEnableEmergencyLights: true
-      shuttleTime: 600 #No reduction in time as we don't have swiping for red alert like in /tg/. Shuttle times are intended to create friction, so having a way to brainlessly bypass that would be dumb.
-    gamma:
-      announcement: alert-level-gamma-announcement
-      selectable: false
-      sound:
-        path: /Audio/Corvax/Misc/siren.ogg # Corvax: Return of the old siren sound
-        params:
-          volume: -2
-      disableSelection: true
-      color: PaleVioletRed
-      emergencyLightColor: PaleVioletRed
-      forceEnableEmergencyLights: true
-    delta:
-      announcement: alert-level-delta-announcement
-      selectable: false
-      sound:
-        path: /Audio/Misc/delta.ogg
-        params:
-          volume: -6 # Corvax: Reduce sound volume
-      disableSelection: true
-      color: DarkRed
-      emergencyLightColor: Orange
-      forceEnableEmergencyLights: true
-      shuttleTime: 1200
-    epsilon:
-      announcement: alert-level-epsilon-announcement
-      selectable: false
-      sound:
-        path: /Audio/Misc/epsilon.ogg
-        params:
-          volume: -2
-      disableSelection: true
-      color: DarkViolet
-      emergencyLightColor: DarkViolet
-      forceEnableEmergencyLights: true
-      shuttleTime: 1200
+- type: alertLevel
+  id: Green
+  name: alert-level-green
+  announcement: alert-level-green-announcement
+  instructions: alert-level-green-instructions
+  color: Green
+  emergencyLightColor: LawnGreen
+  shuttleTime: 600
+
+- type: alertLevel
+  id: Blue
+  name: alert-level-blue
+  announcement: alert-level-blue-announcement
+  instructions: alert-level-blue-instructions
+  sound: /Audio/Misc/bluealert.ogg
+  color: DodgerBlue
+  emergencyLightColor: DodgerBlue
+  forceEnableEmergencyLights: true
+  shuttleTime: 600
+
+- type: alertLevel
+  id: Yellow
+  name: alert-level-yellow
+  announcement: alert-level-yellow-announcement
+  instructions: alert-level-yellow-instructions
+  sound: /Audio/Misc/notice1.ogg
+  color: Yellow
+  emergencyLightColor: Goldenrod
+  forceEnableEmergencyLights: true
+  shuttleTime: 600
+
+- type: alertLevel
+  id: Red
+  name: alert-level-red
+  announcement: alert-level-red-announcement
+  instructions: alert-level-red-instructions
+  sound: /Audio/Misc/redalert.ogg
+  color: Red
+  emergencyLightColor: Red
+  forceEnableEmergencyLights: true
+  shuttleTime: 600
+  # No reduction in time as we don't have swiping for red alert like in /tg/.
+  # Shuttle times are intended to create friction,
+  # so having a way to brainlessly bypass that would be dumb.
+
+- type: alertLevel
+  id: Violet
+  name: alert-level-violet
+  announcement: alert-level-violet-announcement
+  instructions: alert-level-violet-instructions
+  sound: /Audio/Misc/notice1.ogg
+  color: Violet
+  emergencyLightColor: Violet
+  forceEnableEmergencyLights: true
+  shuttleTime: 600
+
+- type: alertLevel
+  abstract: true
+  id: BaseDelta
+  name: alert-level-delta
+  instructions: alert-level-delta-instructions
+  selectable: false
+  disableSelection: true
+  forceEnableEmergencyLights: true
+  shuttleTime: 1200
+
+- type: alertLevel
+  parent: BaseDelta
+  id: DeltaNuke
+  announcement: alert-level-delta-nuke-announcement
+  sound:
+    path: /Audio/Misc/delta.ogg
+    params:
+      volume: -3
+  color: DarkRed
+  emergencyLightColor: Orange
+
+- type: alertLevel
+  id: Epsilon
+  name: alert-level-epsilon
+  announcement: alert-level-epsilon-announcement
+  instructions: alert-level-epsilon-instructions
+  selectable: false
+  sound:
+    path: /Audio/Misc/epsilon.ogg
+    params:
+      volume: -2
+  disableSelection: true
+  color: DarkViolet
+  emergencyLightColor: DarkViolet
+  forceEnableEmergencyLights: true
+  shuttleTime: 1200
+
+- type: alertLevel
+  id: Gamma
+  name: alert-level-gamma
+  announcement: alert-level-gamma-announcement
+  instructions: alert-level-gamma-instructions
+  selectable: false
+  sound:
+    path: /Audio/Misc/gamma.ogg
+    params:
+      volume: -2
+  disableSelection: true
+  color: PaleVioletRed
+  emergencyLightColor: PaleVioletRed
+  forceEnableEmergencyLights: true
diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml
index b217074ca8..94244e55ce 100644
--- a/Resources/Prototypes/Atmospherics/gases.yml
+++ b/Resources/Prototypes/Atmospherics/gases.yml
@@ -2,7 +2,7 @@
   id: Oxygen
   name: gas-oxygen
   abbreviation: gas-oxygen-abbreviation
-  molarHeatCapacity: 20
+  molarHeatCapacity: 29
   heatCapacityRatio: 1.4
   molarMass: 32
   color: '#2887E8'
@@ -14,7 +14,7 @@
   id: Nitrogen
   name: gas-nitrogen
   abbreviation: gas-nitrogen-abbreviation
-  molarHeatCapacity: 30
+  molarHeatCapacity: 29
   heatCapacityRatio: 1.4
   molarMass: 28
   color: '#DA1010'
@@ -25,7 +25,7 @@
   id: CarbonDioxide
   name: gas-carbon-dioxide
   abbreviation: gas-carbon-dioxide-abbreviation
-  molarHeatCapacity: 30
+  molarHeatCapacity: 37
   heatCapacityRatio: 1.3
   molarMass: 44
   color: '#4e4e4e'
diff --git a/Resources/Prototypes/Body/Species/moth.yml b/Resources/Prototypes/Body/Species/moth.yml
index 326fa64bdb..18dcec3ab9 100644
--- a/Resources/Prototypes/Body/Species/moth.yml
+++ b/Resources/Prototypes/Body/Species/moth.yml
@@ -178,9 +178,6 @@
     damage:
       types:
         Heat: 2.5 # moths burn more easily
-  - type: Temperature
-    currentTemperature: 310.15
-    specificHeat: 46
   - type: TemperatureDamage # Moths hate the heat and thrive in the cold.
     heatDamageThreshold: 320
     coldDamageThreshold: 230
diff --git a/Resources/Prototypes/Body/Species/reptilian.yml b/Resources/Prototypes/Body/Species/reptilian.yml
index 851c873cdb..58818ebd21 100644
--- a/Resources/Prototypes/Body/Species/reptilian.yml
+++ b/Resources/Prototypes/Body/Species/reptilian.yml
@@ -168,9 +168,6 @@
     damage:
       types:
         Slash: 5
-  - type: Temperature
-    currentTemperature: 310.15
-    specificHeat: 42
   - type: TemperatureDamage
     heatDamageThreshold: 400
     coldDamageThreshold: 285
diff --git a/Resources/Prototypes/Body/Species/vulpkanin.yml b/Resources/Prototypes/Body/Species/vulpkanin.yml
index a6de7d7eab..c4f2ce86f2 100644
--- a/Resources/Prototypes/Body/Species/vulpkanin.yml
+++ b/Resources/Prototypes/Body/Species/vulpkanin.yml
@@ -202,8 +202,6 @@
       types:
         Piercing: 2
         Slash: 3
-  - type: Temperature
-    specificHeat: 44
   - type: TemperatureDamage
     heatDamageThreshold: 320
     coldDamageThreshold: 230
@@ -215,9 +213,6 @@
         Heat: 2.5 # Per second, scales with temperature & other constants
   - type: Wagging
     action: ActionToggleWaggingVulpkanin
-  - type: TemperatureProtection
-    heatingCoefficient: 1.2
-    coolingCoefficient: 0.3
   - type: JumpAbility
     action: ActionVulpkaninGravityJump
     canCollide: true
diff --git a/Resources/Prototypes/Body/base_organs.yml b/Resources/Prototypes/Body/base_organs.yml
index f77e83e75a..0db5199615 100644
--- a/Resources/Prototypes/Body/base_organs.yml
+++ b/Resources/Prototypes/Body/base_organs.yml
@@ -43,7 +43,10 @@
     - Meat
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseParent
+  - OrganBaseChildExternal
   id: OrganBaseTorso
   name: torso
   abstract: true
@@ -68,7 +71,10 @@
       - Special
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseParent
+  - OrganBaseChildExternal
   id: OrganBaseHead
   name: head
   abstract: true
@@ -95,7 +101,10 @@
       - HeadTop
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseParent
+  - OrganBaseChildExternal
   id: OrganBaseArmLeft
   name: left arm
   abstract: true
@@ -114,7 +123,10 @@
       - LArm
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseParent
+  - OrganBaseChildExternal
   id: OrganBaseArmRight
   name: right arm
   abstract: true
@@ -133,7 +145,9 @@
       - RArm
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildExternal
   id: OrganBaseHandLeft
   name: left hand
   abstract: true
@@ -156,7 +170,9 @@
       - LHand
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildExternal
   id: OrganBaseHandRight
   name: right hand
   abstract: true
@@ -179,7 +195,10 @@
       - RHand
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseParent
+  - OrganBaseChildExternal
   id: OrganBaseLegLeft
   name: left leg
   abstract: true
@@ -198,7 +217,10 @@
       - LLeg
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseParent
+  - OrganBaseChildExternal
   id: OrganBaseLegRight
   name: right leg
   abstract: true
@@ -217,7 +239,9 @@
       - RLeg
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildExternal
   id: OrganBaseFootLeft
   name: left foot
   abstract: true
@@ -236,7 +260,9 @@
       - LFoot
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildExternal
   id: OrganBaseFootRight
   name: right foot
   abstract: true
@@ -255,7 +281,9 @@
       - RFoot
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildInternal
   id: OrganBaseBrain
   name: brain
   abstract: true
@@ -288,7 +316,9 @@
       Taco: Brain
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildInternal
   id: OrganBaseEyes
   name: eyes
   abstract: true
@@ -311,7 +341,9 @@
       - Eyes
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildInternal
   id: OrganBaseTongue
   name: tongue
   abstract: true
@@ -324,7 +356,9 @@
     - state: tongue
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildInternal
   id: OrganBaseAppendix
   name: appendix
   abstract: true
@@ -337,7 +371,9 @@
     - state: appendix
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildInternal
   id: OrganBaseEars
   name: ears
   abstract: true
@@ -350,7 +386,9 @@
     - state: ears
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildInternal
   id: OrganBaseLungs
   name: lungs
   abstract: true
@@ -383,7 +421,9 @@
       canReact: false
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildInternal
   id: OrganBaseHeart
   name: heart
   abstract: true
@@ -399,7 +439,9 @@
     stages: [ Bloodstream ]
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildInternal
   id: OrganBaseStomach
   name: stomach
   abstract: true
@@ -431,7 +473,9 @@
       maxVol: 150 # 1.25 liters which is average for a human
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildInternal
   id: OrganBaseLiver
   name: liver
   abstract: true
@@ -449,7 +493,9 @@
     stages: [ Metabolites ]
 
 - type: entity
-  parent: OrganBase
+  parent:
+  - OrganBase
+  - OrganBaseChildInternal
   id: OrganBaseKidneys
   name: kidneys
   abstract: true
@@ -498,3 +544,26 @@
     sexStateOverrides:
       Male: torso_m
       Female: torso_f
+
+- type: entity
+  abstract: true
+  id: OrganBaseParent
+  components:
+  - type: ParentOrgan
+  - type: DetachableOrgan
+    detachedBody: DetachedBody
+
+- type: entity
+  abstract: true
+  id: OrganBaseChildExternal
+  components:
+  - type: ChildOrgan
+  - type: DetachableOrgan
+    detachedBody: DetachedBody
+
+- type: entity
+  abstract: true
+  id: OrganBaseChildInternal
+  components:
+  - type: ChildOrgan
+  - type: InternalChildOrgan
diff --git a/Resources/Prototypes/Body/detached.yml b/Resources/Prototypes/Body/detached.yml
new file mode 100644
index 0000000000..65e370eb8c
--- /dev/null
+++ b/Resources/Prototypes/Body/detached.yml
@@ -0,0 +1,15 @@
+- type: entity
+  parent:
+  - BaseSpeciesLayers
+  id: DetachedBody
+  save: false
+  components:
+  - type: Clickable
+  - type: Body
+  - type: VisualBody
+  - type: ContainerContainer
+  - type: Appearance
+  - type: HideableHumanoidLayers
+  - type: Item
+  - type: InteractionOutline
+  - type: InputMover
diff --git a/Resources/Prototypes/Body/species_appearance.yml b/Resources/Prototypes/Body/species_appearance.yml
index 23ecdc00df..55d6ebceba 100644
--- a/Resources/Prototypes/Body/species_appearance.yml
+++ b/Resources/Prototypes/Body/species_appearance.yml
@@ -88,3 +88,11 @@
         type: HumanoidMarkingModifierBoundUserInterface
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
+  - type: InitialBody
+    relationships:
+      Torso: [Head, ArmLeft, ArmRight, LegLeft, LegRight, Appendix, Lungs, Heart, Stomach, Liver, Kidneys]
+      Head: [Brain, Eyes, Tongue, Ears]
+      ArmLeft: [HandLeft]
+      ArmRight: [HandRight]
+      LegLeft: [FootLeft]
+      LegRight: [FootRight]
diff --git a/Resources/Prototypes/Body/species_base.yml b/Resources/Prototypes/Body/species_base.yml
index 55a1de4fe3..86dea07baa 100644
--- a/Resources/Prototypes/Body/species_base.yml
+++ b/Resources/Prototypes/Body/species_base.yml
@@ -186,11 +186,9 @@
   - type: Fingerprint
   - type: Blindable
   - type: Temperature
-    currentTemperature: 310.15
-    specificHeat: 42
   - type: TemperatureDamage
     heatDamageThreshold: 325
-    coldDamageThreshold: 260
+    coldDamageThreshold: 273.15
     coldDamage:
       types:
         Cold: 0.1 #per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index bfe0e53600..ec3f13dde9 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -103,7 +103,7 @@
 
 - type: entity
   abstract: true
-  parent: ClothingHeadBase
+  parent: [ ClothingHeadBase, TemperatureProtection ]
   id: ClothingHeadEVAHelmetBase
   name: base space helmet
   components:
@@ -116,9 +116,6 @@
   - type: PressureProtection
     highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.2
-    coolingCoefficient: 0.2
   - type: IngestionBlocker
   - type: Clothing
     #Copies ClothingHeadHardsuitBase behavior
@@ -141,7 +138,7 @@
 
 - type: entity
   abstract: true
-  # No parent since we aren't actually an item.
+  parent: TemperatureProtection
   id: ClothingHeadHardsuitBase
   name: base hardsuit helmet
   categories: [ HideSpawnMenu ]
@@ -163,9 +160,6 @@
   - type: PressureProtection
     highPressureMultiplier: 0.3
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.1
-    coolingCoefficient: 0.1
   - type: Armor
     modifiers:
       coefficients:
@@ -188,6 +182,11 @@
     - HeadSide
     - FacialHair
 
+- type: entity
+  abstract: true
+  parent: [ TemperatureProtection, ClothingHeadHardsuitBase ]
+  id: ClothingHeadHardsuitInsulatedBase
+
 - type: entity
   abstract: true
   # No parent since it isn't an item
@@ -247,6 +246,7 @@
 
 - type: entity
   abstract: true
+  parent: TemperatureProtectionMinimal
   id: ClothingHeadHatHoodWinterBase
   name: base winter coat hood
   description: A hood, made to keep your head warm.
@@ -260,9 +260,6 @@
     unequipSound: /Audio/Effects/rustle2.ogg
     quickEquip: false
     slots: [ HEAD ]
-  - type: TemperatureProtection
-    heatingCoefficient: 1.05
-    coolingCoefficient: 0.7
   - type: ZombificationResistance
     zombificationResistanceCoefficient: 0.90
   - type: Armor # so zombification resistance shows up
diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
index 0d2814d537..4a70210939 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@@ -95,9 +95,6 @@
       - state: equipped-head
       head-vox:
       - state: equipped-head-vox
-  - type: TemperatureProtection
-    heatingCoefficient: 0.1
-    coolingCoefficient: 0.1
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 092edb0055..ec3edb70d1 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -7,7 +7,7 @@
 #CREW HARDSUITS
 #Atmospherics Hardsuit
 - type: entity
-  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
+  parent: [ ClothingHeadHardsuitInsulatedBase, ClothingHeadSuitWithLightBase ]
   id: ClothingHeadHelmetHardsuitAtmos
   name: atmos hardsuit helmet
   description: A special hardsuit helmet designed for working in low-pressure, high thermal environments.
@@ -62,9 +62,6 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.005
-    coolingCoefficient: 0.005
   - type: FireProtection
     reduction: 0.2
   - type: Tag
@@ -589,7 +586,7 @@
 
 #Syndicate Elite Hardsuit
 - type: entity
-  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
+  parent: [ ClothingHeadHardsuitInsulatedBase, ClothingHeadSuitWithLightBase ]
   id: ClothingHeadHelmetHardsuitSyndieElite
   name: syndicate elite helmet
   description: An elite version of the blood-red hardsuit's helmet, with improved radiation resistance and fireproofing. Property of Gorlex Marauders.
@@ -603,9 +600,6 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.005
-    coolingCoefficient: 0.005
   - type: FireProtection
     reduction: 0.2
   - type: Armor
@@ -926,9 +920,6 @@
   - type: PressureProtection
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.005
-    coolingCoefficient: 0.005
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index ba6e5d7b53..5f68a1104a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -276,7 +276,7 @@
 
 #Fire Helmet
 - type: entity
-  parent: ClothingHeadLightBase
+  parent: [ClothingHeadLightBase, TemperatureProtection]
   id: ClothingHeadHelmetFire
   name: fire helmet
   description: An atmos tech's best friend. Provides some heat resistance and looks cool.
@@ -287,9 +287,6 @@
     sprite: Clothing/Head/Helmets/firehelmet.rsi
     quickEquip: true
   - type: IngestionBlocker
-  - type: TemperatureProtection
-    heatingCoefficient: 0.5
-    coolingCoefficient: 0.8
   - type: FireProtection
     reduction: 0.15 # not fully sealed so less protection
   - type: ItemSlots
@@ -309,7 +306,7 @@
 
 #Atmos Fire Helmet
 - type: entity
-  parent: [ClothingHeadLightBase, BaseEngineeringContraband]
+  parent: [ClothingHeadLightBase, TemperatureProtection, BaseEngineeringContraband]
   id: ClothingHeadHelmetAtmosFire
   name: atmos fire helmet
   description: An atmos fire helmet, able to keep the user cool in any situation.
@@ -320,9 +317,6 @@
     sprite: Clothing/Head/Helmets/atmos_firehelmet.rsi
     quickEquip: true
   - type: IngestionBlocker
-  - type: TemperatureProtection
-    heatingCoefficient: 0.3
-    coolingCoefficient: 0.8
   - type: FireProtection
     reduction: 0.2
   - type: PressureProtection
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index a9f119146b..44759965a9 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -226,16 +226,13 @@
     - Hair
 
 - type: entity
-  parent: ClothingHeadHatHoodCarp
+  parent: [ ClothingHeadHatHoodCarp, TemperatureProtection ]
   id: ClothingHeadHelmetHardsuitCarp
   categories: [ HideSpawnMenu ]
   components:
   - type: PressureProtection
     highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.2
-    coolingCoefficient: 0.2
   - type: BreathMask
   # this is on the hood so you only fool the fish if you wear the whole set
   # wear carp suit and security helmet, they'll know you are fake
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
index 4e0bdbe2a2..32ce5bc2cd 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
@@ -33,7 +33,7 @@
 
 - type: entity
   abstract: true
-  parent: ClothingNeckBase
+  parent: [ TemperatureProtectionMinimal, ClothingNeckBase ]
   id: ClothingScarfBase
   components:
   - type: Tag
@@ -42,6 +42,3 @@
     - ClothMade
     - Recyclable
     - WhitelistChameleon
-  - type: TemperatureProtection
-    heatingCoefficient: 1.025
-    coolingCoefficient: 0.5
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 510f9895b0..4c986c4881 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -164,7 +164,7 @@
 
 #Elite web vest
 - type: entity
-  parent: [ClothingOuterArmorBase, ClothingOuterStorageBase, BaseSyndicateContraband]
+  parent: [ClothingOuterArmorBase, TemperatureProtection, ClothingOuterStorageBase, BaseSyndicateContraband]
   id: ClothingOuterVestWebElite
   name: elite web vest
   description: A synthetic armor vest. This one has added webbing and heat resistant fibers.
@@ -173,9 +173,6 @@
     sprite: Clothing/OuterClothing/Vests/elitevest.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/elitevest.rsi
-  - type: TemperatureProtection
-    heatingCoefficient: 0.1
-    coolingCoefficient: 0.1
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 1ab627f078..de3f7208de 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -24,6 +24,19 @@
     sprintModifier: 0.9
   - type: HeldSpeedModifier
 
+- type: entity
+  abstract: true
+  parent: [ ClothingOuterBaseLarge, TemperatureProtectionGood ]
+  id: ClothingOuterBaseLargeInsulated
+
+- type: entity
+  abstract: true
+  parent: [ ClothingOuterBaseLarge, TemperatureProtectionGreat ]
+  id: ClothingOuterBaseLargeFireproof
+  components:
+  - type: FireProtection
+    reduction: 0.65
+
 - type: entity
   abstract: true
   parent: ClothingOuterBase
@@ -61,6 +74,11 @@
       - ReagentId: Fiber
         Quantity: 60
 
+- type: entity
+  abstract: true
+  parent: [ ClothingOuterStorageEdible, TemperatureProtectionMinimal]
+  id: ClothingOuterJacketBase
+
 - type: entity
   abstract: true
   parent: [ClothingOuterStorageBase, BaseFoldable]
@@ -104,8 +122,8 @@
 
 - type: entity
   abstract: true
-  parent: ClothingOuterStorageBase
-  id: ClothingOuterStorageToggleableBase
+  parent: ClothingOuterJacketBase
+  id: ClothingOuterJacketToggleableBase
   components:
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterDefault
@@ -118,23 +136,41 @@
 
 - type: entity
   abstract: true
-  parent: [ClothingOuterBase, GeigerCounterClothing, AllowSuitStorageClothing]
-  id: ClothingOuterHardsuitBase
-  name: base hardsuit
+  parent: [ClothingOuterBaseLargeInsulated, AllowSuitStorageClothing]
+  id: ClothingOuterEVASuitBase
+  name: base EVA Suit
   components:
 # SlotBlocker blocked until UI change
 #  - type: SlotBlock
 #    slots: [innerclothing, feet]
   - type: PressureProtection
-    highPressureMultiplier: 0.3
+    highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.01
-    coolingCoefficient: 0.01
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
+  - type: ProtectedFromStepTriggers
+    slots: WITHOUT_POCKET
+  - type: DamageOnInteractProtection
+    damageProtection:
+      flatReductions:
+        Heat: 10 # the average lightbulb only does around four damage!
+    slots: OUTERCLOTHING
+  - type: HideLayerClothing
+    slots:
+    - Tail
+
+- type: entity
+  abstract: true
+  parent: [ ClothingOuterEVASuitBase, GeigerCounterClothing ]
+  id: ClothingOuterHardsuitBase
+  name: base hardsuit
+  components:
+  - type: PressureProtection
+    highPressureMultiplier: 0.3
   - type: ClothingSpeedModifier
     walkModifier: 0.6
     sprintModifier: 0.6
-  - type: HeldSpeedModifier
   - type: Item
     size: Ginormous
     shape:
@@ -159,48 +195,6 @@
     tags:
     - Hardsuit
     - WhitelistChameleon
-  - type: ProtectedFromStepTriggers
-    slots: WITHOUT_POCKET
-  - type: DamageOnInteractProtection
-    damageProtection:
-      flatReductions:
-        Heat: 10 # the average lightbulb only does around four damage!
-    slots: OUTERCLOTHING
-  - type: HideLayerClothing
-    slots:
-    - Tail
-
-- type: entity
-  abstract: true
-  parent: [ClothingOuterBase, AllowSuitStorageClothing]
-  id: ClothingOuterEVASuitBase
-  name: base EVA Suit
-  components:
-# SlotBlocker blocked until UI change
-#  - type: SlotBlock
-#    slots: [innerclothing, feet]
-  - type: PressureProtection
-    highPressureMultiplier: 0.6
-    lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.01 # Not complete protection from fire
-    coolingCoefficient: 0.01
-  - type: ClothingSpeedModifier
-    walkModifier: 0.8
-    sprintModifier: 0.8
-  - type: HeldSpeedModifier
-  - type: Item
-    size: Huge
-  - type: ProtectedFromStepTriggers
-    slots: WITHOUT_POCKET
-  - type: DamageOnInteractProtection
-    damageProtection:
-      flatReductions:
-        Heat: 10 # the average lightbulb only does around four damage!
-    slots: OUTERCLOTHING
-  - type: HideLayerClothing
-    slots:
-    - Tail
 
 - type: entity
   parent: ClothingOuterEVASuitBase
@@ -216,10 +210,10 @@
       toggleable-clothing: !type:ContainerSlot {}
 
 - type: entity
+  abstract: true
   parent: ClothingOuterBase
   id: ClothingOuterBaseToggleable
   name: hoodie with hood
-  abstract: True
   components:
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterDefault
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index 235650d789..bc3d02385c 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -100,7 +100,7 @@
     sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
 
 - type: entity
-  parent: ClothingOuterStorageToggleableBase
+  parent: ClothingOuterJacketToggleableBase
   id: ClothingOuterCoatJensen
   name: jensen coat
   description: A jensen coat.
@@ -123,7 +123,7 @@
         id: SyndieHandyFlag
 
 - type: entity
-  parent: ClothingOuterStorageEdible
+  parent: ClothingOuterJacketBase
   id: ClothingOuterCoatTrench
   name: trench coat
   description: A comfy trench coat.
@@ -132,9 +132,6 @@
     sprite: Clothing/OuterClothing/Coats/trenchcoat.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/trenchcoat.rsi
-  - type: TemperatureProtection
-    heatingCoefficient: 0.1
-    coolingCoefficient: 0.1
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 4211312da9..d4a305d46a 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -15,9 +15,6 @@
   - type: PressureProtection
     highPressureMultiplier: 0.02
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.001
-    coolingCoefficient: 0.001
   - type: FireProtection
     reduction: 0.8
   - type: ExplosionResistance
@@ -213,9 +210,6 @@
         Radiation: 0.1
   - type: ExplosionResistance
     damageCoefficient: 0.2
-  - type: TemperatureProtection
-    heatingCoefficient: 0.001
-    coolingCoefficient: 0.001
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitMaxim
 
@@ -350,7 +344,7 @@
 
 #Chief Engineer's Hardsuit
 - type: entity
-  parent: [ClothingOuterHardsuitBase, BaseCommandContraband]
+  parent: [ TemperatureProtectionGreat, ClothingOuterHardsuitBase, BaseCommandContraband]
   id: ClothingOuterHardsuitEngineeringWhite
   name: chief engineer's hardsuit
   description: A special hardsuit that protects against hazardous, low pressure environments, made for the chief engineer of the station.
@@ -594,7 +588,7 @@
 
 #Syndicate Elite Hardsuit
 - type: entity
-  parent: [ClothingOuterHardsuitBase, BaseSyndicateContraband]
+  parent: [ TemperatureProtectionGreat, ClothingOuterHardsuitBase, BaseSyndicateContraband ]
   id: ClothingOuterHardsuitSyndieElite
   name: syndicate elite hardsuit
   description: An elite version of the blood-red hardsuit, with improved radiation resistance and fireproofing. Property of Gorlex Marauders.
@@ -606,9 +600,6 @@
   - type: PressureProtection
     highPressureMultiplier: 0.02
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.001
-    coolingCoefficient: 0.001
   - type: ExplosionResistance
     damageCoefficient: 0.3
   - type: FireProtection
@@ -986,8 +977,7 @@
     highPressureMultiplier: 0.02
     lowPressureMultiplier: 1000
   - type: TemperatureProtection
-    heatingCoefficient: 0.001
-    coolingCoefficient: 0.001
+    coefficient: 0.001
   - type: ExplosionResistance
     damageCoefficient: 0.2
   - type: FireProtection
@@ -1024,9 +1014,6 @@
   - type: PressureProtection
     highPressureMultiplier: 0.02
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.001
-    coolingCoefficient: 0.001
   - type: ExplosionResistance
     damageCoefficient: 0.7
   - type: Armor
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
index c1f8e250cf..2612bc8507 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -304,7 +304,7 @@
     sprite: Clothing/OuterClothing/Misc/hospitalgown.rsi
 
 - type: entity
-  parent: ClothingOuterBase
+  parent: ClothingOuterJacketBase
   id: ClothingOuterFlannelRed
   name: red flannel jacket
   description: An old fashioned red flannel jacket for space autumn.
@@ -336,11 +336,9 @@
         color: "#670a09"
       - state: equipped-OUTERCLOTHING-lines
         color: "#000000"
-  - type: TemperatureProtection
-    coolingCoefficient: 0.3
 
 - type: entity
-  parent: ClothingOuterBase
+  parent: ClothingOuterJacketBase
   id: ClothingOuterFlannelBlue
   name: blue flannel jacket
   description: An old fashioned blue flannel jacket for space autumn.
@@ -372,11 +370,9 @@
         color: "#3232a6"
       - state: equipped-OUTERCLOTHING-lines
         color: "#000000"
-  - type: TemperatureProtection
-    coolingCoefficient: 0.3
 
 - type: entity
-  parent: ClothingOuterBase
+  parent: ClothingOuterJacketBase
   id: ClothingOuterFlannelGreen
   name: green flannel jacket
   description: An old fashioned green flannel jacket for space autumn.
@@ -408,8 +404,6 @@
         color: "#164d0f"
       - state: equipped-OUTERCLOTHING-lines
         color: "#000000"
-  - type: TemperatureProtection
-    coolingCoefficient: 0.3
 
 - type: entity
   parent: ClothingOuterBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 7b81ad7ed2..1e9aae7b64 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -36,7 +36,7 @@
 
 #Emergency EVA
 - type: entity
-  parent: ClothingOuterEVASuitBaseToggleable
+  parent: [ TemperatureProtectionMinimal, ClothingOuterEVASuitBaseToggleable ]
   id: ClothingOuterSuitEmergency
   name: emergency pressure suit
   description: This bulky, uninsulated pressure suit was clearly not meant for extended use in outer space, despite NanoTrasen's claims that it passes corporate regulations.
@@ -48,10 +48,6 @@
   - type: ClothingSpeedModifier
     walkModifier: 0.7
     sprintModifier: 0.7
-  - type: HeldSpeedModifier
-  - type: TemperatureProtection
-    heatingCoefficient: 0.75
-    coolingCoefficient: 0.5
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetEVALarge
   - type: Tag
@@ -63,7 +59,7 @@
 
 #Prisoner EVA
 - type: entity
-  parent: ClothingOuterEVASuitBase
+  parent: [ TemperatureProtectionMinimal, ClothingOuterEVASuitBase]
   id:  ClothingOuterHardsuitEVAPrisoner
   name: prisoner pressure suit
   description: An emergency pressure suit meant for prisoners. It's not fully rated for extended use in outer space, but some wardens consider the lack of thermal insulation a feature.
@@ -75,10 +71,6 @@
   - type: ClothingSpeedModifier
     walkModifier: 0.7
     sprintModifier: 0.7
-  - type: HeldSpeedModifier
-  - type: TemperatureProtection
-    heatingCoefficient: 0.75
-    coolingCoefficient: 0.5
   - type: Tag
     tags:
     - SuitEVA
@@ -115,17 +107,10 @@
   - type: Appearance
   - type: Clothing
     sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.5
-    lowPressureMultiplier: 1000
   - type: ClothingSpeedModifier
     walkModifier: 0.9
     sprintModifier: 0.9
     requireActivated: false
-  - type: HeldSpeedModifier
-  - type: TemperatureProtection
-    heatingCoefficient: 0.1
-    coolingCoefficient: 0.1
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
index 56508af486..169a322dd4 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ClothingOuterBase, AllowSuitStorageClothingGasTanks, BaseChameleon]
+  parent: [ClothingOuterBase, TemperatureProtectionMinimal, AllowSuitStorageClothingGasTanks, BaseChameleon]
   id: ClothingOuterChameleon
   name: vest
   description: A thick vest with a rubbery, water-resistant shell.
@@ -14,9 +14,6 @@
     - type: ChameleonClothing
       slot: [outerClothing]
       default: ClothingOuterVest
-    - type: TemperatureProtection # Same as a basic winter coat.
-      heatingCoefficient: 1.1
-      coolingCoefficient: 0.1
     - type: Armor
       modifiers:
         coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 1b1bfdab15..15b615e230 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -44,7 +44,7 @@
     sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi
 
 - type: entity
-  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
+  parent: [ ClothingOuterBaseLargeFireproof, AllowSuitStorageClothing ]
   id: ClothingOuterSuitFire
   name: fire suit
   description: A suit that helps protect against hazardous temperatures.
@@ -55,11 +55,6 @@
     sprite: Clothing/OuterClothing/Suits/fire.rsi
   - type: PressureProtection
     highPressureMultiplier: 0.04
-  - type: TemperatureProtection
-    heatingCoefficient: 0.005
-    coolingCoefficient: 0.05
-  - type: FireProtection
-    reduction: 0.65 # doesnt have a full seal so not as good
   - type: Armor
     modifiers:
       coefficients:
@@ -78,7 +73,7 @@
     - Tail
 
 - type: entity
-  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
+  parent: [ TemperatureProtectionGreat, ClothingOuterEVASuitBase, AllowSuitStorageClothing ]
   id: ClothingOuterSuitAtmosFire
   name: atmos fire suit
   description: An expensive firesuit that protects against even the most deadly of station fires. Designed to protect even if the wearer is set aflame.
@@ -87,12 +82,6 @@
     sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.02
-    lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.001
-    coolingCoefficient: 0.05
   - type: FireProtection
     reduction: 0.8 # atmos firesuit offers best protection, hardsuits are a little vulnerable
   - type: Armor
@@ -101,19 +90,10 @@
         Slash: 0.9
         Heat: 0.8
         Cold: 0.8
-  - type: ClothingSpeedModifier
-    walkModifier: 0.8
-    sprintModifier: 0.8
-  - type: HeldSpeedModifier
   - type: GroupExamine
-  - type: ProtectedFromStepTriggers
-    slots: WITHOUT_POCKET
   - type: Tag
     tags:
     - WhitelistChameleon
-  - type: HideLayerClothing
-    slots:
-    - Tail
 
 - type: entity
   parent: [ClothingOuterBaseLarge, GeigerCounterClothing, AllowSuitStorageClothing]
@@ -146,7 +126,7 @@
     - Tail
 
 - type: entity
-  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseToggleClothing, BaseHighlyIllegalContraband]
+  parent: [ ClothingOuterBaseLargeInsulated, AllowSuitStorageClothing, BaseToggleClothing, BaseHighlyIllegalContraband ]
   id: ClothingOuterSuitSpaceNinja
   name: space ninja suit
   description: This black technologically advanced, cybernetically-enhanced suit provides many abilities like invisibility or teleportation.
@@ -159,9 +139,6 @@
   - type: PressureProtection
     highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.01
-    coolingCoefficient: 0.01
   - type: Armor
     modifiers:
       coefficients:
@@ -297,16 +274,13 @@
     relayAccent: true
 
 - type: entity
-  parent: ClothingOuterBase
+  parent: [ ClothingOuterBaseToggleable, AllowSuitStorageClothing ]
   id: ClothingOuterSuitCarp
   name: carp suit
   description: A special suit that makes you look just like a space carp, if your eyesight is bad.
   components:
-  - type: AllowSuitStorage
   - type: Sprite
     sprite: Clothing/OuterClothing/Suits/carpsuit.rsi
-  - type: Item
-    size: Normal
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/carpsuit.rsi
   - type: ToggleableClothing
@@ -321,7 +295,7 @@
     - Tail
 
 - type: entity
-  parent: ClothingOuterSuitCarp
+  parent: [ ClothingOuterSuitCarp, TemperatureProtectionGood ]
   id: ClothingOuterHardsuitCarp
   suffix: Hardsuit, DO NOT MAP
   categories: [ DoNotMap ]
@@ -329,9 +303,6 @@
   - type: PressureProtection
     highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000
-  - type: TemperatureProtection
-    heatingCoefficient: 0.01
-    coolingCoefficient: 0.01
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitCarp
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index 1d09b24a22..88699d7e26 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingOuterStorageEdible
+  parent: [ TemperatureProtection, ClothingOuterJacketBase ]
   id: ClothingOuterWinterCoat
   name: winter coat
   description: A heavy jacket made from 'synthetic' animal furs.
@@ -8,11 +8,6 @@
     sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
-  - type: TemperatureProtection
-    heatingCoefficient: 1.1
-    coolingCoefficient: 0.1
-  - type: Item
-    size: Normal
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
index e799e3ed30..5733cc7cfb 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -67,10 +67,6 @@
 
 - type: entity
   abstract: true
-  parent: ClothingShoesBaseButcherable
+  parent: [ ClothingShoesBaseButcherable, TemperatureProtectionMinimal ]
   id: ClothingShoesBaseWinterBoots
   description: Fluffy boots to help survive even the coldest of winters.
-  components:
-  - type: TemperatureProtection
-    heatingCoefficient: 1.025
-    coolingCoefficient: 0.5
diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
index f02feff158..2cfbeac59b 100644
--- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
@@ -69,3 +69,31 @@
   - type: ItemToggle
     onUse: false # can't really wear it like that
   - type: ToggleClothing
+
+- type: entity
+  abstract: true
+  id: TemperatureProtectionMinimal # Really light jackets and hoods.
+  components:
+  - type: TemperatureProtection
+    coefficient: 0.8
+
+- type: entity
+  abstract: true
+  id: TemperatureProtection # Winter coats and environmentally sealed helmets
+  components:
+  - type: TemperatureProtection
+    coefficient: 0.6
+
+- type: entity
+  abstract: true
+  id: TemperatureProtectionGood # EVA suits and basic hardsuits
+  components:
+  - type: TemperatureProtection
+    coefficient: 0.05
+
+- type: entity
+  abstract: true
+  id: TemperatureProtectionGreat # Fire-retardant suits
+  components:
+  - type: TemperatureProtection
+    coefficient: 0.01
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/temp.yml b/Resources/Prototypes/Entities/Markers/Spawners/temp.yml
index cf52b00a05..aa76bb5ea7 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/temp.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/temp.yml
@@ -8,5 +8,4 @@
     bodyType: Static
     canCollide: false
   - type: TimedDespawn
-  - type: SpawnOnDespawn
-    prototype: Ash # placeholder (required by component), overridden at runtime
+    # we can't declare the SpawnOnDespawnComponent because the entity is required on yml
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 41bf648114..51e6164859 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -257,15 +257,13 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalBreak
-      - !type:GibBehavior
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          ScrapGlass:
-            min: 1
-            max: 1
-          SheetSteel:
-            min: 10
-            max: 20
+      - !type:EmptyContainersBehaviour
+        containers:
+        - borg_brain
+        - borg_module
+        - cell_slot
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 6bbe653946..69984fb84a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1801,9 +1801,6 @@
       types:
         Slash: 5
         Piercing: 4
-  - type: Temperature
-    currentTemperature: 310.15
-    specificHeat: 42
   - type: TemperatureDamage
     heatDamageThreshold: 360
     coldDamageThreshold: 285
@@ -2533,9 +2530,6 @@
   - type: NpcFactionMember
     factions:
     - Passive
-  - type: Temperature
-    currentTemperature: 310.15
-    specificHeat: 46
   - type: TemperatureDamage
     heatDamageThreshold: 335
     coldDamageThreshold: 230
@@ -3228,9 +3222,6 @@
     damageModifierSet: Infernal
   - type: Injurable
     damageContainer: BiologicalMetaphysical
-  - type: Temperature
-    currentTemperature: 310.15
-    specificHeat: 42
   - type: TemperatureDamage
     heatDamageThreshold: 4000 #They come from hell, so..
     coldDamageThreshold: 260
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
index f0795a1fd6..4ceddc730a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
@@ -35,9 +35,6 @@
       0: Alive
       60: Critical
       125: Dead
-  - type: Temperature
-    currentTemperature: 310.15
-    specificHeat: 42
   - type: TemperatureDamage
     heatDamageThreshold: 360
     coldDamageThreshold: 285
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index b2427856f7..547886f76a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -105,8 +105,6 @@
   - type: GhostTakeoverAvailable
   - type: TypingIndicator
     proto: alien
-  - type: Temperature
-    currentTemperature: 310.15
   - type: TemperatureDamage
     heatDamageThreshold: 360
     coldDamageThreshold: -150
@@ -529,8 +527,6 @@
       amount: 5
   - type: TypingIndicator
     proto: alien
-  - type: Temperature
-    currentTemperature: 310.15
   - type: TemperatureDamage
     heatDamageThreshold: 360
     coldDamageThreshold: -150
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index f3447bce3a..ee63ea6d9b 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -179,8 +179,6 @@
   components:
   - type: AtmosExposed
   - type: Temperature
-    currentTemperature: 310.15
-    specificHeat: 42
   - type: TemperatureDamage
     heatDamageThreshold: 325
     coldDamageThreshold: 0
@@ -214,9 +212,6 @@
     shiveringHeatRegulation: 500
     normalBodyTemperature: 310.15
     thermalRegulationTemperatureThreshold: 2
-  - type: Temperature
-    currentTemperature: 310.15
-    specificHeat: 42
   - type: TemperatureDamage
     heatDamageThreshold: 325
     coldDamageThreshold: 260
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
index ca6c7ca508..20ead4214c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -60,13 +60,11 @@
   # all below are for egg cooking/exploding
   - type: AtmosExposed
   - type: Temperature
+    thermalConductivity: 1
+    temperature: 293.15
+    heatCapacity: 15000
   - type: TemperatureDamage
   - type: InternalTemperature
-    # ~1mm shell and ~1cm of albumen
-    thickness: 0.011
-    area: 0.04
-    # conductivity of egg shell based on a paper from Romanoff and Romanoff (1949)
-    conductivity: 0.456
 
 # Splat
 - type: entity
@@ -123,6 +121,6 @@
       - ReagentId: EggCooked
         Quantity: 6
   - type: Temperature
-    # preserve temperature from the boiling step
-    currentTemperature: 344
+    temperature: 344.0 # preserve temperature from the boiling step, TODO: Construction system that doesn't suck.
+    heatCapacity: 15000
   - type: TemperatureDamage
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 74e5c6ce53..9315826b78 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -39,12 +39,11 @@
   # let air cook and freeze meat for cooking and preservation
   - type: AtmosExposed
   - type: Temperature
-    currentTemperature: 290
+    thermalConductivity: 1
+    heatCapacity: 750
   - type: TemperatureDamage
   # required for cooking to work
   - type: InternalTemperature
-    thickness: 0.02
-    area: 0.02 # arbitrary number that sounds right for a slab of meat
   - type: Material
   - type: PhysicalComposition
     materialComposition:
@@ -83,8 +82,6 @@
     refineResult:
     - id: FoodMeatCutlet
       amount: 5
-  - type: InternalTemperature
-    conductivity: 0.43
   - type: Construction
     graph: MeatSteak
     node: start
@@ -178,10 +175,6 @@
         Quantity: 6
       - ReagentId: Fat
         Quantity: 9
-  - type: InternalTemperature
-    conductivity: 0.44
-    thickness: 0.004 # bacon is thin so faster to cook than a steak
-    area: 0.0075 # ~5x15cm
   - type: Construction
     graph: Bacon
     node: start
@@ -256,8 +249,6 @@
     refineResult:
     - id: FoodMeatChickenCutlet
       amount: 5
-  - type: InternalTemperature
-    conductivity: 0.41
   - type: Construction
     graph: ChickenSteak
     node: start
@@ -352,8 +343,6 @@
   components:
   - type: Sprite
     state: goliath
-  - type: InternalTemperature
-    thickness: 0.1 # very big, do cook it in lava
   - type: Construction
     graph: GoliathSteak
     node: start
@@ -781,8 +770,6 @@
     - Meat
   - type: Sprite
     state: raw_patty
-  - type: InternalTemperature
-    conductivity: 0.43
   - type: Construction
     graph: CookedPatty
     node: start
@@ -851,8 +838,6 @@
     refineResult:
     - id: FoodMeatCutlet
       amount: 16
-  - type: InternalTemperature
-    conductivity: 0.43
   - type: Construction
     graph: AnomalyMeatSteak
     node: start
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 0ff1212f1e..504600db8d 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -523,6 +523,7 @@
   description: A webby material.
   suffix: Full
   components:
+  - type: Material
   - type: PhysicalComposition
     materialComposition:
       WebSilk: 100
diff --git a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
index fd34bdf42b..82daefcb99 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
@@ -46,11 +46,14 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
     - type: Temperature
+      temperature: 250
+      heatCapacity: 13440.002
     - type: TemperatureDamage
       heatDamage:
         types:
           Heat: 5
       coldDamage: {}
+      heatDamageThreshold: 273.15
       coldDamageThreshold: 0
     - type: FrictionContacts
     - type: TileFrictionModifier
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index b49a5b5238..eb98dcd15b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -17,6 +17,19 @@
     id: Kudzu
   - type: SpeedModifierContacts
     affectAirborne: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        hard: false
+        density: 7
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        layer:
+        - MidImpassable
+  - type: Temperature
+    temperature: 293.15
+    heatCapacity: 21000
 
 - type: entity
   parent: [ BaseKudzu, SolutionFood ]
@@ -35,16 +48,6 @@
     drawdepth: Overdoors
   - type: KudzuVisuals
   - type: Clickable
-  - type: Fixtures
-    fixtures:
-      fix1:
-        hard: false
-        density: 7
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
-        layer:
-        - MidImpassable
   - type: Damageable
     damageModifierSet: Wood
   - type: Injurable
@@ -56,7 +59,6 @@
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: Temperature
   - type: TemperatureDamage
     heatDamage:
       types:
@@ -197,16 +199,6 @@
     drawdepth: Overdoors
   - type: KudzuVisuals
   - type: Clickable
-  - type: Fixtures
-    fixtures:
-      fix1:
-        hard: false
-        density: 7
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
-        layer:
-        - MidImpassable
   - type: Damageable
   - type: Injurable
   - type: Destructible
@@ -235,6 +227,17 @@
         Heat: -1.0
         Cold: -1.0
         Blunt: -0.5 # Needs to be balanced (approx 3x) with vacuum damage to stall but not kill Kudzu
+  - type: TemperatureDamage
+    heatDamage:
+      types:
+        Heat: 10
+    coldDamage:
+      types:
+        Cold: 5 #per second, scales with temperature & other constants
+  - type: Barotrauma
+    damage:
+      types:
+        Blunt: 0.10 #per second, scales with pressure and other constants.
   - type: Flammable
     fireSpread: true
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
index f6a63b0e5b..fdbeaa8dbb 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
@@ -87,12 +87,11 @@
     defaultTarget: cooked spaceshroom
   - type: AtmosExposed
   - type: Temperature
-    currentTemperature: 290
+    thermalConductivity: 1
+    temperature: 293.15
+    heatCapacity: 750
   - type: TemperatureDamage
   - type: InternalTemperature
-    thickness: 0.02
-    area: 0.02
-    conductivity: 0.43
   - type: Tag
     tags:
     - Mushroom
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index d296a9564b..ef376f0673 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -68,10 +68,10 @@
   - type: Destructible
     thresholds:
     - trigger: *DamageTrigger10
-      behaviors: &BehaviorsSpawnShardGlass
+      behaviors:
       - !type:SpawnEntitiesBehavior
         spawn:
-          ShardGlass:
+          LightBulbBroken:
             min: 1
             max: 1
 
@@ -80,14 +80,15 @@
   parent: BaseReplacementLight
   id: BaseLightTube
   components:
-  - type: Sprite
-    sprite:  Objects/Power/light_tube.rsi
-  - type: LightBulb
-    bulb: Tube
   - type: Destructible
     thresholds:
     - trigger: *DamageTrigger10
-      behaviors: *BehaviorsSpawnShardGlass
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          LightTubeBroken:
+            min: 1
+            max: 1
 
 # Lighting color values gathered from
 # https://andi-siess.de/rgb-to-color-temperature/
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index f125d087ab..976956c712 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -24,8 +24,8 @@
   - type: Extractable
     juiceSolution:
       reagents:
-        - ReagentId: Zinc
-          Quantity: 5
+      - ReagentId: Zinc
+        Quantity: 5
   - type: Tag
     tags:
       - PowerCell
@@ -116,6 +116,11 @@
   - type: BatterySelfRecharger
     autoRechargeRate: 36 # 10 seconds to recharge
     autoRechargePauseTime: 30
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Uranium
+        Quantity: 5
 
 - type: entity
   name: medium-capacity power cell
@@ -134,6 +139,11 @@
   - type: Battery
     maxCharge: 720
     startingCharge: 720
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Lithium
+        Quantity: 5
 
 - type: entity
   id: PowerCellMediumPrinted
@@ -169,6 +179,11 @@
   - type: Battery
     maxCharge: 1080
     startingCharge: 1080
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Lithium
+        Quantity: 5
 
 - type: entity
   id: PowerCellHighPrinted
@@ -204,6 +219,11 @@
   - type: Battery
     maxCharge: 1800
     startingCharge: 1800
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Lithium
+        Quantity: 5
 
 - type: entity
   id: PowerCellHyperPrinted
@@ -241,6 +261,11 @@
     startingCharge: 720
   - type: BatterySelfRecharger
     autoRechargeRate: 12 # takes 1 minute to charge itself back to full
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Uranium
+        Quantity: 5
 
 - type: entity
   parent: PowerCellMicroreactor
@@ -276,6 +301,11 @@
       startingCharge: 1200
     - type: BatterySelfRecharger
       autoRechargeRate: 40
+    - type: Extractable
+      juiceSolution:
+        reagents:
+        - ReagentId: Uranium
+          Quantity: 5
 
 # Power cage (big heavy power cell for big devices)
 
@@ -299,8 +329,8 @@
   - type: Extractable
     juiceSolution:
       reagents:
-        - ReagentId: Zinc
-          Quantity: 15
+      - ReagentId: Zinc
+        Quantity: 15
   - type: Tag
     tags:
       - PowerCage
@@ -354,6 +384,11 @@
   - type: Battery
     maxCharge: 2700
     startingCharge: 2700
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Lithium
+        Quantity: 10
 
 - type: entity
   id: PowerCageHigh
@@ -372,6 +407,11 @@
   - type: Battery
     maxCharge: 6200
     startingCharge: 6200
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Lithium
+        Quantity: 15
 
 - type: entity
   id: PowerCageSmallEmpty
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml
index 86280036ab..1164c4a638 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml
@@ -315,7 +315,7 @@
 
 - type: entity
   name: bluespace beaker
-  parent: [SolutionGinormous, BaseBeakerMetallic]
+  parent: [SolutionGinormous, BaseBeakerMetallic] # Bluespace items hold 8x the solution of regular items (240u a tile)
   description: Powered by experimental bluespace technology.
   id: BluespaceBeaker
   components:
@@ -327,6 +327,8 @@
       - state: beakerbluespace
   - type: SolutionContainerVisuals
     maxFillLevels: 0
+  - type: Item
+    size: Normal
 
 - type: entity
   name: dropper
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
index ce56aa8c8d..bf22e87158 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
@@ -323,7 +323,6 @@
   id: MeteorPotato
   name: Space potato
   description: A starchy threat from the depths of the space. Contains 200% of your daily sodium intake!
-  suffix: Meteor
   components:
   - type: Sprite
     state: potato
@@ -350,72 +349,3 @@
             min: 1
             max: 5
       - !type:ExplodeBehavior
-
-# Flesh Meteor
-- type: entity
-  parent: BaseMeteor
-  id: MeteorFlesh
-  name: flesh meteor
-  description: A meteor covered in tendons.
-  components:
-  - type: Sprite
-    state: tendons
-  - type: Explosive
-    totalIntensity: 100
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 1000
-      behaviors:
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-      - !type:WeightedSpawnEntityBehavior
-        weightedEntityTable: "MeteorSpawnFleshMonstersTable"
-        minSpawn: 1
-        maxSpawn: 3
-        spawnOffset: 1
-        spawnAfter: 0.5
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          FleshKudzuSpace:
-            min: 1
-            max: 3
-        spawnAfter: 0.5
-        offset: 1
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          FleshBlocker:
-            min: 1
-            max: 2
-        spawnAfter: 0.5
-        offset: 2
-      - !type:ExplodeBehavior
-
-# Kudzu Meteor
-- type: entity
-  parent: BaseMeteor
-  id: MeteorKudzu
-  name: kudzu meteor
-  description: A meteor overgrown with kudzu.
-  components:
-  - type: Sprite
-    state: kudzu
-  - type: Explosive
-    totalIntensity: 100
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 1000
-      behaviors:
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          Kudzu:
-            min: 1
-            max: 3
-        spawnAfter: 0.5
-        offset: 1
-      - !type:ExplodeBehavior
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index fa8f55747d..cdb4556660 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -383,6 +383,7 @@
     walkModifier: 0.6
     sprintModifier: 0.6
     weightlessAcceleration: 0.6
+    zeroGravityModifier: 0.6
   - type: UseDelay
     delay: 1.5
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Stations/alert_levels.yml b/Resources/Prototypes/Entities/Stations/alert_levels.yml
new file mode 100644
index 0000000000..92153bfc1c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Stations/alert_levels.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: BaseStationAlertLevels
+  abstract: true
+  components:
+  - type: AlertLevel
+    availableAlertLevels:
+    - Blue
+    - DeltaNuke
+    - Epsilon
+    - Gamma
+    - Green
+    - Red
+    - Violet
+    - Yellow
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index 7eb09c4583..8b4d349a4d 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -129,13 +129,6 @@
   components:
     - type: StationEmergencyShuttle
 
-- type: entity
-  id: BaseStationAlertLevels
-  abstract: true
-  components:
-    - type: AlertLevel
-      alertLevelPrototype: stationAlerts
-
 - type: entity
   id: BaseStationExpeditions
   abstract: true
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index eed3cd6f15..86d0d2bc8b 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -107,6 +107,8 @@
       path: /Audio/Machines/windoor_open.ogg
     denySound:
       path: /Audio/Machines/airlock_deny.ogg
+    checkFixtureCollision: true
+    allowMachineLayer: true
   - type: Airlock
     keepOpenIfClicked: true
     openPanelVisible: true
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
index ad6c09834d..9091f36401 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -108,7 +108,7 @@
   - type: Climbable # so that ejected bodies don't get stuck
     vaultable: false
   - type: ContainerTemperature
-    coldDamageThreshold: 10
+    coldDamageThreshold: 213
   - type: GuideHelp
     guides:
     - Cryogenics
diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
index f361ccdd69..b5de51c38f 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
@@ -88,8 +88,8 @@
       whitelist:
         components:
         - NukeDisk
-    alertLevelOnActivate: delta
-    alertLevelOnDeactivate: red # Corvax-Announcements
+    alertLevelOnActivate: DeltaNuke
+    alertLevelOnDeactivate: Green
   - type: InteractionOutline
   - type: ActivatableUI
     key: enum.NukeUiKey.Key
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index f9525d9989..02fd03d95e 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -114,6 +114,11 @@
   - type: StaticPrice
     price: 70
   - type: PowerSwitch
+  - type: ApcPowerReceiver
+    powerLoad: 5
+  - type: PowerState
+    idlePowerDraw: 5
+    workingPowerDraw: 1000
 
 - type: entity
   id: DisposalUnit
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
index c13007abae..c18bdc698c 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
@@ -53,12 +53,13 @@
   - type: WiresVisuals
   - type: AlertLevelDisplay
     alertVisuals:
-      green: fire_0
-      blue: fire_1
-      red: fire_2
-      violet: fire_1
-      yellow: fire_1
-      delta: fire_3
+      Green: fire_0
+      Blue: fire_1
+      Red: fire_2
+      Violet: fire_1
+      Yellow: fire_1
+      DeltaNuke: fire_3
+      # TODO: add missing alarm states
   - type: UserInterface
     interfaces:
       enum.WiresUiKey.Key:
diff --git a/Resources/Prototypes/Entities/Structures/spider_web.yml b/Resources/Prototypes/Entities/Structures/spider_web.yml
index 6a223e9179..50dba8e2ee 100644
--- a/Resources/Prototypes/Entities/Structures/spider_web.yml
+++ b/Resources/Prototypes/Entities/Structures/spider_web.yml
@@ -24,13 +24,6 @@
   - type: Damageable
     damageModifierSet: Wood
   - type: Injurable
-  - type: Temperature
-  - type: TemperatureDamage
-    heatDamage:
-      types:
-        Heat: 5
-    coldDamage: {}
-    coldDamageThreshold: 0
   - type: Flammable
     fireSpread: true
     damage:
diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml
index c447b466ee..9d047a25d5 100644
--- a/Resources/Prototypes/GameRules/meteorswarms.yml
+++ b/Resources/Prototypes/GameRules/meteorswarms.yml
@@ -37,8 +37,6 @@
     - id: CowSwarm
     - id: PotatoSwarm
     - id: FunSwarm
-    - id: MeteorSwarmFlesh
-    - id: MeteorSwarmKudzu
     - id: ImmovableRodSpawn
 
 - type: weightedRandomEntity
@@ -55,14 +53,6 @@
     MeteorRockUranium: 0.5
     MeteorRockBananium: 0.5
 
-- type: weightedRandomEntity
-  id: MeteorSpawnFleshMonstersTable
-  weights:
-    MobFleshGolemSalvage: 1
-    MobFleshClampSalvage: 1
-    MobFleshLoverSalvage: 1
-    MobFleshJaredSalvage: 1
-
 # Event Schedulers
 
 - type: entity
@@ -327,39 +317,3 @@
     meteorsPerWave:
       min: 8
       max: 12
-
-- type: entity
-  parent: MeteorSwarm
-  id: MeteorSwarmFlesh
-  components:
-  - type: StationEvent
-    weight: 4
-  - type: MeteorSwarm
-    announcement: station-event-bio-swarm-start-announcement
-    announcementSound: /Audio/Announcements/attention.ogg
-    meteors:
-      MeteorFlesh: 1
-    waves:
-      min: 2
-      max: 3
-    meteorsPerWave:
-      min: 5
-      max: 6
-
-- type: entity
-  parent: MeteorSwarm
-  id: MeteorSwarmKudzu
-  components:
-  - type: StationEvent
-    weight: 5
-  - type: MeteorSwarm
-    announcement: station-event-bio-swarm-start-announcement
-    announcementSound: /Audio/Announcements/attention.ogg
-    meteors:
-      MeteorKudzu: 1
-    waves:
-      min: 2
-      max: 3
-    meteorsPerWave:
-      min: 3
-      max: 5
diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml
index 42ae9ba4b7..e139c8152b 100644
--- a/Resources/Prototypes/Reagents/Materials/materials.yml
+++ b/Resources/Prototypes/Reagents/Materials/materials.yml
@@ -86,6 +86,7 @@
 
 - type: material
   id: Meaterial # you can't take this pun from me
+  stackEntity: MaterialSheetMeat1
   name: materials-meat
   unit: materials-unit-slab
   icon: { sprite: Objects/Materials/Sheets/meaterial.rsi, state: meat }
@@ -94,6 +95,7 @@
 
 - type: material
   id: WebSilk
+  stackEntity: MaterialWebSilk1
   name: materials-web
   unit: materials-unit-web
   icon: { sprite: Objects/Materials/silk.rsi, state: icon }
@@ -102,6 +104,7 @@
 
 - type: material
   id: Cotton
+  stackEntity: MaterialCotton1
   name: materials-cotton
   unit: materials-unit-boll
   icon: { sprite: Objects/Materials/materials.rsi, state: cotton }
@@ -110,6 +113,7 @@
 
 - type: material
   id: Bones
+  stackEntity: MaterialBones1
   name: materials-bones
   unit: materials-unit-piece
   icon: { sprite: Objects/Materials/materials.rsi, state: bones }
@@ -127,6 +131,7 @@
 
 - type: material
   id: Gunpowder
+  stackEntity: MaterialGunpowder
   name: materials-gunpowder
   unit: materials-unit-piece
   icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile }
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index a38be9e4cb..b0542174b3 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -188,17 +188,19 @@
   metabolisms:
     Bloodstream:
       effects:
-        - !type:EvenHealthChange
-          conditions:
-          - !type:TemperatureCondition
-            # this is a little arbitrary but they gotta be pretty cold
-            max: 213.0
-          damage:
-          # todo scale with temp like SS13
-            Airloss: -3
-            Brute: -2
-            Burn: -2
-            Toxin: -2
+      - !type:AdjustTemperature
+        amount: 80000 # Heats you up as it metabolizes necessitating constant cooling.
+      - !type:EvenHealthChange
+        conditions:
+        - !type:TemperatureCondition
+          # taken from tg, must be below freezing.
+          max: 273.15
+        damage:
+        # todo scale with temp like SS13
+          Airloss: -3
+          Brute: -2
+          Burn: -2
+          Toxin: -2
 
 - type: reagent
   id: Doxarubixadone
@@ -214,7 +216,7 @@
         - !type:HealthChange
           conditions:
           - !type:TemperatureCondition
-            max: 213.0
+            max: 273.15
           damage:
             types:
              Cellular: -2
@@ -520,12 +522,12 @@
         conditions:
         - !type:TemperatureCondition
           max: 293.15
-        amount: 100000 # thermal energy, not temperature!
+        amount: 1000000 # thermal energy, not temperature!
       - !type:AdjustTemperature
         conditions:
         - !type:TemperatureCondition
           min: 293.15
-        amount: -10000
+        amount: -1000000
       - !type:PopupMessage
         type: Local
         visualType: Medium
@@ -1327,10 +1329,12 @@
   metabolisms:
     Bloodstream:
       effects:
+      - !type:AdjustTemperature
+        amount: 80000 # Heats you up as it metabolizes necessitating constant cooling.
       - !type:EvenHealthChange
         conditions:
         - !type:TemperatureCondition
-          max: 213.0
+          max: 273.15
         damage:
           Brute: -3
           Burn: -3
diff --git a/Resources/Prototypes/Recipes/Construction/atmospherics.yml b/Resources/Prototypes/Recipes/Construction/atmospherics.yml
index 4d8554d74c..d0a6b0b584 100644
--- a/Resources/Prototypes/Recipes/Construction/atmospherics.yml
+++ b/Resources/Prototypes/Recipes/Construction/atmospherics.yml
@@ -22,6 +22,13 @@
   conditions:
   - !type:NoUnstackableInTile
 
+# we allow stacking for shit like radiators on top of atmosdevices
+# for now (trademark patent pending)
+- type: construction
+  abstract: true
+  parent: BaseAtmos
+  id: BaseGasDeviceStackable
+
 - type: construction
   abstract: true
   parent: BaseGasDevice
@@ -35,6 +42,13 @@
   graph: GasBinary
   placementMode: AlignAtmosPipeLayers # most binary devices support layers
 
+- type: construction
+  abstract: true
+  parent: BaseGasDeviceStackable
+  id: BaseGasBinaryStackable
+  graph: GasBinary
+  placementMode: AlignAtmosPipeLayers
+
 - type: construction
   abstract: true
   parent: BaseGasDevice
@@ -370,13 +384,13 @@
   placementMode: SnapgridCenter
 
 - type: construction
-  parent: BaseGasBinary
+  parent: BaseGasBinaryStackable
   id: HeatExchanger
   targetNode: radiator
   placementMode: SnapgridCenter
 
 - type: construction
-  parent: BaseGasBinary
+  parent: BaseGasBinaryStackable
   id: HeatExchangerBend
   name: construction-recipe-heat-exchanger-bend
   targetNode: bendradiator
diff --git a/Resources/Prototypes/Recipes/Reactions/biological.yml b/Resources/Prototypes/Recipes/Reactions/biological.yml
index 46ca7db11a..25f9cfaa83 100644
--- a/Resources/Prototypes/Recipes/Reactions/biological.yml
+++ b/Resources/Prototypes/Recipes/Reactions/biological.yml
@@ -108,27 +108,3 @@
     Mold: 2
     Protein: 1
     Toxin: 1
-
-- type: reaction
-  id: CognizineCreateSlime
-  quantized: true
-  reactants:
-    Cognizine:
-      amount: 5
-    Slime:
-      amount: 15
-  effects:
-  - !type:SpawnEntity
-    entity: MobAdultSlimesGreen
-
-- type: reaction
-  id: VestineCreateSlime
-  quantized: true
-  reactants:
-    Vestine:
-      amount: 5
-    Slime:
-      amount: 15
-  effects:
-  - !type:SpawnEntity
-    entity: MobAdultSlimesGreenAngry
diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/kudzu.png b/Resources/Textures/Objects/Misc/meteor.rsi/kudzu.png
deleted file mode 100644
index 53149e9dea..0000000000
Binary files a/Resources/Textures/Objects/Misc/meteor.rsi/kudzu.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/meta.json b/Resources/Textures/Objects/Misc/meteor.rsi/meta.json
index eac06f7000..986fed4345 100644
--- a/Resources/Textures/Objects/Misc/meteor.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/meteor.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31dd6749bfe32810c46e7913efc99a187479cd51/icons/obj/meteor.dmi. cow_pixel - taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, modified by B_Kirill. potato by Chaoticaa (GitHub), modified by B_Kirill. clown_pixel - assembly of [Human sprite - taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf ; Clown wig and mask - taken from https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e ; Clown suit - taken from https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 ; Clown shoes - taken from https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe ; Giggles von honkerton - taken from https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1] by B_Kirill. kudzu - medium meteor + texture of kudzu from https://github.com/tgstation/tgstation/commit/15bf91049e33979a855995579b48592e34bcdd8c by B_Kirill. tendons - medium meteor + texture of tendons [tendons by EmoGarbage404 & tom-leys (github)] by B_Kirill",
+  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31dd6749bfe32810c46e7913efc99a187479cd51/icons/obj/meteor.dmi. cow_pixel - taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b and modified by B_Kirill. potato by Chaoticaa (GitHub), modified by B_Kirill. clown_pixel - assembly of [Human sprite - taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf ; Clown wig and mask - taken from https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e ; Clown suit - taken from https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 ; Clown shoes - taken from https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe ; Giggles von honkerton - taken from https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1] by B_Kirill.",
   "size": {
     "x": 32,
     "y": 32
@@ -303,36 +303,6 @@
           0.1
         ]
       ]
-    },
-    {
-      "name": "kudzu",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "tendons",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/tendons.png b/Resources/Textures/Objects/Misc/meteor.rsi/tendons.png
deleted file mode 100644
index caf8e39f7d..0000000000
Binary files a/Resources/Textures/Objects/Misc/meteor.rsi/tendons.png and /dev/null differ
diff --git a/Resources/Textures/Shaders/screech_shock_wave.swsl b/Resources/Textures/Shaders/screech_shock_wave.swsl
index 086f78d3e7..2447fb779a 100644
--- a/Resources/Textures/Shaders/screech_shock_wave.swsl
+++ b/Resources/Textures/Shaders/screech_shock_wave.swsl
@@ -5,9 +5,11 @@ uniform highp float[10] waveSpeeds;
 uniform highp float[10] downScales;
 uniform highp float[10] fades;
 uniform highp float[10] times;
+
 // variables that are the same for everyone
 uniform lowp int count;
 uniform sampler2D SCREEN_TEXTURE;
+uniform highp vec2 renderScale;
 
 void fragment()
 {
@@ -24,8 +26,8 @@ void fragment()
         WaveCentre.y *= ratio;
 
         // calculate the distortion itself
-        highp float dist = distance(vec2(st.x, st.y * ratio), WaveCentre) * downScales[i];
-        highp vec2 delta = vec2(st.x, st.y * ratio) - WaveCentre;
+        highp float dist = distance(vec2(st.x, st.y * ratio) / renderScale, WaveCentre / renderScale) * downScales[i];
+        highp vec2 delta = (vec2(st.x, st.y * ratio) - WaveCentre) / renderScale;
         highp float angle = atan(delta.y/delta.x);
         highp float sinf = sin(angle*60.0)/80.0;
 
diff --git a/Resources/Textures/Shaders/singularity.swsl b/Resources/Textures/Shaders/singularity.swsl
index 609a4b3b10..7ea9501859 100644
--- a/Resources/Textures/Shaders/singularity.swsl
+++ b/Resources/Textures/Shaders/singularity.swsl
@@ -8,7 +8,7 @@ uniform lowp int count;
 uniform highp float[5] falloffPower;
 uniform highp float[5] intensity;
 uniform highp vec2[5] position;
-// the `5`s in the array lengths correspond to the upper limit on the simultaneous distortion sources that can be present on screen at a time. 
+// the `5`s in the array lengths correspond to the upper limit on the simultaneous distortion sources that can be present on screen at a time.
 // If you want to change this, make sure to change all of them here, in the for loop, and, in whatever overlay assigns the uniforms
 // (apparently #define is an unknown preprocessor directive)
 
@@ -18,28 +18,28 @@ void fragment() {
     highp vec2 delta;
     highp float distance;
     highp float deformation;
-    
+
     for (int i = 0; i < 5 && i < count; i++) {
-    
+
         delta = FRAGCOORD.xy - position[i];
 	    distance = length(delta / renderScale);
 
         deformation = intensity[i] / pow(distance, falloffPower[i]);
-        
+
         // ensure deformation goes to zero at max distance
         // avoids long-range single-pixel shifts that are noticeable when leaving PVS.
-        
+
         if (distance >= maxDistance) {
             deformation = 0.0;
         } else {
             deformation *= (1.0 - pow(distance/maxDistance, 4.0));
         }
-        
+
         if(deformation > 0.8)
             deformation = pow(deformation, 0.3);
 
         finalCoords -= deformation * delta;
     }
-    
+
     COLOR = zTextureSpec(SCREEN_TEXTURE, finalCoords*SCREEN_PIXEL_SIZE );
 }
diff --git a/RobustToolbox b/RobustToolbox
index 2c5cd42416..81e82b01d6 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 2c5cd424167aad2997c448e5cd1ab2d9d0eea8c8
+Subproject commit 81e82b01d6cc5957015a8c9f3baf5e573b0a5217
diff --git a/Tools/actions_changelog_rss.py b/Tools/actions_changelog_rss.py
index ebcbe82272..9a82f7c8e7 100755
--- a/Tools/actions_changelog_rss.py
+++ b/Tools/actions_changelog_rss.py
@@ -184,7 +184,7 @@ def generate_description_for_entries(entries: List[Any]) -> str:
         for entry in sorted(group, key=lambda x: x["time"]):
             for change in entry["changes"]:
                 emoji = TYPES_TO_EMOJI.get(change["type"], "")
-                if EXPERIMENTAL_LABEL in entry["labels"]
+                if EXPERIMENTAL_LABEL in entry["labels"]:
                     emoji = f"{emoji}{EXPERIMENTAL_EMOJI}"
                 msg = change["message"]
                 desc.write(f"<li>{emoji} {html.escape(msg)}</li>")
diff --git a/Tools/actions_changelogs_since_last_run.py b/Tools/actions_changelogs_since_last_run.py
index 32f607ad91..36ecb23c53 100755
--- a/Tools/actions_changelogs_since_last_run.py
+++ b/Tools/actions_changelogs_since_last_run.py
@@ -243,8 +243,8 @@ def changelog_entries_to_message_lines(entries: Iterable[ChangelogEntry]) -> lis
                 emoji = TYPES_TO_EMOJI.get(change["type"], "❓")
                 message = change["message"]
 
-                if EXPERIMENTAL_LABEL in entry["labels"]
-                emoji = f"{emoji}{EXPERIMENTAL_EMOJI}"
+                if EXPERIMENTAL_LABEL in entry["labels"]:
+                    emoji = f"{emoji}{EXPERIMENTAL_EMOJI}"
 
                 message_lines.append(create_change_line(emoji, message, url))