From 47a3c717e1028936232127b30978382207c4689b Mon Sep 17 00:00:00 2001 From: Amunak Date: Fri, 12 Dec 2014 04:20:05 +0100 Subject: [PATCH] Fixes mercenary mode showing up as nuclear in vote All gamemodes in the vote just take the actual game mode name instead of the config name. --- code/controllers/voting.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 33872391016..560dd8613c0 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -9,6 +9,7 @@ datum/controller/vote var/mode = null var/question = null var/list/choices = list() + var/list/gamemode_names = list() var/list/voted = list() var/list/voting = list() var/list/current_votes = list() @@ -217,6 +218,7 @@ datum/controller/vote for (var/T in L) var/datum/game_mode/M = new T() if (M.config_tag == F) + gamemode_names[M.config_tag] = capitalize(M.name) //It's ugly to put this here but it works additional_text.Add("[M.required_players]") break if("crew_transfer") @@ -308,9 +310,9 @@ datum/controller/vote if(!votes) votes = 0 . += "" if(current_votes[C.ckey] == i) - . += "[choices[i]][votes]" + . += "[gamemode_names[choices[i]]][votes]" else - . += "[choices[i]][votes]" + . += "[gamemode_names[choices[i]]][votes]" if (additional_text.len >= i) . += additional_text[i]