From 8809ada03ee63ccdf27a6aa0547225fe5fc6cbed Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Mon, 8 May 2023 18:44:47 -0300 Subject: [PATCH] Thunderdome no longer allows unfair fights (#20981) * Thunderdome no longer allows unfair fights * surplus candidate warning --- code/modules/admin/verbs/one_click_antag.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 1a6231040cd..69949bae6e3 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -301,7 +301,10 @@ return FALSE // Time to set up our team structure if(length(thunderdome_candidates) > max_thunderdome_players) - thunderdome_candidates.Cut(max_thunderdome_players) + thunderdome_candidates.Cut(max_thunderdome_players + 1) + if(ISODD(length(thunderdome_candidates))) // We want fair fights + var/surplus_candidate = pick_n_take(thunderdome_candidates) + to_chat(surplus_candidate, "You were not chosen due to an odd number of participants.") for(var/mob/dead/observer/candidate_to_spawn in thunderdome_candidates) if(!candidate_to_spawn || !candidate_to_spawn.key || !candidate_to_spawn.client) continue