From 0852a9f4b11dac95a0f624dfc7785decfefdd66d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 4 Jul 2013 20:34:37 -0700 Subject: [PATCH] Partial fix for #3236 --- code/modules/mob/new_player/new_player.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 5e7c613004f..a04918afb13 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -268,7 +268,15 @@ return 1 - proc/AttemptLateSpawn(rank) + proc/AttemptLateSpawn(rank) + if (src != usr) + return 0 + if(!ticker || ticker.current_state != GAME_STATE_PLAYING) + usr << "\red The round is either not ready, or has already finished..." + return 0 + if(!enter_allowed) + usr << "\blue There is an administrative lock on entering the game!" + return 0 if(!IsJobAvailable(rank)) src << alert("[rank] is not available. Please try another.") return 0