Revert "[Ready] Adds "Empty" Cloning, Logging, and related fixes "

code/game/machinery/computer/cloning.dm

@@ -7,24 +7,25 @@
 	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 //Linked scanner. For scanning.
+	var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
 	var/list/pods //Linked cloning pods
 	var/temp = "Inactive"
 	var/scantemp_ckey
 	var/scantemp = "Ready to Scan"
 	var/menu = 1 //Which menu screen to display
-	var/list/records = list()
 	var/datum/data/record/active_record = null
 	var/obj/item/disk/data/diskette = null //Mostly so the geneticist can steal everything.
-
 	var/loading = 0 // Nice loading text
 	var/autoprocess = 0
+	var/list/records = list()
 
 	light_color = LIGHT_COLOR_BLUE
 
 /obj/machinery/computer/cloning/Initialize()
 	. = ..()
 	updatemodules(TRUE)
+	var/obj/item/circuitboard/computer/cloning/board = circuit
+	records = board.records
 
 
 /obj/machinery/computer/cloning/Destroy()
@@ -38,7 +39,7 @@
 	if(pods)
 		for(var/P in pods)
 			var/obj/machinery/clonepod/pod = P
-			if(pod.occupant && mind && pod.clonemind == mind)
+			if(pod.occupant && pod.clonemind == mind)
 				return null
 			if(pod.is_operational() && !(pod.occupant || pod.mess))
 				return pod
@@ -59,9 +60,6 @@
 			else if(!. && pod.is_operational() && !(pod.occupant || pod.mess) && pod.efficiency > 5)
 				. = pod
 
-/proc/grow_clone_from_record(obj/machinery/clonepod/pod, datum/data/record/R, empty)
-	return pod.growclone(R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mindref"], R.fields["last_death"], R.fields["blood_type"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"], empty)
-
 /obj/machinery/computer/cloning/process()
 	if(!(scanner && LAZYLEN(pods) && autoprocess))
 		return
@@ -70,19 +68,16 @@
 		scan_occupant(scanner.occupant)
 
 	for(var/datum/data/record/R in records)
-		var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mindref"])
+		var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mind"])
 
 		if(!pod)
 			return
 
 		if(pod.occupant)
-			continue
+			continue	//how though?
 
-		var/result = grow_clone_from_record(pod, R)
-		if(result & CLONING_SUCCESS)
+		if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"]))
 			temp = "[R.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
-			log_cloning("Cloning of [key_name(R.fields["mindref"])] automatically started via autoprocess - [src] at [AREACOORD(src)]. Pod: [pod] at [AREACOORD(pod)].")
-		if(result & CLONING_DELETE_RECORD)
 			records -= R
 
 /obj/machinery/computer/cloning/proc/updatemodules(findfirstcloner)
@@ -137,9 +132,7 @@
 			to_chat(user, "<span class='notice'>You insert [W].</span>")
 			playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
 			src.updateUsrDialog()
-	else if(W.tool_behaviour == TOOL_MULTITOOL)
-		if(!multitool_check_buffer(user, W))
-			return
+	else if(istype(W, /obj/item/multitool))
 		var/obj/item/multitool/P = W
 
 		if(istype(P.buffer, /obj/machinery/clonepod))
@@ -208,7 +201,6 @@
 
 				if(scanner_occupant)
 					dat += "<a href='byond://?src=[REF(src)];scan=1'>Start Scan</a>"
-					dat += "<a href='byond://?src=[REF(src)];scan=1;body_only=1'>Body-Only Scan</a>"
 					dat += "<br><a href='byond://?src=[REF(src)];lock=1'>[src.scanner.locked ? "Unlock Scanner" : "Lock Scanner"]</a>"
 				else
 					dat += "<span class='linkOff'>Start Scan</span>"
@@ -236,11 +228,8 @@
 			if (!src.active_record)
 				dat += "<font class='bad'>Record not found.</font>"
 			else
-				var/body_only = active_record.fields["body_only"]
-				dat += "<h4>[active_record.fields["name"]][body_only ? " - BODY-ONLY" : ""]</h4>"
-				dat += "Scan ID [active_record.fields["id"]] \
-					[!body_only ? "<a href='byond://?src=[REF(src)];clone=[active_record.fields["id"]]'>Clone</a>" : "" ]\
-				 	<a href='byond://?src=[REF(src)];clone=[active_record.fields["id"]];empty=TRUE'>Empty Clone</a><br>"
+				dat += "<h4>[src.active_record.fields["name"]]</h4>"
+				dat += "Scan ID [src.active_record.fields["id"]] <a href='byond://?src=[REF(src)];clone=[active_record.fields["id"]]'>Clone</a><br>"
 
 				var/obj/item/implant/health/H = locate(src.active_record.fields["imp"])
 
@@ -250,14 +239,7 @@
 					dat += "<font class='bad'>Unable to locate Health Implant.</font><br /><br />"
 
 				dat += "<b>Unique Identifier:</b><br /><span class='highlight'>[src.active_record.fields["UI"]]</span><br>"
-				dat += "<b>Structural Enzymes:</b><br /><span class='highlight'>"
-				for(var/key in active_record.fields["SE"])
-					if(key != RACEMUT)
-						var/val = active_record.fields["SE"][key]
-						var/alias = GLOB.all_mutations[key].alias
-						dat +="[alias]: [val]<br />"
-
-				dat += "</span><br />"
+				dat += "<b>Structural Enzymes:</b><br /><span class='highlight'>[src.active_record.fields["SE"]]</span><br>"
 
 				if(diskette && diskette.fields)
 					dat += "<div class='block'>"
@@ -314,13 +296,18 @@
 
 	else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational())
 		scantemp = ""
-		var/body_only = href_list["body_only"]
+
 		loading = 1
 		src.updateUsrDialog()
 		playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
 		say("Initiating scan...")
 
-		addtimer(CALLBACK(src, .proc/do_scan, usr, body_only), 2 SECONDS)
+		spawn(20)
+			src.scan_occupant(scanner.occupant)
+
+			loading = 0
+			src.updateUsrDialog()
+			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
 
 
 		//No locking an open scanner.
@@ -336,42 +323,34 @@
 		playsound(src, "terminal_type", 25, 0)
 		src.active_record = find_record("id", href_list["view_rec"], records)
 		if(active_record)
-			menu = 3
+			if(!active_record.fields["ckey"])
+				records -= active_record
+				active_record = null
+				src.temp = "<font class='bad'>Record Corrupt</font>"
+			else
+				src.menu = 3
 		else
-			temp = "Record missing."
+			src.temp = "Record missing."
 
 	else if (href_list["del_rec"])
 		if ((!src.active_record) || (src.menu < 3))
 			return
 		if (src.menu == 3) //If we are viewing a record, confirm deletion
-			var/has_access = FALSE
-			if(ishuman(usr))
-				var/mob/living/carbon/human/user = usr
-				var/obj/item/card/id/C = user.get_idcard(TRUE)
-				if(C)
-					if(check_access(C))
-						has_access = TRUE
-			if(active_record.fields["body_only"]) //Body-only scans are not as important and can be deleted freely
-				has_access = TRUE
-			if(has_access)
-				temp = "Delete record?"
-				menu = 4
-				playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
-			else
-				temp = "Access Denied"
-				menu = 2
-				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			src.temp = "Delete record?"
+			src.menu = 4
+			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
 
 		else if (src.menu == 4)
 			var/obj/item/card/id/C = usr.get_active_held_item()
 			if (istype(C)||istype(C, /obj/item/pda))
 				if(src.check_access(C))
-					log_cloning("[key_name(usr)] deleted [key_name(active_record.fields["mindref"])]'s cloning records from [src] at [AREACOORD(src)].")
 					src.temp = "[src.active_record.fields["name"]] => Record deleted."
 					src.records.Remove(active_record)
 					active_record = null
 					playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
 					src.menu = 2
+					var/obj/item/circuitboard/computer/cloning/board = circuit
+					board.records = records
 				else
 					src.temp = "<font class='bad'>Access Denied.</font>"
 					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
@@ -421,14 +400,9 @@
 
 	else if (href_list["clone"])
 		var/datum/data/record/C = find_record("id", href_list["clone"], records)
-		var/empty = href_list["empty"]
 		//Look for that player! They better be dead!
 		if(C)
-			if(C.fields["body_only"] && !empty)
-				temp = "<font class='bad'>Cannot initiate regular cloning with body-only scans.</font>"
-				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
 			var/obj/machinery/clonepod/pod = GetAvailablePod()
-			var/success = FALSE
 			//Can't clone without someone to clone.  Or a pod.  Or if the pod is busy. Or full of gibs.
 			if(!LAZYLEN(pods))
 				temp = "<font class='bad'>No Clonepods detected.</font>"
@@ -436,33 +410,20 @@
 			else if(!pod)
 				temp = "<font class='bad'>No Clonepods available.</font>"
 				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-			else if(!CONFIG_GET(flag/revival_cloning) && !empty)
+			else if(!CONFIG_GET(flag/revival_cloning))
 				temp = "<font class='bad'>Unable to initiate cloning cycle.</font>"
 				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
 			else if(pod.occupant)
 				temp = "<font class='bad'>Cloning cycle already in progress.</font>"
 				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["quirks"]))
+				temp = "[C.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+				records.Remove(C)
+				if(active_record == C)
+					active_record = null
+				menu = 1
 			else
-				var/result = grow_clone_from_record(pod, C, empty)
-				if(result & CLONING_SUCCESS)	
-					temp = "[C.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
-					playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-					records.Remove(C)
-					if(active_record == C)
-						active_record = null
-					menu = 1
-					success = TRUE
-					if(!empty)
-						log_cloning("[key_name(usr)] initiated cloning of [key_name(C.fields["mindref"])] via [src] at [AREACOORD(src)]. Pod: [pod] at [AREACOORD(pod)].")
-					else
-						log_cloning("[key_name(usr)] initiated EMPTY cloning of [key_name(C.fields["mindref"])] via [src] at [AREACOORD(src)]. Pod: [pod] at [AREACOORD(pod)].")
-				if(result &	CLONING_DELETE_RECORD)
-					if(active_record == C)
-						active_record = null
-					menu = 1
-					records -= C
-
-			if(!success)
 				temp = "[C.fields["name"]] => <font class='bad'>Initialisation failure.</font>"
 				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
 
@@ -478,31 +439,21 @@
 	src.updateUsrDialog()
 	return
 
-/obj/machinery/computer/cloning/proc/do_scan(mob/user, body_only)
-	scan_occupant(scanner.occupant, user, body_only)
-
-	loading = FALSE
-	updateUsrDialog()
-	playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
-
-/obj/machinery/computer/cloning/proc/scan_occupant(occupant, mob/M, body_only)
+/obj/machinery/computer/cloning/proc/scan_occupant(occupant)
 	var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
 	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))
 		scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>"
 		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
 		return
-	if(!body_only && (mob_occupant.suiciding || mob_occupant.hellbound))
+	if(mob_occupant.suiciding || mob_occupant.hellbound)
 		scantemp = "<font class='bad'>Subject's brain is not responding to scanning stimuli.</font>"
 		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
 		return
@@ -510,14 +461,14 @@
 		scantemp = "<font class='bad'>Subject no longer contains the fundamental materials required to create a living clone.</font>"
 		playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
 		return
-	if (!body_only && isnull(mob_occupant.mind))
+	if ((!mob_occupant.ckey) || (!mob_occupant.client))
 		scantemp = "<font class='bad'>Mental interface failure.</font>"
 		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
 		return
-//	if (find_record("ckey", mob_occupant.ckey, records))
-//		scantemp = "<font class='average'>Subject already in database.</font>"
-//		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-//		return
+	if (find_record("ckey", mob_occupant.ckey, records))
+		scantemp = "<font class='average'>Subject already in database.</font>"
+		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+		return
 
 	var/datum/data/record/R = new()
 	if(dna.species)
@@ -530,7 +481,7 @@
 		var/datum/species/rando_race = pick(GLOB.roundstart_races)
 		R.fields["mrace"] = rando_race.type
 
-	//R.fields["ckey"] = mob_occupant.ckey
+	R.fields["ckey"] = mob_occupant.ckey
 	R.fields["name"] = mob_occupant.real_name
 	R.fields["id"] = copytext(md5(mob_occupant.real_name), 2, 6)
 	R.fields["UE"] = dna.unique_enzymes
@@ -544,32 +495,22 @@
 		var/datum/quirk/T = V
 		R.fields["quirks"][T.type] = T.clone_data()
 
-	R.fields["mindref"] = "[REF(mob_occupant.mind)]"
-	R.fields["last_death"] = mob_occupant.stat == DEAD ? mob_occupant.mind.last_death : -1
-	R.fields["body_only"] = body_only
+	if (!isnull(mob_occupant.mind)) //Save that mind so traitors can continue traitoring after cloning.
+		R.fields["mind"] = "[REF(mob_occupant.mind)]"
 
-	if(!body_only)
-	    //Add an implant if needed
-		var/obj/item/implant/health/imp
-		for(var/obj/item/implant/health/HI in mob_occupant.implants)
-			imp = HI
-			break
-		if(!imp)
-			imp = new /obj/item/implant/health(mob_occupant)
-			imp.implant(mob_occupant)
-		R.fields["imp"] = "[REF(imp)]"
+   //Add an implant if needed
+	var/obj/item/implant/health/imp
+	for(var/obj/item/implant/health/HI in mob_occupant.implants)
+		imp = HI
+		break
+	if(!imp)
+		imp = new /obj/item/implant/health(mob_occupant)
+		imp.implant(mob_occupant)
+	R.fields["imp"] = "[REF(imp)]"
 
-	var/datum/data/record/old_record = find_record("mindref", REF(mob_occupant.mind), records)
-	if(body_only)
-		old_record = find_record("UE", dna.unique_enzymes, records) //Body-only records cannot be identified by mind, so we use the DNA
-		if(old_record && ((old_record.fields["UI"] != dna.uni_identity) || (!old_record.fields["body_only"]))) //Never overwrite a mind-and-body record if it exists
-			old_record = null
-	if(old_record)
-		records -= old_record
-		scantemp = "Record updated."
-	else
-		scantemp = "Subject successfully scanned."
 	src.records += R
-	log_cloning("[M ? key_name(M) : "Autoprocess"] added the [body_only ? "body-only " : ""]record of [key_name(mob_occupant)] to [src] at [AREACOORD(src)].")
+	var/obj/item/circuitboard/computer/cloning/board = circuit
+	board.records = records
+	scantemp = "Subject successfully scanned."
 	playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)