Probably fix the map vote having a huge delay.

This commit is contained in:
PJB3005
2016-02-18 19:04:14 +01:00
parent 2d9b868dcf
commit ffadb44374
2 changed files with 15 additions and 1 deletions

View File

@@ -303,6 +303,13 @@ datum/shuttle_controller/emergency_shuttle/process()
captain_announce("The Emergency Shuttle has left the station. Estimate [round(timeleft()/60,1)] minutes until the shuttle docks at Central Command.")
// "preload" the assets for when they're needed for the map vote.
if(config.map_voting && vote)
for(var/client/C in clients)
spawn
vote.interface.sendAssets(C)
return 1
else
@@ -355,3 +362,4 @@ datum/shuttle_controller/emergency_shuttle/process()
S.direction = spawndir
spawn()
S.startmove()

View File

@@ -293,6 +293,7 @@ var/global/datum/controller/vote/vote = new()
else
if(istype(usr) && usr.client)
interact(usr.client)
to_chat(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>")
switch(vote_type)
if("crew_transfer")
@@ -323,9 +324,14 @@ var/global/datum/controller/vote/vote = new()
/datum/controller/vote/proc/interact(client/user)
set waitfor = FALSE // So we don't wait for each individual client's assets to be sent.
if(!user || !initialized)
return
if(ismob(user)) user = user:client
if(ismob(user))
user = user:client
voting |= user
interface.show(user)
var/list/client_data = list()