From f35b10850ae0d69561e2d0f2c7116c5b3d01f71e Mon Sep 17 00:00:00 2001 From: Pooble <90473506+poobsie@users.noreply.github.com> Date: Fri, 5 Dec 2025 02:43:58 -0500 Subject: [PATCH] infil and protect mutual exclusivity (#31133) --- code/modules/antagonists/_common/antag_datum.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 96eb7c474a8..1f6bc929c72 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -487,6 +487,9 @@ GLOBAL_LIST_EMPTY(antagonists) // Prevent duplicate infiltrate objectives if(locate(/datum/objective/infiltrate_sec) in owner.get_all_objectives()) objective_to_add = roll_single_human_objective() + // Mutual exclusivity with protecting someone + else if(locate(/datum/objective/protect) in owner.get_all_objectives()) + objective_to_add = roll_single_human_objective() else objective_to_add = /datum/objective/infiltrate_sec @@ -496,7 +499,11 @@ GLOBAL_LIST_EMPTY(antagonists) objective_to_add = /datum/objective/incriminate if(PROTECT_OBJECTIVE) - objective_to_add = /datum/objective/protect + // Mutual exclusivity with infiltrating Sec + if(locate(/datum/objective/infiltrate_sec) in owner.get_all_objectives()) + objective_to_add = roll_single_human_objective() + else + objective_to_add = /datum/objective/protect if(delayed_objectives) objective_to_add = new /datum/objective/delayed(objective_to_add)