cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-15 17:15:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7412 from Amunak/patch-3

Browse Source 
Fixes mercenary mode showing up as nuclear in vote
This commit is contained in:
Zuhayr
2014-12-13 05:17:34 +10:30
parent a0192f47df 47a3c717e1
commit 45edc7e4bc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/voting.dm
+4 -2
View File
@@ -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("<td align = 'center'>[M.required_players]</td>")
break
if("crew_transfer")
@@ -308,9 +310,9 @@ datum/controller/vote
if(!votes) votes = 0
. += "<tr>"
if(current_votes[C.ckey] == i)
. += "<td><b><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a></b></td><td align = 'center'>[votes]</td>"
. += "<td><b><a href='?src=\ref[src];vote=[i]'>[gamemode_names[choices[i]]]</a></b></td><td align = 'center'>[votes]</td>"
else
. += "<td><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a></b></td><td align = 'center'>[votes]</td>"
. += "<td><a href='?src=\ref[src];vote=[i]'>[gamemode_names[choices[i]]]</a></b></td><td align = 'center'>[votes]</td>"
if (additional_text.len >= i)
. += additional_text[i]