Split Respirator into ThermalRegulator and Respirator and ECSes both (#5603)

Content.Client/Entry/IgnoredComponents.cs

@@ -50,6 +50,7 @@ namespace Content.Client.Entry
             "AccessReader",
             "IdCardConsole",
             "Airlock",
+            "ThermalRegulator",
             "AtmosFixMarker",
             "CablePlacer",
             "Drink",

Content.IntegrationTests/Tests/Body/LungTest.cs

@@ -32,7 +32,7 @@ namespace Content.IntegrationTests.Tests.Body
     template: HumanoidTemplate
     preset: HumanPreset
     centerSlot: torso
-  - type: Respirator
+  - type: ThermalRegulator
     metabolismHeat: 5000
     radiatedHeat: 400
     implicitHeatRegulation: 5000
@@ -40,6 +40,7 @@ namespace Content.IntegrationTests.Tests.Body
     shiveringHeatRegulation: 5000
     normalBodyTemperature: 310.15
     thermalRegulationTemperatureThreshold: 25
+  - type: Respirator
     needsGases:
       Oxygen: 0.00060763888
     producesGases:

Content.Server/Administration/Commands/AddBodyPartCommand.cs

@@ -1,7 +1,4 @@
-using Content.Server.Body;
 using Content.Server.Body.Components;
-using Content.Server.Body.Part;
-using Content.Server.Storage.Components;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;

Content.Server/Administration/Commands/AddEntityStorageCommand.cs

@@ -1,4 +1,3 @@
-using Content.Server.Body.Part;
 using Content.Server.Storage.Components;
 using Content.Shared.Administration;
 using Robust.Shared.Console;

Content.Server/Administration/Commands/AddMechanismCommand.cs

@@ -1,7 +1,4 @@
-using Content.Server.Body;
 using Content.Server.Body.Components;
-using Content.Server.Body.Part;
-using Content.Server.Storage.Components;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;

Content.Server/Administration/Commands/RemoveBodyPartCommand.cs

@@ -1,6 +1,4 @@
-using Content.Server.Body;
 using Content.Server.Body.Components;
-using Content.Server.Body.Part;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;

Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs

@@ -1,4 +1,3 @@
-using Content.Server.Body.Part;
 using Content.Server.Storage.Components;
 using Content.Shared.Administration;
 using Robust.Shared.Console;

Content.Server/Administration/Commands/RemoveMechanismCommand.cs

@@ -1,6 +1,4 @@
-using Content.Server.Body;
 using Content.Server.Body.Components;
-using Content.Server.Body.Part;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;

Content.Server/Body/Commands/AttachBodyPartCommand.cs

@@ -1,12 +1,10 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using static Content.Server.Body.Part.BodyPartComponent;
 
 namespace Content.Server.Body.Commands
 {

Content.Server/Body/Components/BloodstreamComponent.cs

@@ -1,6 +1,7 @@
 using System;
 using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Body.Systems;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
@@ -73,6 +74,7 @@ namespace Content.Server.Body.Components
         public void PumpToxins(GasMixture to)
         {
             var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
+            var respiratorSystem = EntitySystem.Get<RespiratorSystem>();
 
             if (!Owner.TryGetComponent(out RespiratorComponent? metabolism))
             {
@@ -81,7 +83,7 @@ namespace Content.Server.Body.Components
                 return;
             }
 
-            var toxins = metabolism.Clean(this);
+            var toxins = respiratorSystem.Clean(OwnerUid, metabolism, this);
             var toOld = new float[to.Moles.Length];
             Array.Copy(to.Moles, toOld, toOld.Length);
 

Content.Server/Body/Components/BodyPartComponent.cs

@@ -18,7 +18,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.Body.Part
+namespace Content.Server.Body.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedBodyPartComponent))]

Content.Server/Body/Components/BodyScannerComponent.cs

@@ -5,7 +5,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.Body.Scanner
+namespace Content.Server.Body.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]

Content.Server/Body/Components/RespiratorComponent.cs

@@ -6,6 +6,7 @@ using Content.Server.Alert;
 using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Behavior;
+using Content.Server.Body.Systems;
 using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
 using Content.Shared.ActionBlocker;
@@ -17,6 +18,7 @@ using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.MobState.Components;
 using Content.Shared.Popups;
+using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -24,70 +26,24 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent]
+    [RegisterComponent, Friend(typeof(RespiratorSystem))]
     public class RespiratorComponent : Component
     {
-        [ComponentDependency] private readonly SharedBodyComponent? _body = default!;
-
         public override string Name => "Respirator";
 
-        private float _accumulatedFrameTime;
-
-        [ViewVariables] [DataField("needsGases")] public Dictionary<Gas, float> NeedsGases { get; set; } = new();
-
-        [ViewVariables] [DataField("producesGases")] public Dictionary<Gas, float> ProducesGases { get; set; } = new();
-
-        [ViewVariables] [DataField("deficitGases")] public Dictionary<Gas, float> DeficitGases { get; set; } = new();
-
-        /// <summary>
-        /// Heat generated due to metabolism. It's generated via metabolism
-        /// </summary>
         [ViewVariables]
-        [DataField("metabolismHeat")]
+        [DataField("needsGases")]
-        public float MetabolismHeat { get; private set; }
+        public Dictionary<Gas, float> NeedsGases { get; set; } = new();
 
-        /// <summary>
-        /// Heat output via radiation.
-        /// </summary>
         [ViewVariables]
-        [DataField("radiatedHeat")]
+        [DataField("producesGases")]
-        public float RadiatedHeat { get; private set; }
+        public Dictionary<Gas, float> ProducesGases { get; set; } = new();
 
-        /// <summary>
-        /// Maximum heat regulated via sweat
-        /// </summary>
         [ViewVariables]
-        [DataField("sweatHeatRegulation")]
+        [DataField("deficitGases")]
-        public float SweatHeatRegulation { get; private set; }
+        public Dictionary<Gas, float> DeficitGases { get; set; } = new();
 
-        /// <summary>
+        [ViewVariables] public bool Suffocating { get; set; }
-        /// Maximum heat regulated via shivering
-        /// </summary>
-        [ViewVariables]
-        [DataField("shiveringHeatRegulation")]
-        public float ShiveringHeatRegulation { get; private set; }
-
-        /// <summary>
-        /// Amount of heat regulation that represents thermal regulation processes not
-        /// explicitly coded.
-        /// </summary>
-        [DataField("implicitHeatRegulation")]
-        public float ImplicitHeatRegulation { get; private set; }
-
-        /// <summary>
-        /// Normal body temperature
-        /// </summary>
-        [ViewVariables]
-        [DataField("normalBodyTemperature")]
-        public float NormalBodyTemperature { get; private set; }
-
-        /// <summary>
-        /// Deviation from normal temperature for body to start thermal regulation
-        /// </summary>
-        [DataField("thermalRegulationTemperatureThreshold")]
-        public float ThermalRegulationTemperatureThreshold { get; private set; }
-
-        [ViewVariables] public bool Suffocating { get; private set; }
 
         [DataField("damage", required: true)]
         [ViewVariables(VVAccess.ReadWrite)]
@@ -97,283 +53,6 @@ namespace Content.Server.Body.Components
         [ViewVariables(VVAccess.ReadWrite)]
         public DamageSpecifier DamageRecovery = default!;
 
-        private Dictionary<Gas, float> NeedsAndDeficit(float frameTime)
+        public float AccumulatedFrametime;
-        {
-            var needs = new Dictionary<Gas, float>(NeedsGases);
-            foreach (var (gas, amount) in DeficitGases)
-            {
-                var newAmount = (needs.GetValueOrDefault(gas) + amount) * frameTime;
-                needs[gas] = newAmount;
-            }
-
-            return needs;
-        }
-
-        private void ClampDeficit()
-        {
-            var deficitGases = new Dictionary<Gas, float>(DeficitGases);
-
-            foreach (var (gas, deficit) in deficitGases)
-            {
-                if (!NeedsGases.TryGetValue(gas, out var need))
-                {
-                    DeficitGases.Remove(gas);
-                    continue;
-                }
-
-                if (deficit > need)
-                {
-                    DeficitGases[gas] = need;
-                }
-            }
-        }
-
-        private float SuffocatingPercentage()
-        {
-            var total = 0f;
-
-            foreach (var (gas, deficit) in DeficitGases)
-            {
-                var lack = 1f;
-                if (NeedsGases.TryGetValue(gas, out var needed))
-                {
-                    lack = deficit / needed;
-                }
-
-                total += lack / Atmospherics.TotalNumberOfGases;
-            }
-
-            return total;
-        }
-
-        private float GasProducedMultiplier(Gas gas, float usedAverage)
-        {
-            if (!ProducesGases.TryGetValue(gas, out var produces))
-            {
-                return 0;
-            }
-
-            if (!NeedsGases.TryGetValue(gas, out var needs))
-            {
-                needs = 1;
-            }
-
-            return needs * produces * usedAverage;
-        }
-
-        private Dictionary<Gas, float> GasProduced(float usedAverage)
-        {
-            return ProducesGases.ToDictionary(pair => pair.Key, pair => GasProducedMultiplier(pair.Key, usedAverage));
-        }
-
-        private void ProcessGases(float frameTime)
-        {
-            if (!Owner.TryGetComponent(out BloodstreamComponent? bloodstream))
-            {
-                return;
-            }
-
-            if (_body == null)
-            {
-                return;
-            }
-
-            var lungs = _body.GetMechanismBehaviors<LungBehavior>().ToArray();
-
-            var needs = NeedsAndDeficit(frameTime);
-            var used = 0f;
-            foreach (var (gas, amountNeeded) in needs)
-            {
-                var bloodstreamAmount = bloodstream.Air.GetMoles(gas);
-                var deficit = 0f;
-
-                if (bloodstreamAmount < amountNeeded)
-                {
-                    if (!Owner.GetComponent<MobStateComponent>().IsCritical())
-                    {
-                        // Panic inhale
-                        foreach (var lung in lungs)
-                        {
-                            lung.Gasp();
-                        }
-                    }
-
-                    bloodstreamAmount = bloodstream.Air.GetMoles(gas);
-
-                    deficit = Math.Max(0, amountNeeded - bloodstreamAmount);
-
-                    if (deficit > 0)
-                    {
-                        bloodstream.Air.SetMoles(gas, 0);
-                    }
-                    else
-                    {
-                        bloodstream.Air.AdjustMoles(gas, -amountNeeded);
-                    }
-                }
-                else
-                {
-                    bloodstream.Air.AdjustMoles(gas, -amountNeeded);
-                }
-
-                DeficitGases[gas] = deficit;
-
-
-                used += (amountNeeded - deficit) / amountNeeded;
-            }
-
-            var produced = GasProduced(used / needs.Count);
-
-            foreach (var (gas, amountProduced) in produced)
-            {
-                bloodstream.Air.AdjustMoles(gas, amountProduced);
-            }
-
-            ClampDeficit();
-        }
-
-        /// <summary>
-        /// Process thermal regulation
-        /// </summary>
-        /// <param name="frameTime"></param>
-        private void ProcessThermalRegulation(float frameTime)
-        {
-            var temperatureSystem = EntitySystem.Get<TemperatureSystem>();
-            if (!Owner.TryGetComponent(out TemperatureComponent? temperatureComponent)) return;
-
-            float totalMetabolismTempChange = MetabolismHeat - RadiatedHeat;
-            // implicit heat regulation
-            var tempDiff = Math.Abs(temperatureComponent.CurrentTemperature - NormalBodyTemperature);
-            var targetHeat = tempDiff * temperatureComponent.HeatCapacity;
-            if (temperatureComponent.CurrentTemperature > NormalBodyTemperature)
-            {
-                totalMetabolismTempChange -= Math.Min(targetHeat, ImplicitHeatRegulation);
-            }
-            else
-            {
-                totalMetabolismTempChange += Math.Min(targetHeat, ImplicitHeatRegulation);
-            }
-
-            temperatureSystem.ChangeHeat(Owner.Uid, totalMetabolismTempChange, true, temperatureComponent);
-
-            // recalc difference and target heat
-            tempDiff = Math.Abs(temperatureComponent.CurrentTemperature - NormalBodyTemperature);
-            targetHeat = tempDiff * temperatureComponent.HeatCapacity;
-
-            // if body temperature is not within comfortable, thermal regulation
-            // processes starts
-            if (tempDiff > ThermalRegulationTemperatureThreshold)
-                return;
-
-            var actionBlocker = EntitySystem.Get<ActionBlockerSystem>();
-
-            if (temperatureComponent.CurrentTemperature > NormalBodyTemperature)
-            {
-                if (!actionBlocker.CanSweat(OwnerUid)) return;
-                temperatureSystem.ChangeHeat(OwnerUid, -Math.Min(targetHeat, SweatHeatRegulation), true, temperatureComponent);
-            }
-            else
-            {
-                if (!actionBlocker.CanShiver(OwnerUid)) return;
-                temperatureSystem.ChangeHeat(OwnerUid, Math.Min(targetHeat, ShiveringHeatRegulation), true, temperatureComponent);
-            }
-        }
-
-        /// <summary>
-        ///     Processes gases in the bloodstream.
-        /// </summary>
-        /// <param name="frameTime">
-        ///     The time since the last metabolism tick in seconds.
-        /// </param>
-        public void Update(float frameTime)
-        {
-            if (!Owner.TryGetComponent<MobStateComponent>(out var state) ||
-                state.IsDead())
-            {
-                return;
-            }
-
-            _accumulatedFrameTime += frameTime;
-
-            if (_accumulatedFrameTime < 1)
-            {
-                return;
-            }
-
-            ProcessGases(_accumulatedFrameTime);
-            ProcessThermalRegulation(_accumulatedFrameTime);
-
-            _accumulatedFrameTime -= 1;
-
-            if (SuffocatingPercentage() > 0)
-            {
-                TakeSuffocationDamage();
-                return;
-            }
-
-            StopSuffocation();
-        }
-
-        private void TakeSuffocationDamage()
-        {
-            if (!Suffocating)
-                EntitySystem.Get<AdminLogSystem>().Add(LogType.Asphyxiation, $"{Owner} started suffocating");
-
-            Suffocating = true;
-
-            if (Owner.TryGetComponent(out ServerAlertsComponent? alertsComponent))
-            {
-                alertsComponent.ShowAlert(AlertType.LowOxygen);
-            }
-
-            EntitySystem.Get<DamageableSystem>().TryChangeDamage(Owner.Uid, Damage, true, false);
-        }
-
-        private void StopSuffocation()
-        {
-            if (Suffocating)
-                EntitySystem.Get<AdminLogSystem>().Add(LogType.Asphyxiation, $"{Owner} stopped suffocating");
-
-            Suffocating = false;
-
-            if (Owner.TryGetComponent(out ServerAlertsComponent? alertsComponent))
-            {
-                alertsComponent.ClearAlert(AlertType.LowOxygen);
-            }
-
-            EntitySystem.Get<DamageableSystem>().TryChangeDamage(Owner.Uid, DamageRecovery, true);
-        }
-
-        public GasMixture Clean(BloodstreamComponent bloodstream)
-        {
-            var gasMixture = new GasMixture(bloodstream.Air.Volume)
-            {
-                Temperature = bloodstream.Air.Temperature
-            };
-
-            for (Gas gas = 0; gas < (Gas) Atmospherics.TotalNumberOfGases; gas++)
-            {
-                float amount;
-                var molesInBlood = bloodstream.Air.GetMoles(gas);
-
-                if (!NeedsGases.TryGetValue(gas, out var needed))
-                {
-                    amount = molesInBlood;
-                }
-                else
-                {
-                    var overflowThreshold = needed * 5f;
-
-                    amount = molesInBlood > overflowThreshold
-                        ? molesInBlood - overflowThreshold
-                        : 0;
-                }
-
-                gasMixture.AdjustMoles(gas, amount);
-                bloodstream.Air.AdjustMoles(gas, -amount);
-            }
-
-            return gasMixture;
-        }
     }
 }

Content.Server/Body/Components/RespiratorSystem.cs

@@ -1,19 +0,0 @@
-using JetBrains.Annotations;
-using Robust.Shared.GameObjects;
-
-namespace Content.Server.Body.Components
-{
-    [UsedImplicitly]
-    public class RespiratorSystem : EntitySystem
-    {
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            foreach (var respirator in EntityManager.EntityQuery<RespiratorComponent>(false))
-            {
-                respirator.Update(frameTime);
-            }
-        }
-    }
-}

Content.Server/Body/Components/ThermalRegulatorComponent.cs

@@ -0,0 +1,64 @@
+using Content.Server.Body.Systems;
+using Robust.Shared.Analyzers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Server.Body.Components;
+
+[RegisterComponent, ComponentProtoName("ThermalRegulator")]
+[Friend(typeof(ThermalRegulatorSystem))]
+public class ThermalRegulatorComponent : Component
+{
+    public override string Name => "ThermalRegulator";
+
+    /// <summary>
+    /// Heat generated due to metabolism. It's generated via metabolism
+    /// </summary>
+    [ViewVariables]
+    [DataField("metabolismHeat")]
+    public float MetabolismHeat { get; private set; }
+
+    /// <summary>
+    /// Heat output via radiation.
+    /// </summary>
+    [ViewVariables]
+    [DataField("radiatedHeat")]
+    public float RadiatedHeat { get; private set; }
+
+    /// <summary>
+    /// Maximum heat regulated via sweat
+    /// </summary>
+    [ViewVariables]
+    [DataField("sweatHeatRegulation")]
+    public float SweatHeatRegulation { get; private set; }
+
+    /// <summary>
+    /// Maximum heat regulated via shivering
+    /// </summary>
+    [ViewVariables]
+    [DataField("shiveringHeatRegulation")]
+    public float ShiveringHeatRegulation { get; private set; }
+
+    /// <summary>
+    /// Amount of heat regulation that represents thermal regulation processes not
+    /// explicitly coded.
+    /// </summary>
+    [DataField("implicitHeatRegulation")]
+    public float ImplicitHeatRegulation { get; private set; }
+
+    /// <summary>
+    /// Normal body temperature
+    /// </summary>
+    [ViewVariables]
+    [DataField("normalBodyTemperature")]
+    public float NormalBodyTemperature { get; private set; }
+
+    /// <summary>
+    /// Deviation from normal temperature for body to start thermal regulation
+    /// </summary>
+    [DataField("thermalRegulationTemperatureThreshold")]
+    public float ThermalRegulationTemperatureThreshold { get; private set; }
+
+    public float AccumulatedFrametime;
+}

Content.Server/Body/Systems/RespiratorSystem.cs

@@ -0,0 +1,254 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Server.Alert;
+using Content.Server.Atmos;
+using Content.Server.Body.Behavior;
+using Content.Server.Body.Components;
+using Content.Shared.Alert;
+using Content.Shared.Atmos;
+using Content.Shared.Body.Components;
+using Content.Shared.Damage;
+using Content.Shared.Database;
+using Content.Shared.MobState.Components;
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+
+namespace Content.Server.Body.Systems
+{
+    [UsedImplicitly]
+    public class RespiratorSystem : EntitySystem
+    {
+        [Dependency] private readonly DamageableSystem _damageableSys = default!;
+        [Dependency] private readonly AdminLogSystem _logSys = default!;
+
+        public override void Update(float frameTime)
+        {
+            base.Update(frameTime);
+
+            foreach (var (respirator, blood, body) in
+                     EntityManager.EntityQuery<RespiratorComponent, BloodstreamComponent, SharedBodyComponent>())
+            {
+                var uid = respirator.OwnerUid;
+                if (!EntityManager.TryGetComponent<MobStateComponent>(uid, out var state) ||
+                    state.IsDead())
+                {
+                    return;
+                }
+
+                respirator.AccumulatedFrametime += frameTime;
+
+                if (respirator.AccumulatedFrametime < 1)
+                {
+                    return;
+                }
+
+                ProcessGases(uid, respirator, frameTime, blood, body);
+
+                respirator.AccumulatedFrametime -= 1;
+
+                if (SuffocatingPercentage(respirator) > 0)
+                {
+                    TakeSuffocationDamage(uid, respirator);
+                    return;
+                }
+
+                StopSuffocation(uid, respirator);
+            }
+        }
+
+
+        private Dictionary<Gas, float> NeedsAndDeficit(RespiratorComponent respirator, float frameTime)
+        {
+            var needs = new Dictionary<Gas, float>(respirator.NeedsGases);
+            foreach (var (gas, amount) in respirator.DeficitGases)
+            {
+                var newAmount = (needs.GetValueOrDefault(gas) + amount) * frameTime;
+                needs[gas] = newAmount;
+            }
+
+            return needs;
+        }
+
+        private void ClampDeficit(RespiratorComponent respirator)
+        {
+            var deficitGases = new Dictionary<Gas, float>(respirator.DeficitGases);
+
+            foreach (var (gas, deficit) in deficitGases)
+            {
+                if (!respirator.NeedsGases.TryGetValue(gas, out var need))
+                {
+                    respirator.DeficitGases.Remove(gas);
+                    continue;
+                }
+
+                if (deficit > need)
+                {
+                    respirator.DeficitGases[gas] = need;
+                }
+            }
+        }
+
+        private float SuffocatingPercentage(RespiratorComponent respirator)
+        {
+            var total = 0f;
+
+            foreach (var (gas, deficit) in respirator.DeficitGases)
+            {
+                var lack = 1f;
+                if (respirator.NeedsGases.TryGetValue(gas, out var needed))
+                {
+                    lack = deficit / needed;
+                }
+
+                total += lack / Atmospherics.TotalNumberOfGases;
+            }
+
+            return total;
+        }
+
+        private float GasProducedMultiplier(RespiratorComponent respirator, Gas gas, float usedAverage)
+        {
+            if (!respirator.ProducesGases.TryGetValue(gas, out var produces))
+            {
+                return 0;
+            }
+
+            if (!respirator.NeedsGases.TryGetValue(gas, out var needs))
+            {
+                needs = 1;
+            }
+
+            return needs * produces * usedAverage;
+        }
+
+        private Dictionary<Gas, float> GasProduced(RespiratorComponent respirator, float usedAverage)
+        {
+            return respirator.ProducesGases.ToDictionary(pair => pair.Key, pair => GasProducedMultiplier(respirator, pair.Key, usedAverage));
+        }
+
+        private void ProcessGases(EntityUid uid, RespiratorComponent respirator, float frameTime,
+            BloodstreamComponent? bloodstream,
+            SharedBodyComponent? body)
+        {
+            if (!Resolve(uid, ref bloodstream, ref body, false))
+                return;
+
+            var lungs = body.GetMechanismBehaviors<LungBehavior>().ToArray();
+
+            var needs = NeedsAndDeficit(respirator, frameTime);
+            var used = 0f;
+            foreach (var (gas, amountNeeded) in needs)
+            {
+                var bloodstreamAmount = bloodstream.Air.GetMoles(gas);
+                var deficit = 0f;
+
+                if (bloodstreamAmount < amountNeeded)
+                {
+                    if (!EntityManager.GetComponent<MobStateComponent>(uid).IsCritical())
+                    {
+                        // Panic inhale
+                        foreach (var lung in lungs)
+                        {
+                            lung.Gasp();
+                        }
+                    }
+
+                    bloodstreamAmount = bloodstream.Air.GetMoles(gas);
+
+                    deficit = Math.Max(0, amountNeeded - bloodstreamAmount);
+
+                    if (deficit > 0)
+                    {
+                        bloodstream.Air.SetMoles(gas, 0);
+                    }
+                    else
+                    {
+                        bloodstream.Air.AdjustMoles(gas, -amountNeeded);
+                    }
+                }
+                else
+                {
+                    bloodstream.Air.AdjustMoles(gas, -amountNeeded);
+                }
+
+                respirator.DeficitGases[gas] = deficit;
+
+                used += (amountNeeded - deficit) / amountNeeded;
+            }
+
+            var produced = GasProduced(respirator, used / needs.Count);
+
+            foreach (var (gas, amountProduced) in produced)
+            {
+                bloodstream.Air.AdjustMoles(gas, amountProduced);
+            }
+
+            ClampDeficit(respirator);
+        }
+
+        private void TakeSuffocationDamage(EntityUid uid, RespiratorComponent respirator)
+        {
+            if (!respirator.Suffocating)
+                _logSys.Add(LogType.Asphyxiation, $"{EntityManager.GetEntity(uid)} started suffocating");
+
+            respirator.Suffocating = true;
+
+            if (EntityManager.TryGetComponent(uid, out ServerAlertsComponent? alertsComponent))
+            {
+                alertsComponent.ShowAlert(AlertType.LowOxygen);
+            }
+
+            _damageableSys.TryChangeDamage(uid, respirator.Damage, true, false);
+        }
+
+        private void StopSuffocation(EntityUid uid, RespiratorComponent respirator)
+        {
+            if (respirator.Suffocating)
+                _logSys.Add(LogType.Asphyxiation, $"{EntityManager.GetEntity(uid)} stopped suffocating");
+
+            respirator.Suffocating = false;
+
+            if (EntityManager.TryGetComponent(uid, out ServerAlertsComponent? alertsComponent))
+            {
+                alertsComponent.ClearAlert(AlertType.LowOxygen);
+            }
+
+            _damageableSys.TryChangeDamage(uid, respirator.DamageRecovery, true);
+        }
+
+        public GasMixture Clean(EntityUid uid, RespiratorComponent respirator, BloodstreamComponent bloodstream)
+        {
+            var gasMixture = new GasMixture(bloodstream.Air.Volume)
+            {
+                Temperature = bloodstream.Air.Temperature
+            };
+
+            for (Gas gas = 0; gas < (Gas) Atmospherics.TotalNumberOfGases; gas++)
+            {
+                float amount;
+                var molesInBlood = bloodstream.Air.GetMoles(gas);
+
+                if (!respirator.NeedsGases.TryGetValue(gas, out var needed))
+                {
+                    amount = molesInBlood;
+                }
+                else
+                {
+                    var overflowThreshold = needed * 5f;
+
+                    amount = molesInBlood > overflowThreshold
+                        ? molesInBlood - overflowThreshold
+                        : 0;
+                }
+
+                gasMixture.AdjustMoles(gas, amount);
+                bloodstream.Air.AdjustMoles(gas, -amount);
+            }
+
+            return gasMixture;
+        }
+    }
+}

Content.Server/Body/Systems/ThermalRegulatorSystem.cs

@@ -0,0 +1,74 @@
+using System;
+using Content.Server.Body.Components;
+using Content.Server.Temperature.Components;
+using Content.Server.Temperature.Systems;
+using Content.Shared.ActionBlocker;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+
+namespace Content.Server.Body.Systems;
+
+public class ThermalRegulatorSystem : EntitySystem
+{
+    [Dependency] private readonly TemperatureSystem _tempSys = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlockerSys = default!;
+
+    public override void Update(float frameTime)
+    {
+        foreach (var regulator in EntityManager.EntityQuery<ThermalRegulatorComponent>())
+        {
+            regulator.AccumulatedFrametime += frameTime;
+            if (regulator.AccumulatedFrametime < 1)
+                continue;
+
+            regulator.AccumulatedFrametime -= 1;
+            ProcessThermalRegulation(regulator.OwnerUid, regulator);
+        }
+    }
+
+    /// <summary>
+    /// Processes thermal regulation for a mob
+    /// </summary>
+    private void ProcessThermalRegulation(EntityUid uid, ThermalRegulatorComponent comp)
+    {
+        if (!EntityManager.TryGetComponent(uid, out TemperatureComponent? temperatureComponent)) return;
+
+        var totalMetabolismTempChange = comp.MetabolismHeat - comp.RadiatedHeat;
+
+        // implicit heat regulation
+        var tempDiff = Math.Abs(temperatureComponent.CurrentTemperature - comp.NormalBodyTemperature);
+        var targetHeat = tempDiff * temperatureComponent.HeatCapacity;
+        if (temperatureComponent.CurrentTemperature > comp.NormalBodyTemperature)
+        {
+            totalMetabolismTempChange -= Math.Min(targetHeat, comp.ImplicitHeatRegulation);
+        }
+        else
+        {
+            totalMetabolismTempChange += Math.Min(targetHeat, comp.ImplicitHeatRegulation);
+        }
+
+        _tempSys.ChangeHeat(uid, totalMetabolismTempChange, true, temperatureComponent);
+
+        // recalc difference and target heat
+        tempDiff = Math.Abs(temperatureComponent.CurrentTemperature - comp.NormalBodyTemperature);
+        targetHeat = tempDiff * temperatureComponent.HeatCapacity;
+
+        // if body temperature is not within comfortable, thermal regulation
+        // processes starts
+        if (tempDiff > comp.ThermalRegulationTemperatureThreshold)
+            return;
+
+        if (temperatureComponent.CurrentTemperature > comp.NormalBodyTemperature)
+        {
+            if (!_actionBlockerSys.CanSweat(uid)) return;
+            _tempSys.ChangeHeat(uid, -Math.Min(targetHeat, comp.SweatHeatRegulation), true,
+                temperatureComponent);
+        }
+        else
+        {
+            if (!_actionBlockerSys.CanShiver(uid)) return;
+            _tempSys.ChangeHeat(uid, Math.Min(targetHeat, comp.ShiveringHeatRegulation), true,
+                temperatureComponent);
+        }
+    }
+}

Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml

@@ -141,7 +141,7 @@
     damage:
       types:
         Blunt: 1 #per second, scales with pressure and other constants.
-  - type: Respirator
+  - type: ThermalRegulator
     metabolismHeat: 800
     radiatedHeat: 100
     implicitHeatRegulation: 250
@@ -149,6 +149,7 @@
     shiveringHeatRegulation: 500
     normalBodyTemperature: 310.15
     thermalRegulationTemperatureThreshold: 25
+  - type: Respirator
     needsGases:
       Oxygen: 0.00060763888
     producesGases:

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -189,7 +189,7 @@
     preset: HumanPreset
   - type: Damageable
     damageContainer: Biological
-  - type: Respirator
+  - type: ThermalRegulator
     metabolismHeat: 800
     radiatedHeat: 100
     implicitHeatRegulation: 500
@@ -197,6 +197,7 @@
     shiveringHeatRegulation: 2000
     normalBodyTemperature: 310.15
     thermalRegulationTemperatureThreshold: 25
+  - type: Respirator
     needsGases:
       Oxygen: 0.00060763888
     producesGases: