cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

makes pick_employer actually pick employer (#65639)

Browse Source
This commit is contained in:
John Willard
2022-03-25 23:07:47 -04:00
committed by GitHub
parent 355b50be61
commit f8eca9fe66
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/traitor/datum_traitor.dm
+5 -6
View File
@@ -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"