Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/SquadBriefings(Optional)' into S…
Browse files Browse the repository at this point in the history
…quadBriefings(Optional)
  • Loading branch information
Warfan1815 committed Sep 27, 2023
2 parents 2ef70cd + e39d865 commit 53a1d0d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/game/gamemodes/cm_initialize.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-4517.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "TheGamerdk"
delete-after: True
changes:
- qol: "You can no longer doom yourself by joining as a crit xeno"

0 comments on commit 53a1d0d

Please sign in to comment.