Merge pull request #1557 from formlessnameless/dev

Changelings Enter Stasis Automatically On Death
impstation · Feb 5, 2025 · b85b42c · b85b42c
2 parents eb78b68 + cf03907
commit b85b42c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs
@@ -244,9 +244,15 @@ private void OnTransform(EntityUid uid, ChangelingComponent comp, ref Changeling
 
     private void OnEnterStasis(EntityUid uid, ChangelingComponent comp, ref EnterStasisEvent args)
     {
-        if (comp.IsInStasis || HasComp<AbsorbedComponent>(uid))
+        if (comp.IsInStasis)
         {
-            _popup.PopupEntity(Loc.GetString("changeling-stasis-enter-fail"), uid, uid);
+            _popup.PopupEntity(Loc.GetString("changeling-stasis-enter-fail-already"), uid, uid);
+            return;
+        }
+
+        if (HasComp<AbsorbedComponent>(uid))
+        {
+            _popup.PopupEntity(Loc.GetString("changeling-stasis-enter-fail-eaten"), uid, uid);
             return;
         }
 

diff --git a/Content.Server/_Goobstation/Changeling/ChangelingSystem.cs b/Content.Server/_Goobstation/Changeling/ChangelingSystem.cs
@@ -693,7 +693,17 @@ private void OnStartup(EntityUid uid, ChangelingComponent comp, ref ComponentSta
     private void OnMobStateChange(EntityUid uid, ChangelingComponent comp, ref MobStateChangedEvent args)
     {
         if (args.NewMobState == MobState.Dead)
+        {
             RemoveAllChangelingEquipment(uid, comp);
+            // Automatically put the ling into stasis on death if there's enough biomass
+            if (!comp.IsInStasis && !HasComp<AbsorbedComponent>(uid) && comp.Biomass > 1)
+            {
+                comp.Chemicals = 0f;
+                comp.Biomass -= 1;
+                comp.IsInStasis = true;
+            }
+        }
+
     }
 
     private void OnDamageChange(Entity<ChangelingComponent> ent, ref DamageChangedEvent args)

diff --git a/Resources/Locale/en-US/_Goobstation/changeling/abilities/changeling.ftl b/Resources/Locale/en-US/_Goobstation/changeling/abilities/changeling.ftl
@@ -44,7 +44,8 @@ changeling-sting-extract-fail = {CAPITALIZE(THE($target))} lacks extractable DNA
 changeling-sting-extract-max = We cannot extract more DNA until we assume a new form.
 
 changeling-stasis-enter = We enter regenerative stasis.
-changeling-stasis-enter-fail = We cannot enter stasis.
+changeling-stasis-enter-fail-already = We are already in stasis.
+changeling-stasis-enter-fail-eaten = We have been consumed, and cannot enter stasis.
 changeling-stasis-exit = We rise from stasis.
 changeling-stasis-exit-fail = We are not in stasis.
 changeling-stasis-exit-fail-dead = We have been hollowed, and cannot rise from stasis.