From bd6392964e5cb8bc16fec5c00ae2e27f1b697eeb Mon Sep 17 00:00:00 2001 From: Vicacrov <49321394+Vicacrov@users.noreply.github.com> Date: Sat, 10 Feb 2024 14:20:23 +0100 Subject: [PATCH] Fixes Warden Praetorians being able to move around the ovipositored Queen (#5689) # About the pull request Fixes this bug: - Queen gets on ovipositor - Rests - Warden Praetorian uses the "Retrieve" skill on the Queen - Queen moves https://github.com/cmss13-devs/cmss13/assets/49321394/9b2f8415-4961-4541-b6dc-c79a81ddab15 # Explain why it's good for the game This is a silly bug. The original anchored check checked if the Praetorian was anchored, not its target. # Testing Photographs and Procedure No longer works:
Screenshots & Videos https://github.com/cmss13-devs/cmss13/assets/49321394/402cda65-b605-4c78-9b72-952563fc104b
# Changelog :cl: fix: Fixed Warden Praetorians being able to move around the ovipositored Queen with their Retrieve ability. /:cl: --- .../xenomorph/abilities/praetorian/praetorian_powers.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm index ee19a8c9de88..605fe290b468 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm @@ -926,16 +926,16 @@ to_chat(X, SPAN_XENODANGER("We cannot retrieve ourself!")) return - if(X.anchored) - to_chat(X, SPAN_XENODANGER("That sister cannot move!")) - return - if(!(A in view(7, X))) to_chat(X, SPAN_XENODANGER("That sister is too far away!")) return var/mob/living/carbon/xenomorph/targetXeno = A + if(targetXeno.anchored) + to_chat(X, SPAN_XENODANGER("That sister cannot move!")) + return + if(!(targetXeno.resting || targetXeno.stat == UNCONSCIOUS)) if(targetXeno.mob_size > MOB_SIZE_BIG) to_chat(X, SPAN_WARNING("[targetXeno] is too big to retrieve while standing up!"))