From e2dd424fb0b2dc067600c2aeb1805d715f703bb2 Mon Sep 17 00:00:00 2001 From: oranges Date: Mon, 2 Oct 2017 09:35:15 +1300 Subject: [PATCH] Revert "Prompt for observer confirmation now happens when you click it initially" --- .../modules/mob/dead/new_player/new_player.dm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 01a5b166d3..aca1d9b63f 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -115,15 +115,6 @@ //no longer is required if(SSticker.current_state <= GAME_STATE_PREGAME) ready = tready - - var/this_is_like_playing_right = alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No") - - if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes") - ready = PLAYER_NOT_READY - src << browse(null, "window=playersetup") //closes the player setup window - new_player_panel() - return FALSE - //if it's post initialisation and they're trying to observe we do the needful if(!SSticker.current_state < GAME_STATE_PREGAME && tready == PLAYER_READY_TO_OBSERVE) ready = tready @@ -268,7 +259,15 @@ if(QDELETED(src) || !src.client) ready = PLAYER_NOT_READY return FALSE - + + var/this_is_like_playing_right = alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No") + + if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes") + ready = PLAYER_NOT_READY + src << browse(null, "window=playersetup") //closes the player setup window + new_player_panel() + return FALSE + var/mob/dead/observer/observer = new() spawning = TRUE