From e0f65beb3789362f87f85e2f60f2ff40625a97ad Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 22 May 2017 12:31:05 -0500
Subject: [PATCH] World > SSticker

---
 code/controllers/subsystem/vote.dm | 12 ++++++------
 code/world.dm                      |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 7666cb605e..deea959c00 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -2,9 +2,9 @@ SUBSYSTEM_DEF(vote)
 	name = "Vote"
 	wait = 10
 
-	flags = SS_KEEP_TIMING|SS_NO_INIT
-	
-	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
+	flags = SS_KEEP_TIMING|SS_NO_INIT
+
+	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 
 	var/initiator = 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.
 					return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
 				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>")
 				log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
 			if("gamemode")
 				if(GLOB.master_mode != .)
 					SSticker.save_mode(.)
-					if(SSticker.HasRoundStarted())
+					if(SSticker.HasRoundStarted())
 						restart = 1
 					else
 						GLOB.master_mode = .
@@ -137,7 +137,7 @@ SUBSYSTEM_DEF(vote)
 				active_admins = 1
 				break
 		if(!active_admins)
-			SSticker.Reboot("Restart vote successful.", "end_error", "restart vote")
+			SSticker.Reboot("Restart vote successful.", "end_error", "restart vote")
 		else
 			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.")
diff --git a/code/world.dm b/code/world.dm
index 49427a9a21..566c9e213c 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -32,7 +32,7 @@
 
 	load_motd()
 	load_admins()
-	load_mentors()
+//	load_mentors()
 	load_menu()
 	if(config.usewhitelist)
 		load_whitelist()
@@ -83,7 +83,7 @@
 	if(fexists(GLOB.config_error_log))
 		fcopy(GLOB.config_error_log, "[GLOB.log_directory]/config_error.log")
 		fdel(GLOB.config_error_log)
-	
+
 	if(GLOB.round_id)
 		log_game("Round ID: [GLOB.round_id]")
 
@@ -225,7 +225,7 @@
 	else
 		to_chat(world, "<span class='boldannounce'>Rebooting world...</span>")
 		Master.Shutdown()	//run SS shutdowns
-	log_world("World rebooted at [time_stamp()]"); 
+	log_world("World rebooted at [time_stamp()]");
 	..()
 
 /world/proc/load_motd()