From 26064e09923fab869d29793247e1452832722db6 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 7 Jan 2020 17:37:57 -0800 Subject: [PATCH 1/2] crap --- 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 40d1712bc3..595ce5bb90 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -182,7 +182,7 @@ destroy_objective.owner = owner destroy_objective.find_target() add_objective(destroy_objective) - else if(prob(30) || (mode.storyteller.flags & NO_ASSASSIN)) + else if(prob(30) || (is_dynamic && (mode.storyteller.flags & NO_ASSASSIN))) var/datum/objective/maroon/maroon_objective = new maroon_objective.owner = owner maroon_objective.find_target() From a97fa8f81a178f76c24f204a80b7c9708af6b388 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 7 Jan 2020 18:01:24 -0800 Subject: [PATCH 2/2] also made objectives deletable --- code/datums/mind.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 5c92c83fb5..8ae45ff720 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -525,7 +525,7 @@ if(!objective) to_chat(usr,"Invalid objective.") return - //qdel(objective) Needs cleaning objective destroys + qdel(objective) //TODO: Needs cleaning objective destroys (whatever that means) message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]") log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]")