From 8ee40aaddb3765c906e1241098d1c57fe1ecf367 Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Sun, 16 Jun 2024 02:34:16 -0700 Subject: [PATCH] fixes vampire executing nested marines (#6458) # 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 --- .../carbon/xenomorph/abilities/lurker/lurker_powers.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm index 51f23f22a09f..578cede8e979 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm @@ -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."))