Skip to content

Commit

Permalink
Lurker no longer decloaks if they pounce onto a dead guy. (#3724)
Browse files Browse the repository at this point in the history
# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

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
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Lurkers no longer lose their pounce if they happen to end their
pounce on a tile with a dead human
/:cl:
  • Loading branch information
TheGamerdk committed Jun 29, 2023
1 parent 46a6d76 commit 5eba560
Showing 1 changed file with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5eba560

Please sign in to comment.