rewrite, clarifications (#49)

This commit is contained in:
TalkingCactus
2016-09-19 19:42:00 -04:00
committed by GitHub
parent 84f7d4dc23
commit 829604cdb8
2 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -159,7 +159,7 @@ var/datum/subsystem/ticker/ticker
if(!can_continue)
qdel(mode)
mode = null
world << "<B>Error setting up [master_mode].</B> Reverting to pre-game lobby."
world << "<B>Error setting up [master_mode]. It's likely that there are no available antagonists for the selected mode.</B> Reverting to pre-game lobby."
SSjob.ResetOccupations()
return 0
else
+6 -6
View File
@@ -122,12 +122,12 @@ var/datum/subsystem/vote/SSvote
else
master_mode = .
if("roundtype")
if (ticker && ticker.mode)
return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
master_mode = .
log_admin("Mode has been voted for and switched to: [master_mode].")
world << "<span class='adminnotice'><b>The mode is now: [master_mode]</b></span>"
world.save_mode(master_mode)
if(ticker && ticker.mode)
message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
else if(master_mode != .)
world.save_mode(.)
master_mode = .
world << "<span class='adminnotice'><b>The mode is now: [master_mode]</b></span>"
if(restart)
var/active_admins = 0
for(var/client/C in admins)