diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index aa8f7a3045..fd56804d06 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -143,11 +143,14 @@ SUBSYSTEM_DEF(vote) var/list/winners = get_result() var/text var/was_roundtype_vote = mode == "roundtype" || mode == "dynamic" + var/vote_title_text if(winners.len > 0) if(question) text += "[question]" + vote_title_text = "[question]" else text += "[capitalize(mode)] Vote" + vote_title_text = "[capitalize(mode)] Vote" if(was_roundtype_vote) stored_gamemode_votes = list() if(!obfuscated && vote_system == RANKED_CHOICE_VOTING) @@ -176,11 +179,11 @@ SUBSYSTEM_DEF(vote) switch(vote_system) if(APPROVAL_VOTING,PLURALITY_VOTING) for(var/i=1,i<=choices.len,i++) - SSblackbox.record_feedback("tally","voting",choices[choices[i]],choices[i]) + SSblackbox.record_feedback("nested tally","voting",choices[choices[i]],list(vote_title_text,choices[i])) if(RANKED_CHOICE_VOTING) for(var/i=1,i<=voted.len,i++) - for(var/j=1,j<=voted[i].len,j++) - SSblackbox.record_feedback("tally","voting",1,"[j]\th: "+choices[choices[j]]) + for(var/j=1,j<=voted[voted[i]].len,j++) + SSblackbox.record_feedback("nested tally","voting",1,list(vote_title_text,"[j]\th","[choices[j]]")) if(obfuscated) //CIT CHANGE - adds obfuscated votes. this messages admins with the vote's true results var/admintext = "Obfuscated results" if(vote_system == RANKED_CHOICE_VOTING) diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index 4f57dbb7a0..b6b1866814 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -397,7 +397,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, null) log_game("DYNAMIC: [roundstart_rules.len] rules.") return TRUE SSblackbox.record_feedback("tally","dynamic",roundstart_rules.len,"Roundstart rules considered") - SSblackbox.record_feedback("tally","dynamic",roundstart_rules.len,"Players readied up") + SSblackbox.record_feedback("tally","dynamic",roundstart_pop_ready,"Players readied up") if(GLOB.dynamic_forced_roundstart_ruleset.len > 0) rigged_roundstart() else