Refactors roundstart checks slightly

This commit is contained in:
CitadelStationBot
2017-04-26 17:06:29 -05:00
parent e7df2bc14a
commit 08a01aa11b
19 changed files with 59 additions and 19 deletions
+1 -1
View File
@@ -804,7 +804,7 @@
return 1
/client/proc/adminGreet(logout)
if(SSticker && SSticker.current_state == GAME_STATE_PLAYING)
if(SSticker.HasRoundStarted())
var/string
if(logout && config && config.announce_admin_logout)
string = pick(
+1 -1
View File
@@ -310,7 +310,7 @@
usr << browse(dat, "window=players;size=600x480")
/datum/admins/proc/check_antagonists()
if (SSticker && SSticker.current_state >= GAME_STATE_PLAYING)
if (SSticker.HasRoundStarted())
var/dat = "<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>"
if(SSticker.mode.replacementmode)
dat += "Former Game Mode: <B>[SSticker.mode.name]</B><BR>"
+1 -1
View File
@@ -2161,7 +2161,7 @@
else if(href_list["kick_all_from_lobby"])
if(!check_rights(R_ADMIN))
return
if(SSticker && SSticker.current_state == GAME_STATE_PLAYING)
if(SSticker.IsRoundInProgress())
var/afkonly = text2num(href_list["afkonly"])
if(alert("Are you sure you want to kick all [afkonly ? "AFK" : ""] clients from the lobby??","Message","Yes","Cancel") != "Yes")
to_chat(usr, "Kick clients from lobby aborted")