Skip to content

Commit

Permalink
Fix Hiding When Busy (#3987)
Browse files Browse the repository at this point in the history
# About the pull request

This PR makes it so the xenohide ability requires the xeno to not be
busy (such as channeling a pounce). #3902 almost addressed this, but not
in the scenario of not being hidden -> pounce start -> insta hide.

# Explain why it's good for the game

Fixes working around unhide mechanics like this (can be much faster than
my example but I just had hide bound to a separate key):
https://cdn.discordapp.com/attachments/745447048261795890/1133194895918649354/hug.mp4

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

See above.

</details>


# Changelog
:cl: Drathek
fix: Fixed xeno hide ability not checking for busy status.
/:cl:
  • Loading branch information
Drulikar authored Jul 25, 2023
1 parent 47f8cad commit 5d8b4f8
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,9 @@
var/mob/living/carbon/xenomorph/xeno = owner
if(!xeno.check_state(TRUE))
return
if (!action_cooldown_check())
if(!action_cooldown_check())
return
if(xeno.action_busy)
return
if(xeno.layer != XENO_HIDING_LAYER)
xeno.layer = XENO_HIDING_LAYER
Expand Down

0 comments on commit 5d8b4f8

Please sign in to comment.