Skip to content

Commit

Permalink
fixes vampire executing nested marines (#6458)
Browse files Browse the repository at this point in the history
# About the pull request
Resolves #6453 

# Explain why it's good for the game
bug bad

# Changelog
:cl:
fix: fixes vampire being able to execute hugged marines
/:cl:

---------

Co-authored-by: DOOM <N/A>
  • Loading branch information
vero5123 committed Jun 16, 2024
1 parent ea24776 commit 8ee40aa
Showing 1 changed file with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,12 @@
if(xeno.action_busy)
return

if(target_carbon.status_flags & XENO_HOST)
for(var/obj/item/alien_embryo/embryo in target_carbon)
if(HIVE_ALLIED_TO_HIVE(xeno.hivenumber, embryo.hivenumber))
to_chat(xeno, SPAN_WARNING("We should not harm this host! It has a sister inside."))
return

xeno.visible_message(SPAN_DANGER("[xeno] grabs [target_carbon]’s head aggressively."), \
SPAN_XENOWARNING("We grab [target_carbon]’s head aggressively."))

Expand Down

0 comments on commit 8ee40aa

Please sign in to comment.