cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

infil and protect mutual exclusivity (#31133)

Browse Source
This commit is contained in:
Pooble
2025-12-05 02:43:58 -05:00
committed by GitHub
parent 547d33a68b
commit f35b10850a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/_common/antag_datum.dm
+8 -1
View File
@@ -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)