diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index a81927cfd6..8e67d69cb7 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -13,6 +13,7 @@ datum/controller/vote var/list/voting = list() var/list/current_votes = list() var/auto_muted = 0 + var/hide_mode = 1 New() if(vote != src) @@ -117,17 +118,16 @@ datum/controller/vote var/text if(winners.len > 0) if(winners.len > 1) - if(mode != "gamemode") // Here we are making sure we don't announce potential game modes + if(mode != "gamemode" || hide_mode == 0) // Here we are making sure we don't announce potential game modes text = "Vote Tied Between:\n" for(var/option in winners) - if(mode != "gamemode") - text += "\t[option]\n" + text += "\t[option]\n" . = pick(winners) 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") // Announce Extended gamemode, but not other gamemodes + if((mode == "gamemode" && . == "extended") || hide_mode == 0) // Announce Extended gamemode, but not other gamemodes text += "Vote Result: [.]" 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 12219cc135..acbccd7f14 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -5,6 +5,7 @@ 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 @@ -74,8 +75,10 @@ if(ticker.hide_mode) stat("Game Mode:", "Secret") else - //stat("Game Mode:", "[master_mode]") -- Old setting for showing the game mode - stat("Game Mode: ", "Secret") + if(hide_mode == 0) + stat("Game Mode:", "[master_mode]") // Old setting for showing the game mode + else + stat("Game Mode: ", "Secret") if((ticker.current_state == GAME_STATE_PREGAME) && going) stat("Time To Start:", ticker.pregame_timeleft)