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

World > SSticker

Browse Source
This commit is contained in:
LetterJay
2017-05-22 12:31:05 -05:00
parent 2be5022536
commit e0f65beb37
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/vote.dm
+6 -6
View File
@@ -2,9 +2,9 @@ SUBSYSTEM_DEF(vote)
name = "Vote" name = "Vote"
wait = 10 wait = 10
flags = SS_KEEP_TIMING|SS_NO_INIT flags = SS_KEEP_TIMING|SS_NO_INIT
runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
var/initiator = null var/initiator = null
var/started_time = null var/started_time = null
@@ -120,13 +120,13 @@ SUBSYSTEM_DEF(vote)
if(SSticker && SSticker.mode)//Don't change the mode if the round already started. if(SSticker && SSticker.mode)//Don't change the mode if the round already started.
return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.") return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
GLOB.master_mode = . GLOB.master_mode = .
world.save_mode(.) SSticker.save_mode(.)
to_chat(world, "<span class='adminnotice'><b>The mode is now: [GLOB.master_mode]</b></span>") to_chat(world, "<span class='adminnotice'><b>The mode is now: [GLOB.master_mode]</b></span>")
log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].") log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
if("gamemode") if("gamemode")
if(GLOB.master_mode != .) if(GLOB.master_mode != .)
SSticker.save_mode(.) SSticker.save_mode(.)
if(SSticker.HasRoundStarted()) if(SSticker.HasRoundStarted())
restart = 1 restart = 1
else else
GLOB.master_mode = . GLOB.master_mode = .
@@ -137,7 +137,7 @@ SUBSYSTEM_DEF(vote)
active_admins = 1 active_admins = 1
break break
if(!active_admins) if(!active_admins)
SSticker.Reboot("Restart vote successful.", "end_error", "restart vote") SSticker.Reboot("Restart vote successful.", "end_error", "restart vote")
else else
to_chat(world, "<span style='boldannounce'>Notice:Restart vote will not restart the server automatically because there are active admins on.</span>") to_chat(world, "<span style='boldannounce'>Notice:Restart vote will not restart the server automatically because there are active admins on.</span>")
message_admins("A restart vote has passed, but there are active admins on with +server, so it has been canceled. If you wish, you may restart the server.") message_admins("A restart vote has passed, but there are active admins on with +server, so it has been canceled. If you wish, you may restart the server.")
code/world.dm
+3 -3
View File
@@ -32,7 +32,7 @@
load_motd() load_motd()
load_admins() load_admins()
load_mentors() // load_mentors()
load_menu() load_menu()
if(config.usewhitelist) if(config.usewhitelist)
load_whitelist() load_whitelist()
@@ -83,7 +83,7 @@
if(fexists(GLOB.config_error_log)) if(fexists(GLOB.config_error_log))
fcopy(GLOB.config_error_log, "[GLOB.log_directory]/config_error.log") fcopy(GLOB.config_error_log, "[GLOB.log_directory]/config_error.log")
fdel(GLOB.config_error_log) fdel(GLOB.config_error_log)
if(GLOB.round_id) if(GLOB.round_id)
log_game("Round ID: [GLOB.round_id]") log_game("Round ID: [GLOB.round_id]")
@@ -225,7 +225,7 @@
else else
to_chat(world, "<span class='boldannounce'>Rebooting world...</span>") to_chat(world, "<span class='boldannounce'>Rebooting world...</span>")
Master.Shutdown() //run SS shutdowns Master.Shutdown() //run SS shutdowns
log_world("World rebooted at [time_stamp()]"); log_world("World rebooted at [time_stamp()]");
..() ..()
/world/proc/load_motd() /world/proc/load_motd()