cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added vars to change hide mode.

Browse Source
This commit is contained in:
DJSnapshot
2013-08-23 06:22:07 -07:00
parent 4bd67e83b8
commit 7265509b1d
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/controllers/voting.dm
View File

@@ -13,6 +13,7 @@ datum/controller/vote
var/list/voting = list() var/list/voting = list()
var/list/current_votes = list() var/list/current_votes = list()
var/auto_muted = 0 var/auto_muted = 0
var/hide_mode = 1
New() New()
if(vote != src) if(vote != src)
@@ -117,17 +118,16 @@ datum/controller/vote
var/text var/text
if(winners.len > 0) if(winners.len > 0)
if(winners.len > 1) 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 = "<b>Vote Tied Between:</b>\n" text = "<b>Vote Tied Between:</b>\n"
for(var/option in winners) for(var/option in winners)
if(mode != "gamemode") text += "\t[option]\n"
text += "\t[option]\n"
. = pick(winners) . = pick(winners)
for(var/key in current_votes) for(var/key in current_votes)
if(choices[current_votes[key]] == .) if(choices[current_votes[key]] == .)
round_voters += key // Keep track of who voted for the winning round. 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 += "<b>Vote Result: [.]</b>" text += "<b>Vote Result: [.]</b>"
else else
if(mode != "gamemode") if(mode != "gamemode")

7
code/modules/mob/new_player/new_player.dm
View File

@@ -5,6 +5,7 @@
var/spawning = 0//Referenced when you want to delete the new_player later on in the code. 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/totalPlayers = 0 //Player counts for the Lobby tab
var/totalPlayersReady = 0 var/totalPlayersReady = 0
var/hide_mode = 1
universal_speak = 1 universal_speak = 1
invisibility = 101 invisibility = 101
@@ -74,8 +75,10 @@
if(ticker.hide_mode) if(ticker.hide_mode)
stat("Game Mode:", "Secret") stat("Game Mode:", "Secret")
else else
//stat("Game Mode:", "[master_mode]") -- Old setting for showing the game mode if(hide_mode == 0)
stat("Game Mode: ", "Secret") 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) if((ticker.current_state == GAME_STATE_PREGAME) && going)
stat("Time To Start:", ticker.pregame_timeleft) stat("Time To Start:", ticker.pregame_timeleft)