From d8e0e8b80c54c7074ff0211db1439f7d03c07b25 Mon Sep 17 00:00:00 2001 From: moxian Date: Mon, 25 Apr 2022 12:49:01 +0000 Subject: [PATCH] Delay awaymission terrorspider gibbing. (#17652) --- code/modules/surgery/organs/parasites.dm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/code/modules/surgery/organs/parasites.dm b/code/modules/surgery/organs/parasites.dm index 8e5d43091d0..3922e44cf6d 100644 --- a/code/modules/surgery/organs/parasites.dm +++ b/code/modules/surgery/organs/parasites.dm @@ -70,14 +70,6 @@ egg_progress += pick(0, 1, 2) egg_progress += calc_variable_progress() - // Detect & stop people attempting to bring a gateway white spider infection back to the main station. - if(awaymission_infection) - var/turf/T = get_turf(owner) - if(istype(T) && !is_away_level(T.z)) - owner.gib() - qdel(src) - return - // Once at least one egg has hatched from you, you'll need help to reach medbay. if(eggs_hatched >= 1) owner.SetConfused(45) @@ -99,6 +91,16 @@ return extra_progress /obj/item/organ/internal/body_egg/terror_eggs/proc/hatch_egg() + // Detect & stop people attempting to bring a gateway white spider infection back to the main station. + if(awaymission_infection) + var/turf/T = get_turf(owner) + if(istype(T) && !is_away_level(T.z)) + owner.gib() + // give a hint of the cause of death + new /obj/effect/decal/cleanable/spiderling_remains(T) + qdel(src) + return + var/infection_completed = FALSE var/obj/structure/spider/spiderling/terror_spiderling/S = new(get_turf(owner)) switch(eggs_hatched)