cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bep bop, map vote pops up if it happens.

Browse Source
This commit is contained in:
Chris
2014-11-26 11:17:50 -06:00
parent fe29414ac5
commit a15a954308
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/controllers/voting.dm
View File

@@ -173,7 +173,7 @@ var/global/datum/controller/vote/vote = new()
return vote
return 0
/datum/controller/vote/proc/initiate_vote(var/vote_type, var/initiator_key)
/datum/controller/vote/proc/initiate_vote(var/vote_type, var/initiator_key, var/popup = 0)
if(!mode)
if(started_time != null && !check_rights(R_ADMIN))
var/next_allowed_time = (started_time + config.vote_delay)
@@ -218,7 +218,13 @@ var/global/datum/controller/vote/vote = new()
text += "<br>[question]"
log_vote(text)
world << "<font color='purple'><b>[text]</b><br>Type vote to place your votes.<br>You have [ismapvote && ismapvote.len ? "60" : config.vote_period/10] seconds to vote.</font>"
if(!popup)
world << "<font color='purple'><b>[text]</b><br>Type vote to place your votes.<br>You have [ismapvote && ismapvote.len ? "60" : config.vote_period/10] seconds to vote.</font>"
else
for(var/mob/M in player_list)
if(M.client)
M << browse(vote.interface(M.client),"window=vote;can_close=0")
winset(M, "mapwindow.map", "focus=true") // return keyboard focus to map
switch(vote_type)
if("crew_transfer")
world << sound('sound/voice/Serithi/Shuttlehere.ogg')