From 5eba560f8c137cdcf2dec1f829337917d4968d97 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Thu, 29 Jun 2023 05:18:34 +0200 Subject: [PATCH] Lurker no longer decloaks if they pounce onto a dead guy. (#3724) # About the pull request Doesn't make sense to lose your cloak for pouncing at a dead guy. They'll still decloak if it's a living guy hiding under a dead guy. (This only happens if your pounce ends on a tile where there's a dead guy) # Explain why it's good for the game Inconsistent at best. Bad # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Lurkers no longer lose their pounce if they happen to end their pounce on a tile with a dead human /:cl: --- .../abilities/lurker/lurker_abilities.dm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm index e0a29a034029..0c9358119def 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm @@ -14,20 +14,21 @@ can_be_shield_blocked = TRUE /datum/action/xeno_action/activable/pounce/lurker/additional_effects_always() - var/mob/living/carbon/xenomorph/X = owner - if (!istype(X)) + var/mob/living/carbon/xenomorph/xeno = owner + if (!istype(xeno)) return - - if (X.mutation_type == LURKER_NORMAL) + if (xeno.mutation_type == LURKER_NORMAL) var/found = FALSE - for (var/mob/living/carbon/human/H in get_turf(X)) + for (var/mob/living/carbon/human/human in get_turf(xeno)) + if(human.stat == DEAD) + continue found = TRUE break if (found) - var/datum/action/xeno_action/onclick/lurker_invisibility/LIA = get_xeno_action_by_type(X, /datum/action/xeno_action/onclick/lurker_invisibility) - if (istype(LIA)) - LIA.invisibility_off() + var/datum/action/xeno_action/onclick/lurker_invisibility/lurker_invis = get_xeno_action_by_type(xeno, /datum/action/xeno_action/onclick/lurker_invisibility) + if (istype(lurker_invis)) + lurker_invis.invisibility_off() /datum/action/xeno_action/activable/pounce/lurker/additional_effects(mob/living/L) var/mob/living/carbon/xenomorph/X = owner