From 2525f4f8aadd262995ffe546ba652e56e00fd11f Mon Sep 17 00:00:00 2001
From: DJSnapshot <trevornaze@gmail.com>
Date: Fri, 23 Aug 2013 06:38:22 -0700
Subject: [PATCH] Moved hide_mode vars to global ticker instance.

---
 code/controllers/voting.dm                | 5 ++---
 code/modules/mob/new_player/new_player.dm | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm
index 8e67d69cb7..9bb2197e6e 100644
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -13,7 +13,6 @@ datum/controller/vote
 	var/list/voting = list()
 	var/list/current_votes = list()
 	var/auto_muted = 0
-	var/hide_mode = 1
 
 	New()
 		if(vote != src)
@@ -118,7 +117,7 @@ datum/controller/vote
 		var/text
 		if(winners.len > 0)
 			if(winners.len > 1)
-				if(mode != "gamemode" || hide_mode == 0) // Here we are making sure we don't announce potential game modes
+				if(mode != "gamemode" || ticker.hide_mode == 0) // Here we are making sure we don't announce potential game modes
 					text = "<b>Vote Tied Between:</b>\n"
 				for(var/option in winners)
 					text += "\t[option]\n"
@@ -127,7 +126,7 @@ datum/controller/vote
 			for(var/key in current_votes)
 				if(choices[current_votes[key]] == .)
 					round_voters += key // Keep track of who voted for the winning round.
-			if((mode == "gamemode" && . == "extended") || hide_mode == 0) // Announce Extended gamemode, but not other gamemodes
+			if((mode == "gamemode" && . == "extended") || ticker.hide_mode == 0) // Announce Extended gamemode, but not other gamemodes
 				text += "<b>Vote Result: [.]</b>"
 			else
 				if(mode != "gamemode")
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index acbccd7f14..35ca983d8e 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -5,7 +5,6 @@
 	var/spawning = 0//Referenced when you want to delete the new_player later on in the code.
 	var/totalPlayers = 0		 //Player counts for the Lobby tab
 	var/totalPlayersReady = 0
-	var/hide_mode = 1
 	universal_speak = 1
 
 	invisibility = 101
@@ -75,7 +74,7 @@
 			if(ticker.hide_mode)
 				stat("Game Mode:", "Secret")
 			else
-				if(hide_mode == 0)
+				if(ticker.hide_mode == 0)
 					stat("Game Mode:", "[master_mode]") // Old setting for showing the game mode
 				else
 					stat("Game Mode: ", "Secret")