From 438d55ed442ba76a023d1a0e352a0eb8180abe68 Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Fri, 7 Sep 2012 22:04:55 +0000 Subject: [PATCH] The late-join button now requires the ticker's state to be GAME_STATE_PLAYING. Meaning that you can not late-join before the round actually starts or after the nuke up/malf ending cinematic. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4646 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/new_player/new_player.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 1be3bc1eedd..acf04c76a65 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -147,6 +147,8 @@ return 1 if(href_list["late_join"]) + if(!ticker || ticker.current_state != GAME_STATE_PLAYING) + usr << "/red The round is either not ready, or has already finished..." LateChoices() if(href_list["SelectedJob"])