From f862d606403edc4d19e4420e343e5ab079be035e Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sat, 15 Mar 2025 13:45:27 -0700 Subject: [PATCH] [MIRROR] Makes xenoarch organs impossible to reject (#10429) Co-authored-by: Cameron Lennox --- .../xenoarcheaology/finds/find_spawning.dm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index 8be3750910..8a21e65b25 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -445,9 +445,14 @@ possible_object_paths -= list(/obj/item/organ/internal/mmi_holder, /obj/item/organ/internal/stack/vox) //BLACKLIST ABOVE - var/new_organ = pick(possible_object_paths) + var/obj/item/organ/internal/new_organ = pick(possible_object_paths) new_item = new new_organ(src.loc) + //Code to prevent rejection. + new_organ = new_item + new_organ.can_reject = FALSE + + if(ARCHAEO_REMAINS_ROBOT) //robot remains apply_prefix = FALSE @@ -476,10 +481,17 @@ /obj/item/organ/internal/xenos/hivenode, /obj/item/organ/internal/xenos/resinspinner) - var/new_vessel = pick(possible_plasma_vessel) - var/new_organ = pick(possible_organ) + var/obj/item/organ/internal/xenos/plasmavessel/new_vessel = pick(possible_plasma_vessel) + var/obj/item/organ/internal/xenos/new_organ = pick(possible_organ) new_item = new new_vessel(src.loc) secondary_item = new new_organ(src.loc) + + //Code to prevent rejection. + new_vessel = new_item + new_organ = secondary_item + new_vessel.can_reject = FALSE + new_organ.can_reject = FALSE + if(ARCHAEO_GASMASK) //gas mask if(prob(50))