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

Lurker no longer decloaks if they pounce onto a dead guy. #3724

Merged
merged 5 commits into from
Jun 29, 2023
Merged

Lurker no longer decloaks if they pounce onto a dead guy. #3724

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b51e0ea
Update lurker_abilities.dm
TheGamerdk Jun 25, 2023
a523931
Update lurker_abilities.dm
TheGamerdk Jun 25, 2023
d45c257
Update lurker_abilities.dm
TheGamerdk Jun 27, 2023
5e8db7f
Update lurker_abilities.dm
TheGamerdk Jun 28, 2023
2208e0e
Update lurker_abilities.dm
TheGamerdk Jun 28, 2023
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
17 changes: 9 additions & 8 deletions code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
View file
Open in desktop
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