From 9d183beb9cd54c671a6ecd34b67fb25372509f90 Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Wed, 17 Jul 2019 18:15:55 -0700 Subject: [PATCH] Added --- code/__HELPERS/roundend.dm | 11 +++++++++++ code/controllers/subsystem/vote.dm | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index cdd2e99dd8..55d9e7a6cd 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -281,6 +281,17 @@ var/statspage = CONFIG_GET(string/roundstatsurl) var/info = statspage ? "[GLOB.round_id]" : GLOB.round_id parts += "[GLOB.TAB]Round ID: [info]" + + var/list/voting_results = SSvote.stored_gamemode_votes + + if(length(voting_results)) + parts += "[GLOB.TAB]Voting: " + var/total_score = 0 + for(var/choice in voting_results) + var/score = voting_results[choice] + total_score += score + parts += "[GLOB.TAB][GLOB.TAB][choice]: [score]" + parts += "[GLOB.TAB]Shift Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]" parts += "[GLOB.TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[popcount["station_integrity"]]%"]" var/total_players = GLOB.joined_player_list.len diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 422b1eda26..f432e44b18 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -18,6 +18,8 @@ SUBSYSTEM_DEF(vote) var/obfuscated = FALSE//CIT CHANGE - adds obfuscated/admin-only votes + var/list/stored_gamemode_votes = list() //Basically the last voted gamemode is stored here for end-of-round use. + /datum/controller/subsystem/vote/fire() //called by master_controller if(mode) time_remaining = round((started_time + CONFIG_GET(number/vote_period) - world.time)/10) @@ -90,10 +92,12 @@ SUBSYSTEM_DEF(vote) text += "[question]" else text += "[capitalize(mode)] Vote" + stored_gamemode_votes = list() for(var/i=1,i<=choices.len,i++) var/votes = choices[choices[i]] if(!votes) votes = 0 + stored_gamemode_votes[choices[i]] = votes text += "\n[choices[i]]: [obfuscated ? "???" : votes]" //CIT CHANGE - adds obfuscated votes if(mode != "custom") if(winners.len > 1 && !obfuscated) //CIT CHANGE - adds obfuscated votes