Merge branch 'master' into tac-refactor

cmss13-devs · Sep 29, 2023 · 355e0f3 · 355e0f3
2 parents bb7726e + 20da19a
commit 355e0f3
Show file tree

Hide file tree

Showing 12 changed files with 1,390 additions and 1,378 deletions.
diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm
@@ -446,7 +446,7 @@ 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)
+		if(new_xeno.health <= 0)
 			to_chat(xeno_candidate, SPAN_WARNING("You cannot join if the xenomorph is in critical condition or unconscious."))
 			return FALSE