From 2d08825f5766feda0ea3306e5c5f16d74794e3c8 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Sat, 9 Dec 2023 10:10:46 +0000 Subject: [PATCH] Resting now cancels xenomorph Evolve again (#5162) # 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
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Resting once again cancels xenomorph evolve. /:cl: --- code/modules/mob/living/carbon/xenomorph/Evolution.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm index af6be8265cc0..49d73e71a241 100644 --- a/code/modules/mob/living/carbon/xenomorph/Evolution.dm +++ b/code/modules/mob/living/carbon/xenomorph/Evolution.dm @@ -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