From 2d1f2603cd636207f5b94dd1a21cdf35260cef10 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Tue, 20 Sep 2011 15:20:30 +0000 Subject: [PATCH] It is no longer possible to clone people who have suicided. People who succumbed can be cloned normally, don't worry. Hopefully there will now be fewer people who suicide in the brig since "lol-it's faster to get cloned". git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2232 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/cloning.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index c87577b5d61..a80903c5cfe 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -296,12 +296,15 @@ return /obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob) - if ((isnull(subject)) || (!(istype(subject, /mob/living/carbon/human))) || (!subject.dna)) + if ((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna)) src.temp = "Error: Unable to locate valid genetic data." return if (subject.brain_op_stage == 4.0) src.temp = "Error: No signs of intelligence detected." return + if (subject.suiciding == 1) + src.temp = "Error: Subject's brain is not responding to scanning stimuli." + return if ((!subject.ckey) || (!subject.client)) src.temp = "Error: Mental interface failure." return