From e36e351e20daa80a727821f7d9943da52c366cee Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 4 Dec 2019 01:19:53 -0500 Subject: [PATCH] CLONING_SUCCESS CLONING_SUCCESS CLONING_SUCCESS CLONING_SUCCESS CLONING_SUCCESS CLONING_SUCCESS CLONING_SUCCESS --- code/game/machinery/cloning.dm | 6 +++--- code/game/machinery/computer/cloning.dm | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index e2314589..a70c1068 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -19,7 +19,7 @@ circuit = /obj/item/circuitboard/machine/clonepod var/heal_level //The clone is released once its health reaches this level. - var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine. + var/obj/machinery/computer/cloning/connected //So we remember the connected clone machine. var/mess = FALSE //Need to clean out it if it's full of exploded clone. var/attempting = FALSE //One clone attempt at a time thanks var/speed_coeff @@ -122,7 +122,7 @@ //Clonepod /obj/machinery/clonepod/examine(mob/user) - ..() + . = ..() var/mob/living/mob_occupant = occupant if(mess) to_chat(user, "It's filled with blood and viscera. You swear you can see it moving...") @@ -237,7 +237,7 @@ H.suiciding = FALSE attempting = FALSE - return TRUE + return CLONING_SUCCESS //Grow clones to maturity then kick them out. FREELOADERS /obj/machinery/clonepod/process() diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 3495417b..dede5724 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -7,7 +7,7 @@ icon_keyboard = "med_key" circuit = /obj/item/circuitboard/computer/cloning req_access = list(ACCESS_HEADS) //ONLY USED FOR RECORD DELETION RIGHT NOW. - var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning. + var/obj/machinery/dna_scannernew/scanner //Linked scanner. For scanning. var/list/pods //Linked cloning pods var/temp = "Inactive" var/scantemp_ckey @@ -490,11 +490,12 @@ var/datum/dna/dna // Do not use unless you know what they are. + var/mob/living/carbon/C = mob_occupant + var/mob/living/brain/B = mob_occupant + if(ishuman(mob_occupant)) - var/mob/living/carbon/C = mob_occupant dna = C.has_dna() if(isbrain(mob_occupant)) - var/mob/living/brain/B = mob_occupant dna = B.stored_dna if(!istype(dna))