From f4499bc274669a198489a60c1f61e3924133ecba Mon Sep 17 00:00:00 2001 From: Vile Beggar Date: Wed, 31 Jul 2024 18:09:04 +0200 Subject: [PATCH 1/2] stops the queen from resting while on ovi --- code/modules/mob/living/carbon/xenomorph/castes/Queen.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index 5b9c410e235a..4ee042e3a59d 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -361,6 +361,10 @@ /mob/living/carbon/xenomorph/queen/can_destroy_special() return TRUE +/mob/living/carbon/xenomorph/queen/set_resting(new_resting, silent, instant) + if(ovipositor) + return + . = ..() /mob/living/carbon/xenomorph/queen/get_organ_icon() return "heart_t3" From 7c04547654cc55219c3f78d411bd49d7de9766d0 Mon Sep 17 00:00:00 2001 From: Vile Beggar Date: Thu, 1 Aug 2024 14:02:24 +0200 Subject: [PATCH 2/2] apply suggestions from review --- code/modules/mob/living/carbon/xenomorph/castes/Queen.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index 4ee042e3a59d..db682e161e87 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -364,7 +364,7 @@ /mob/living/carbon/xenomorph/queen/set_resting(new_resting, silent, instant) if(ovipositor) return - . = ..() + return ..() /mob/living/carbon/xenomorph/queen/get_organ_icon() return "heart_t3" @@ -813,10 +813,10 @@ /mob/living/carbon/xenomorph/queen/proc/mount_ovipositor() if(ovipositor) return //sanity check - ovipositor = TRUE ADD_TRAIT(src, TRAIT_IMMOBILIZED, OVIPOSITOR_TRAIT) set_body_position(STANDING_UP) set_resting(FALSE) + ovipositor = TRUE set_resin_build_order(GLOB.resin_build_order_ovipositor) // This needs to occur before we update the abilities so we can update the choose resin icon for(var/datum/action/xeno_action/action in actions)