Merge branch 'master' into richard_mask

ss220club · Sep 23, 2024 · 2e32ab4 · 2e32ab4
2 parents af71dc3 + 99a1c42
commit 2e32ab4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/modular_ss220/_defines220/code/gamemode.dm b/modular_ss220/_defines220/code/gamemode.dm
@@ -2,3 +2,5 @@
 #define SPECIAL_ROLE_VOX_RAIDER "Vox Raider"
 
 #define isvoxcash(W) (istype(W, /obj/item/stack/vox_cash))
+
+#define TARGET_INVALID_SAME_TEAM (-1)
diff --git a/modular_ss220/antagonists/code/objectives.dm b/modular_ss220/antagonists/code/objectives.dm
@@ -1,3 +1,12 @@
+/datum/objective/is_invalid_target(datum/mind/possible_target)
+	. = ..()
+	if(.)
+		return
+	if(team)
+		for(var/datum/antagonist/target_datum in possible_target.antag_datums)
+			if(team == target_datum.get_team())
+				return TARGET_INVALID_SAME_TEAM
+
 /datum/objective/raider_steal
 	name = "Raider theft"
 	needs_target = FALSE