diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 72858e06..f5c91f14 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -161,6 +161,12 @@ SUBSYSTEM_DEF(vote) restart = 1 else GLOB.master_mode = . + if("map") + var/datum/map_config/VM = config.maplist[.] + message_admins("The map has been voted for and will change to: [VM.map_name]") + log_admin("The map has been voted for and will change to: [VM.map_name]") + if(SSmapping.changemap(config.maplist[.])) + to_chat(world, "The map vote has chosen [VM.map_name] for next round!") if("transfer") // austation begin -- Crew autotransfer vote if(. == "Initiate Crew Transfer") //TODO find a cleaner way to do this @@ -168,12 +174,6 @@ SUBSYSTEM_DEF(vote) var/obj/machinery/computer/communications/C = locate() in GLOB.machines if(C) C.post_status("shuttle") // austation end - if("map") - var/datum/map_config/VM = config.maplist[.] - message_admins("The map has been voted for and will change to: [VM.map_name]") - log_admin("The map has been voted for and will change to: [VM.map_name]") - if(SSmapping.changemap(config.maplist[.])) - to_chat(world, "The map vote has chosen [VM.map_name] for next round!") if(restart) var/active_admins = 0 for(var/client/C in GLOB.admins) @@ -230,12 +230,12 @@ SUBSYSTEM_DEF(vote) choices.Add("Restart Round","Continue Playing") if("gamemode") choices.Add(config.votable_modes) - if("transfer") // austation begin -- Crew autotranfer vote - choices.Add("Initiate Crew Transfer","Continue Playing") // austation end if("map") choices.Add(config.maplist) for(var/i in choices)//this is necessary because otherwise we'll end up with a bunch of /datum/map_config's as the default vote value instead of 0 as intended choices[i] = 0 + if("transfer") // austation begin -- Crew autotranfer vote + choices.Add("Initiate Crew Transfer","Continue Playing") // austation end if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote choices.Add("secret", "extended") if("custom")