From 4c5665d4fd51b03fbc6d62c32a8b2210ffd306a8 Mon Sep 17 00:00:00 2001 From: Akai Alonkai Date: Wed, 1 Oct 2014 06:16:29 -0400 Subject: [PATCH] Add round start check to Declare Ready Added a check to 'declare ready' to prevent readying up after the round started. Allowing this to happen caused a bug where the player would be unable to change their character setup if they declared ready after the round started, such as to look at the manifest to see which character would be best to play, until after reconnecting. --- code/modules/mob/new_player/new_player.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 9071e3193b9..fa147113b49 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -95,7 +95,10 @@ return 1 if(href_list["ready"]) - ready = !ready + if(!ticker || ticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started + ready = !ready + else + ready = 0 if(href_list["refresh"]) src << browse(null, "window=playersetup") //closes the player setup window