From 354ca22c9ad3cb460d75873434fc6940feb8c148 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sat, 28 Mar 2020 00:28:44 -0400 Subject: [PATCH 1/2] Makes contractor targets actually show up in the traitor panel --- code/modules/antagonists/traitor/datum_traitor.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index d3aae4b75a..b0a2d6a9d6 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -96,6 +96,13 @@ equip(silent) owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE) +/datum/antagonist/traitor/antag_panel_objectives() + . = ..() + if(contractor_hub?.assigned_targets) + . += "Contract Targets:
" + for(var/datum/mind/M in contractor_hub.assigned_targets) + . += " - [key_name(M, FALSE, TRUE)]
" + /datum/antagonist/traitor/apply_innate_effects(mob/living/mob_override) . = ..() update_traitor_icons_added() From d1d090ae6f9257c3c7f96a9084b6b64bb593d321 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 29 Mar 2020 11:54:49 -0400 Subject: [PATCH 2/2] adds a length check for if the assigned targets list spontaneously deletes itself --- code/modules/antagonists/traitor/datum_traitor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index b0a2d6a9d6..af1ec50074 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -98,7 +98,7 @@ /datum/antagonist/traitor/antag_panel_objectives() . = ..() - if(contractor_hub?.assigned_targets) + if(contractor_hub?.assigned_targets && length(contractor_hub.assigned_targets)) . += "Contract Targets:
" for(var/datum/mind/M in contractor_hub.assigned_targets) . += " - [key_name(M, FALSE, TRUE)]
"