From f19647acc795dcd3b02894610f1ff50d549a617b Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 9 Mar 2020 18:47:06 -0700 Subject: [PATCH] Fixed uplinks not being given to traitors. Always remember to follow your code VERY CLOSELY or garbage like this happens. finalize_traitor calls traitor_kind.finalize_traitor(); that's how I intended it to happen. Instead, I foolishly wrote "traitor_kind.finalize_traitor()" in the on_gain() proc. I didn't notice for a LONG time, because... well, it's supposed to call finalize_traitor(), just not that one. The pitfalls of working with old code. --- code/modules/antagonists/traitor/classes/hijack.dm | 1 + code/modules/antagonists/traitor/datum_traitor.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/classes/hijack.dm b/code/modules/antagonists/traitor/classes/hijack.dm index 3f6b83a0ad..89c3d60a12 100644 --- a/code/modules/antagonists/traitor/classes/hijack.dm +++ b/code/modules/antagonists/traitor/classes/hijack.dm @@ -15,3 +15,4 @@ /datum/traitor_class/human/hijack/finalize_traitor(datum/antagonist/traitor/T) T.hijack_speed=1 + return TRUE diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 8c41a31785..3324f1e756 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -49,7 +49,7 @@ owner.special_role = special_role if(give_objectives) traitor_kind.forge_objectives(src) - traitor_kind.finalize_traitor(src) + finalize_traitor() ..() /datum/antagonist/traitor/apply_innate_effects()