cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved hide_mode vars to global ticker instance.

Browse Source
This commit is contained in:
DJSnapshot
2013-08-23 06:38:22 -07:00
parent 7265509b1d
commit 2525f4f8aa
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/voting.dm
View File

@@ -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")