shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31167 from tgstation/Cyberboss-patch-2

Browse Source 
Prompt for observer confirmation now happens when you click it initially
This commit is contained in:
oranges
2017-10-01 14:43:52 -05:00
committed by CitadelStationBot
parent 19abe58f05
commit c56bb27bbd
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/new_player/new_player.dm
+10 -9
View File
@@ -115,6 +115,15 @@
//no longer is required //no longer is required
if(SSticker.current_state <= GAME_STATE_PREGAME) if(SSticker.current_state <= GAME_STATE_PREGAME)
ready = tready 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 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) if(!SSticker.current_state < GAME_STATE_PREGAME && tready == PLAYER_READY_TO_OBSERVE)
ready = tready ready = tready
@@ -259,15 +268,7 @@
if(QDELETED(src) || !src.client) if(QDELETED(src) || !src.client)
ready = PLAYER_NOT_READY ready = PLAYER_NOT_READY
return FALSE 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() var/mob/dead/observer/observer = new()
spawning = TRUE spawning = TRUE