Skip to content

Commit

Permalink
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Browse files Browse the repository at this point in the history
…efactor
  • Loading branch information
doom committed Sep 29, 2023
2 parents 3ac897d + 355e0f3 commit 6d1f6d3
Show file tree
Hide file tree
Showing 12 changed files with 1,390 additions and 1,378 deletions.
2 changes: 1 addition & 1 deletion code/game/gamemodes/cm_initialize.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading

0 comments on commit 6d1f6d3

Please sign in to comment.