From f8eca9fe66e54a8eaef48869f406a2bf2350fe08 Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:07:47 -0400 Subject: [PATCH] makes pick_employer actually pick employer (#65639) --- code/modules/antagonists/traitor/datum_traitor.dm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 8c2c7b448be..ec724ee7182 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -70,11 +70,7 @@ if(give_objectives) forge_traitor_objectives() - var/faction = prob(75) ? FACTION_SYNDICATE : FACTION_NANOTRASEN - - pick_employer(faction) - - traitor_flavor = strings(TRAITOR_FLAVOR_FILE, employer) + pick_employer() owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE) @@ -137,8 +133,10 @@ owner.special_role = null return ..() -/datum/antagonist/traitor/proc/pick_employer(faction) +/datum/antagonist/traitor/proc/pick_employer() + var/faction = prob(75) ? FACTION_SYNDICATE : FACTION_NANOTRASEN var/list/possible_employers = list() + possible_employers.Add(GLOB.syndicate_employers, GLOB.nanotrasen_employers) switch(faction) @@ -147,6 +145,7 @@ if(FACTION_NANOTRASEN) possible_employers -= GLOB.syndicate_employers employer = pick(possible_employers) + traitor_flavor = strings(TRAITOR_FLAVOR_FILE, employer) /datum/objective/traitor_progression name = "traitor progression"