From 12680566b7464b5a970dc0c430004c056220656c Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 1 Jan 2020 23:37:14 -0800 Subject: [PATCH] fixed voting. FUCK --- code/controllers/subsystem/vote.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 85ecfb955f..573c89a5af 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -158,7 +158,7 @@ SUBSYSTEM_DEF(vote) scores_by_choice -= score_name while(scores_by_choice.len > 1) var/highest_median = 0 - for(var/score_name in scores_by_choice) + for(var/score_name in scores_by_choice) // first get highest median var/list/score = scores_by_choice[score_name] if(!score.len) scores_by_choice -= score_name @@ -166,7 +166,10 @@ SUBSYSTEM_DEF(vote) var/median = score[max(1,round(score.len/2))] if(median >= highest_median) highest_median = median - else + for(var/score_name in scores_by_choice) // then, remove + var/list/score = scores_by_choice[score_name] + var/median = score[max(1,round(score.len/2))] + if(median < highest_median) scores_by_choice -= score_name for(var/score_name in scores_by_choice) // after removals var/list/score = scores_by_choice[score_name]