Merge branch 'master' into SquadBriefings(Optional)

cmss13-devs · Sep 27, 2023 · 107559e · 107559e
2 parents 1bc731c + f21e167
commit 107559e
Showing 1 changed file with 4 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))