"Proper" "Softcrit" "Support"

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs

@@ -218,6 +218,7 @@ private static string GetStatus(MobState mobState)
             return mobState switch
             {
                 MobState.Alive => Loc.GetString("health-analyzer-window-entity-alive-text"),
+                MobState.SoftCritical => Loc.GetString("health-analyzer-window-entity-critical-text"),
                 MobState.Critical => Loc.GetString("health-analyzer-window-entity-critical-text"),
                 MobState.Dead => Loc.GetString("health-analyzer-window-entity-dead-text"),
                 _ => Loc.GetString("health-analyzer-window-entity-unknown-text"),

Content.Client/Interaction/DragDropSystem.cs

@@ -495,7 +495,7 @@ private void RemoveHighlights()
         // CanInteract() doesn't support checking a second "target" entity.
         // Doing so manually:
         var ev = new GettingInteractedWithAttemptEvent(user, dragged);
-        RaiseLocalEvent(dragged, ref ev);
+        RaiseLocalEvent(dragged, ev);
 
         if (ev.Cancelled)
             return false;

Content.Client/Movement/Systems/WaddleAnimationSystem.cs

@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.Buckle;
 using Content.Client.Gravity;
 using Content.Shared.ActionBlocker;
@@ -82,7 +82,7 @@ private void OnStartedWalking(EntityUid uid, WaddleAnimationComponent component,
             return;
 
         // Do nothing if crit or dead (for obvious reasons)
-        if (_mobState.IsIncapacitated(uid))
+        if (_mobState.IsHardCritical(uid) || _mobState.IsDead(uid))
             return;
 
         var tumbleIntensity = component.LastStep ? 360 - component.TumbleIntensity : component.TumbleIntensity;

Content.Client/Overlays/EntityHealthBarOverlay.cs

@@ -132,7 +132,7 @@ protected override void Draw(in OverlayDrawArgs args)
             if (dmg.HealthBarThreshold != null && dmg.TotalDamage < dmg.HealthBarThreshold)
                 return null;
 
-            if (!_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Critical, out var threshold, thresholds) &&
+            if (!_mobThresholdSystem.TryGetThresholdForState(uid, MobState.SoftCritical, MobState.Critical, out var threshold, thresholds) &&
                 !_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Dead, out threshold, thresholds))
                 return (1, false);
 
@@ -142,7 +142,7 @@ protected override void Draw(in OverlayDrawArgs args)
 
         if (_mobStateSystem.IsCritical(uid, component))
         {
-            if (!_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Critical, out var critThreshold, thresholds) ||
+            if (!_mobThresholdSystem.TryGetThresholdForState(uid, MobState.SoftCritical, MobState.Critical, out var critThreshold, thresholds) ||
                 !_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Dead, out var deadThreshold, thresholds))
             {
                 return (1, true);

Content.Client/Replay/Spectator/ReplaySpectatorSystem.Blockers.cs

@@ -29,7 +29,7 @@ private void InitializeBlockers()
 
     private void OnInteractAttempt(Entity<ReplaySpectatorComponent> ent, ref InteractionAttemptEvent args)
     {
-        args.Cancelled = true;
+        args.Cancel();
     }
 
     private void OnAttempt(EntityUid uid, ReplaySpectatorComponent component, CancellableEntityEventArgs args)

Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs

@@ -35,7 +35,7 @@ private void OnPlayerAttach(LocalPlayerAttachedEvent args)
         ClearOverlay();
         if (!EntityManager.TryGetComponent<MobStateComponent>(args.Entity, out var mobState))
             return;
-        if (mobState.CurrentState != MobState.Dead)
+        if (mobState.CurrentState.IsCritOrAlive())
             UpdateOverlays(args.Entity, mobState);
         _overlayManager.AddOverlay(_overlay);
     }
@@ -89,6 +89,7 @@ private void UpdateOverlays(EntityUid entity, MobStateComponent? mobState, Damag
 
         var critThreshold = foundThreshold.Value;
         _overlay.State = mobState.CurrentState;
+        _overlay.OxygenLevelOverride = mobState.GetOxyDamageOverlay();
 
         switch (mobState.CurrentState)
         {
@@ -113,6 +114,7 @@ private void UpdateOverlays(EntityUid entity, MobStateComponent? mobState, Damag
                 _overlay.DeadLevel = 0;
                 break;
             }
+            case MobState.SoftCritical:
             case MobState.Critical:
             {
                 if (!_mobThresholdSystem.TryGetDeadPercentage(entity,
@@ -124,7 +126,7 @@ private void UpdateOverlays(EntityUid entity, MobStateComponent? mobState, Damag
                 _overlay.DeadLevel = 0;
                 break;
             }
-            case MobState.Dead:
+            case MobState.Dead: // todo: move (some of?) the stuff above and below to mobstate parameters
             {
                 _overlay.BruteLevel = 0;
                 _overlay.CritLevel = 0;

Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Enums;
@@ -21,7 +22,6 @@ public sealed class DamageOverlay : Overlay
     private readonly ShaderInstance _bruteShader;
 
     public MobState State = MobState.Alive;
-
     /// <summary>
     /// Handles the red pulsing overlay
     /// </summary>
@@ -33,6 +33,7 @@ public sealed class DamageOverlay : Overlay
     /// Handles the darkening overlay.
     /// </summary>
     public float OxygenLevel = 0f;
+    public float? OxygenLevelOverride; // for darkening in crit
 
     private float _oldOxygenLevel = 0f;
 
@@ -168,7 +169,7 @@ protected override void Draw(in OverlayDrawArgs args)
             _oldBruteLevel = BruteLevel;
         }
 
-        level = State != MobState.Critical ? _oldOxygenLevel : 1f;
+        level = OxygenLevelOverride ?? _oldOxygenLevel;
 
         if (level > 0f)
         {

Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs

@@ -1,4 +1,4 @@
-using Content.Server.Administration.Commands;
+using Content.Server.Administration.Commands;
 using Content.Server.Administration.Systems;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
@@ -72,6 +72,10 @@ await server.WaitAssertion(() =>
                     Assert.That(mobStateSystem.IsAlive(human, mobState), Is.False);
                     Assert.That(mobStateSystem.IsCritical(human, mobState), Is.False);
                     Assert.That(mobStateSystem.IsDead(human, mobState), Is.True);
+                    // This now may not be true for all mobs since the introduction of MobState parameters.
+                    // Even though being dead should be incapacitating makes perfect sense.
+                    // If you're fucking around with parameters for MobState.Dead and this
+                    // throws at you, feel free to comment it. Or reconsider what you're doing.
                     Assert.That(mobStateSystem.IsIncapacitated(human, mobState), Is.True);
                 });
 
@@ -84,6 +88,7 @@ await server.WaitAssertion(() =>
                     Assert.That(mobStateSystem.IsAlive(human, mobState), Is.True);
                     Assert.That(mobStateSystem.IsCritical(human, mobState), Is.False);
                     Assert.That(mobStateSystem.IsDead(human, mobState), Is.False);
+                    // see above, same thing but for MobState.Alive
                     Assert.That(mobStateSystem.IsIncapacitated(human, mobState), Is.False);
 
                     Assert.That(damageable.TotalDamage, Is.EqualTo(FixedPoint2.Zero));

Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs

@@ -203,7 +203,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 Act = () =>
                 {
                     int damageToDeal;
-                    if (!_mobThresholdSystem.TryGetThresholdForState(args.Target, MobState.Critical, out var criticalThreshold)) {
+                    if (!_mobThresholdSystem.TryGetThresholdForState(args.Target, MobState.SoftCritical, MobState.Critical, out var criticalThreshold)) {
                         // We can't crit them so try killing them.
                         if (!_mobThresholdSystem.TryGetThresholdForState(args.Target, MobState.Dead,
                                 out var deadThreshold))

Content.Server/Administration/Systems/SuperBonkSystem.cs

@@ -27,7 +27,7 @@ public void StartSuperBonk(EntityUid target, float delay = 0.1f, bool stopWhenDe
         //The other check in the code to stop when the target dies does not work if the target is already dead.
         if (stopWhenDead && TryComp<MobStateComponent>(target, out var mState))
         {
-            if (mState.CurrentState == MobState.Dead)
+            if (mState.CurrentState.IsDead())
                 return;
         }
 

Content.Server/Body/Systems/RespiratorSystem.cs

@@ -21,6 +21,7 @@
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using Content.Shared.Mobs.Components;
 
 namespace Content.Server.Body.Systems;
 
@@ -83,12 +84,13 @@ public override void Update(float frameTime)
 
             UpdateSaturation(uid, -(float) respirator.UpdateInterval.TotalSeconds, respirator);
 
-            if (!_mobState.IsIncapacitated(uid) && !HasComp<DebrainedComponent>(uid)) // Shitmed: cannot breathe in crit or when no brain.
+            float mul = _mobState.BreatheMultiplier(uid);
+            if (mul > 0f && !HasComp<DebrainedComponent>(uid)) // Shitmed: cannot breathe in crit or when no brain.
             {
                 switch (respirator.Status)
                 {
                     case RespiratorStatus.Inhaling:
-                        Inhale(uid, body);
+                        Inhale(uid, body, mul);
                         respirator.Status = RespiratorStatus.Exhaling;
                         break;
                     case RespiratorStatus.Exhaling:
@@ -106,7 +108,7 @@ public override void Update(float frameTime)
                     _popupSystem.PopupEntity(Loc.GetString("lung-behavior-gasp"), uid);
                 }
 
-                TakeSuffocationDamage((uid, respirator));
+                TakeSuffocationDamage((uid, respirator), 1 - mul);
                 respirator.SuffocationCycles += 1;
                 continue;
             }
@@ -116,7 +118,7 @@ public override void Update(float frameTime)
         }
     }
 
-    public void Inhale(EntityUid uid, BodyComponent? body = null)
+    public void Inhale(EntityUid uid, BodyComponent? body = null, float breathVolumeMultiplier = 1f)
     {
         if (!Resolve(uid, ref body, logMissing: false))
             return;
@@ -134,7 +136,7 @@ public void Inhale(EntityUid uid, BodyComponent? body = null)
             return;
         }
 
-        var actualGas = ev.Gas.RemoveVolume(Atmospherics.BreathVolume);
+        var actualGas = ev.Gas.RemoveVolume(Atmospherics.BreathVolume * breathVolumeMultiplier);
 
         var lungRatio = 1.0f / organs.Count;
         var gas = organs.Count == 1 ? actualGas : actualGas.RemoveRatio(lungRatio);
@@ -286,7 +288,7 @@ bool CanMetabolize(EntityEffect effect)
         return saturation;
     }
 
-    private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
+    private void TakeSuffocationDamage(Entity<RespiratorComponent> ent, float damageMultiplier = 1f)
     {
         if (ent.Comp.SuffocationCycles == 2)
             _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} started suffocating");
@@ -301,8 +303,11 @@ private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
             }
             RaiseLocalEvent(ent, new MoodEffectEvent("Suffocating"));
         }
-
-        _damageableSys.TryChangeDamage(ent, HasComp<DebrainedComponent>(ent) ? ent.Comp.Damage * 4.5f : ent.Comp.Damage, interruptsDoAfters: false);
+        var damageToTake = ent.Comp.Damage;
+        if (HasComp<DebrainedComponent>(ent))
+            damageToTake *= 4.5f;
+        damageToTake *= damageMultiplier;
+        _damageableSys.TryChangeDamage(ent, damageToTake, interruptsDoAfters: false);
     }
 
     private void StopSuffocation(Entity<RespiratorComponent> ent)

Content.Server/Carrying/CarryingSystem.cs

@@ -168,7 +168,7 @@ private void OnInteractionAttempt(EntityUid uid, BeingCarriedComponent component
             var targetParent = Transform(args.Target.Value).ParentUid;
 
             if (args.Target.Value != component.Carrier && targetParent != component.Carrier && targetParent != uid)
-                args.Cancelled = true;
+                args.Cancel();
         }
 
         /// <summary>
@@ -202,7 +202,7 @@ private void OnStandAttempt(EntityUid uid, BeingCarriedComponent component, Stan
         private void OnInteractedWith(EntityUid uid, BeingCarriedComponent component, GettingInteractedWithAttemptEvent args)
         {
             if (args.Uid != component.Carrier)
-                args.Cancelled = true;
+                args.Cancel();
         }
 
         private void OnPullAttempt(EntityUid uid, BeingCarriedComponent component, PullAttemptEvent args)

Content.Server/Chat/Systems/ChatSystem.cs

@@ -311,7 +311,7 @@ public void TrySendInGameOOCMessage(
             sendType = InGameOOCChatType.Dead;
 
         // If crit player LOOC is disabled, don't send the message at all.
-        if (!_critLoocEnabled && _mobStateSystem.IsCritical(source))
+        if (!_critLoocEnabled && _mobStateSystem.IsHardCritical(source))
             return;
 
         switch (sendType)
@@ -615,7 +615,7 @@ private void SendLOOC(EntityUid source, ICommonSession player, string message, b
         else if (!_loocEnabled) return;
 
         // If crit player LOOC is disabled, don't send the message at all.
-        if (!_critLoocEnabled && _mobStateSystem.IsCritical(source))
+        if (!_critLoocEnabled && _mobStateSystem.IsHardCritical(source))
             return;
 
         var wrappedMessage = Loc.GetString("chat-manager-entity-looc-wrap-message",

Content.Server/Chat/TelepathicChatSystem.Psychognomy.cs

@@ -17,6 +17,7 @@
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
+using Content.Shared.Mobs;
 
 namespace Content.Server.Chat;
 public sealed partial class TelepathicChatSystem
@@ -76,7 +77,7 @@ private void DescribeDamage(EntityUid uid, DamageableComponent component, GetPsy
 
     private void DescribeMobState(EntityUid uid, MobStateComponent component, GetPsychognomicDescriptorEvent ev)
     {
-        if (component.CurrentState != Shared.Mobs.MobState.Critical)
+        if (!component.CurrentState.IsCrit())
             return;
 
         ev.Descriptors.Add(Loc.GetString("p-descriptor-liminal"));

Content.Server/Chemistry/EntitySystems/InjectorSystem.cs

@@ -1,5 +1,7 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
+using Content.Server.Power.EntitySystems;
+using Content.Server.Stunnable;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
@@ -13,12 +15,14 @@
 using Content.Shared.Interaction;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Stacks;
+using Content.Shared.StatusEffect;
 
 namespace Content.Server.Chemistry.EntitySystems;
 
 public sealed class InjectorSystem : SharedInjectorSystem
 {
     [Dependency] private readonly BloodstreamSystem _blood = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
     [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
 
     public override void Initialize()
@@ -163,7 +167,7 @@ private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target,
 
 
             // Check if the target is incapacitated or in combat mode and modify time accordingly.
-            if (MobState.IsIncapacitated(target))
+            if (MobState.IsIncapacitated(target) /*|| _statusEffects.TryGetTime(target, "Stun", out var _)*/)
             {
                 actualDelay /= 2.5f;
             }

Content.Server/Cloning/CloningSystem.Utility.cs

@@ -352,7 +352,7 @@ private void UpdateCloneDamage(EntityUid mob, CloningPodComponent clonePodComp,
     {
         if (!clonePodComp.DoGeneticDamage
             || !HasComp<DamageableComponent>(mob)
-            || !_thresholds.TryGetThresholdForState(mob, Shared.Mobs.MobState.Critical, out var threshold))
+            || !_thresholds.TryGetThresholdForState(mob, Shared.Mobs.MobState.Critical, Shared.Mobs.MobState.SoftCritical, out var threshold))
             return;
         DamageSpecifier damage = new();
         damage.DamageDict.Add("Cellular", (int) threshold + 1 + geneticDamage);

Content.Server/Damage/ForceSay/DamageForceSaySystem.cs

@@ -3,6 +3,7 @@
 using Content.Shared.Damage.ForceSay;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Stunnable;
 using Robust.Shared.Player;
@@ -114,12 +115,14 @@ private void OnDamageChanged(EntityUid uid, DamageForceSayComponent component, D
 
     private void OnMobStateChanged(EntityUid uid, DamageForceSayComponent component, MobStateChangedEvent args)
     {
-        if (args is not { OldMobState: MobState.Alive, NewMobState: MobState.Critical or MobState.Dead })
-            return;
-
-        // no suffix for the drama
-        // LING IN MAI-
-        TryForceSay(uid, component, false);
-        AllowNextSpeech(uid);
+        var mobState = Comp<MobStateComponent>(uid);
+        if (mobState.CanTalk(args.OldMobState) && // could talk before and
+            !mobState.CanTalk())  // can't talk now
+        {
+            // no suffix for the drama
+            // LING IN MAI-
+            TryForceSay(uid, component, false);
+            AllowNextSpeech(uid);
+        }
     }
 }

Content.Server/Explosion/EntitySystems/TriggerSystem.cs

@@ -197,9 +197,9 @@ private void HandleRattleTrigger(EntityUid uid, RattleComponent component, Trigg
                 return;
 
             // Sends a message to the radio channel specified by the implant
-            if (mobstate.CurrentState == MobState.Critical)
+            if (mobstate.CurrentState.IsCrit())
                 _radioSystem.SendRadioMessage(uid, critMessage, _prototypeManager.Index<RadioChannelPrototype>(component.RadioChannel), uid);
-            if (mobstate.CurrentState == MobState.Dead)
+            if (mobstate.CurrentState.IsDead())
                 _radioSystem.SendRadioMessage(uid, deathMessage, _prototypeManager.Index<RadioChannelPrototype>(component.RadioChannel), uid);
 
             args.Handled = true;