From 60f4d6a290a79d3416abb4ddb1a5160e712472a1 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sun, 25 Feb 2024 14:01:12 +0000 Subject: [PATCH 1/2] Embryo check --- code/modules/cm_aliens/XenoStructures.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index ab38e59002d8..af6c14d3eac0 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -578,6 +578,11 @@ if(current_mob.stat == DEAD) return FALSE + if(HAS_TRAIT(current_mob, TRAIT_NESTED) && (current_mob.status_flags & XENO_HOST)) + for(var/obj/item/alien_embryo/embryo in current_mob) + if(HIVE_ALLIED_TO_HIVE(hivenumber, embryo.hivenumber)) + return FALSE + var/turf/current_turf var/turf/last_turf = loc var/atom/temp_atom = new acid_type() From ebf661df0171dd50a84305ecc913323a6b9057cc Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sun, 25 Feb 2024 14:21:49 +0000 Subject: [PATCH 2/2] Thought this through a bit more --- code/modules/cm_aliens/XenoStructures.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index af6c14d3eac0..c014fbf9c211 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -578,10 +578,8 @@ if(current_mob.stat == DEAD) return FALSE - if(HAS_TRAIT(current_mob, TRAIT_NESTED) && (current_mob.status_flags & XENO_HOST)) - for(var/obj/item/alien_embryo/embryo in current_mob) - if(HIVE_ALLIED_TO_HIVE(hivenumber, embryo.hivenumber)) - return FALSE + if(HAS_TRAIT(current_mob, TRAIT_NESTED)) + return FALSE var/turf/current_turf var/turf/last_turf = loc