Skip to content

Commit

Permalink
Resting now cancels xenomorph Evolve again (#5162)
Browse files Browse the repository at this point in the history
# About the pull request

Resting once again cancels xenomorph evolve..

nb. You can also resist to do the same.

# Explain why it's good for the game
# 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: Resting once again cancels xenomorph evolve.
/:cl:
  • Loading branch information
Birdtalon committed Dec 9, 2023
1 parent 0e7c1d4 commit 2d08825
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/Evolution.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
evolving = TRUE
var/level_to_switch_to = get_vision_level()

if(!do_after(src, 2.5 SECONDS, INTERRUPT_INCAPACITATED, BUSY_ICON_HOSTILE)) // Can evolve while moving
to_chat(src, SPAN_WARNING("You quiver, but nothing happens. Hold still while evolving."))
if(!do_after(src, 2.5 SECONDS, INTERRUPT_INCAPACITATED|INTERRUPT_CHANGED_LYING, BUSY_ICON_HOSTILE)) // Can evolve while moving, resist or rest to cancel it.
to_chat(src, SPAN_WARNING("You quiver, but nothing happens. Your evolution has ceased for now..."))
evolving = FALSE
return

Expand Down

0 comments on commit 2d08825

Please sign in to comment.