Merge remote-tracking branch 'origin/SquadBriefings(Optional)' into S…

…quadBriefings(Optional)
cmss13-devs · Sep 27, 2023 · 53a1d0d · 53a1d0d
2 parents 2ef70cd + e39d865
commit 53a1d0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm
@@ -446,6 +446,10 @@ Additional game mode variables.
 			to_chat(xeno_candidate, SPAN_WARNING("You cannot join if the xenomorph is dead."))
 			return FALSE
 
+		if(new_xeno.stat == UNCONSCIOUS)
+			to_chat(xeno_candidate, SPAN_WARNING("You cannot join if the xenomorph is in critical condition or unconscious."))
+			return FALSE
+
 		if(!xeno_bypass_timer)
 			var/deathtime = world.time - xeno_candidate.timeofdeath
 			if(istype(xeno_candidate, /mob/new_player))

diff --git a/html/changelogs/AutoChangeLog-pr-4517.yml b/html/changelogs/AutoChangeLog-pr-4517.yml
@@ -0,0 +1,4 @@
+author: "TheGamerdk"
+delete-after: True
+changes:
+  - qol: "You can no longer doom yourself by joining as a crit xeno"