From ddba0448e9a550549dedcdf5181de2fff704efb0 Mon Sep 17 00:00:00 2001 From: d3athrow Date: Sat, 29 Jun 2013 19:10:35 -0500 Subject: [PATCH] Fixes #3210 and #3209 --- code/game/mecha/mecha.dm | 2 +- code/modules/mob/living/silicon/pai/recruit.dm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 9d8291733cb..48bb48b65b0 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1546,7 +1546,7 @@ return if(href_list["dna_lock"]) if(usr != src.occupant) return - if(src.occupant) + if(src.occupant && (!istype(src, /obj/item/device/mmi/posibrain) || !istype(src, /obj/item/device/mmi))) src.dna = src.occupant.dna.unique_enzymes src.occupant_message("You feel a prick as the needle takes your DNA sample.") return diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 4683f46aa2d..aff36bd0441 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -93,6 +93,8 @@ var/datum/paiController/paiController // Global handler for pAI candidates proc/recruitWindow(var/mob/M as mob) var/datum/paiCandidate/candidate for(var/datum/paiCandidate/c in pai_candidates) + if(!istype(c) || !istype(M)) + break if(c.key == M.key) candidate = c if(!candidate)