From 3336bfd43b916398b9e8e3d783ef6a692115bd3d Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Sun, 8 Dec 2024 03:50:23 +0300 Subject: [PATCH] Fix alien egg not being able to can (#27537) * Force body eggs to call parent `on_life()` * Force body eggs to call parent `dead_process()` * Call parent --- code/modules/mob/living/carbon/alien/special/alien_embryo.dm | 1 + code/modules/surgery/organs/body_egg.dm | 4 ++++ code/modules/surgery/organs/parasites.dm | 2 ++ 3 files changed, 7 insertions(+) diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index 7b96a8399fa..e60235d3249 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -28,6 +28,7 @@ return S /obj/item/organ/internal/body_egg/alien_embryo/on_life() + ..() switch(stage) if(2) if(prob(2)) diff --git a/code/modules/surgery/organs/body_egg.dm b/code/modules/surgery/organs/body_egg.dm index f67c86d5725..83bea083f36 100644 --- a/code/modules/surgery/organs/body_egg.dm +++ b/code/modules/surgery/organs/body_egg.dm @@ -26,12 +26,16 @@ . = ..() /obj/item/organ/internal/body_egg/on_life() + SHOULD_CALL_PARENT(TRUE) + ..() if(!(src in owner.internal_organs)) // I can only presume this is here for a reason, so not touching it. remove(owner) return egg_process() /obj/item/organ/internal/body_egg/dead_process() + SHOULD_CALL_PARENT(TRUE) + ..() if(!(src in owner.internal_organs)) // I can only presume this is here for a reason, so not touching it. remove(owner) return diff --git a/code/modules/surgery/organs/parasites.dm b/code/modules/surgery/organs/parasites.dm index a4232251dca..2f41fe52ea5 100644 --- a/code/modules/surgery/organs/parasites.dm +++ b/code/modules/surgery/organs/parasites.dm @@ -10,6 +10,7 @@ var/stage = 1 /obj/item/organ/internal/body_egg/spider_eggs/on_life() + ..() if(stage < 5 && prob(3)) stage++ @@ -55,6 +56,7 @@ // Safety first. if(!owner) return + ..() // Parasite growth cycle_num += 1