Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

You're not my brother anymore #1484

Merged
merged 2 commits into from
Sep 23, 2024
Merged

You're not my brother anymore #1484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0b423e
Count team member as invalid target for an objective
m-dzianishchyts Sep 9, 2024
fa4b7f9
Merge branch 'master' into team-antag-objective-fix
AyIong Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modular_ss220/_defines220/code/gamemode.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
9 changes: 9 additions & 0 deletions modular_ss220/antagonists/code/objectives.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading