mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
Probably fix the map vote having a huge delay.
This commit is contained in:
@@ -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.")
|
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
|
return 1
|
||||||
|
|
||||||
else
|
else
|
||||||
@@ -355,3 +362,4 @@ datum/shuttle_controller/emergency_shuttle/process()
|
|||||||
S.direction = spawndir
|
S.direction = spawndir
|
||||||
spawn()
|
spawn()
|
||||||
S.startmove()
|
S.startmove()
|
||||||
|
|
||||||
|
|||||||
@@ -293,6 +293,7 @@ var/global/datum/controller/vote/vote = new()
|
|||||||
else
|
else
|
||||||
if(istype(usr) && usr.client)
|
if(istype(usr) && usr.client)
|
||||||
interact(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>")
|
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)
|
switch(vote_type)
|
||||||
if("crew_transfer")
|
if("crew_transfer")
|
||||||
@@ -323,9 +324,14 @@ var/global/datum/controller/vote/vote = new()
|
|||||||
|
|
||||||
|
|
||||||
/datum/controller/vote/proc/interact(client/user)
|
/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)
|
if(!user || !initialized)
|
||||||
return
|
return
|
||||||
if(ismob(user)) user = user:client
|
|
||||||
|
if(ismob(user))
|
||||||
|
user = user:client
|
||||||
|
|
||||||
voting |= user
|
voting |= user
|
||||||
interface.show(user)
|
interface.show(user)
|
||||||
var/list/client_data = list()
|
var/list/client_data = list()
|
||||||
|
|||||||
Reference in New Issue
Block a user