[READY]Component Forensics and Item Blood OverlayS!

code/modules/detectivework/scanner.dm

@@ -67,20 +67,14 @@
 
 		//Make our lists
 		var/list/fingerprints = list()
-		var/list/blood = list()
-		var/list/fibers = list()
+		var/list/blood = A.return_blood_DNA()
+		var/list/fibers = A.return_fibers()
 		var/list/reagents = list()
 
 		var/target_name = A.name
 
 		// Start gathering
 
-		if(A.blood_DNA && A.blood_DNA.len)
-			blood = A.blood_DNA.Copy()
-
-		if(A.suit_fibers && A.suit_fibers.len)
-			fibers = A.suit_fibers.Copy()
-
 		if(ishuman(A))
 
 			var/mob/living/carbon/human/H = A
@@ -89,8 +83,7 @@
 
 		else if(!ismob(A))
 
-			if(A.fingerprints && A.fingerprints.len)
-				fingerprints = A.fingerprints.Copy()
+			fingerprints = A.return_fingerprints()
 
 			// Only get reagents from non-mobs.
 			if(A.reagents && A.reagents.reagent_list.len)
@@ -104,6 +97,7 @@
 						if(R.data["blood_DNA"] && R.data["blood_type"])
 							var/blood_DNA = R.data["blood_DNA"]
 							var/blood_type = R.data["blood_type"]
+							LAZYINITLIST(blood)
 							blood[blood_DNA] = blood_type
 
 		// We gathered everything. Create a fork and slowly display the results to the holder of the scanner.
@@ -112,7 +106,7 @@
 		add_log("<B>[worldtime2text()][get_timestamp()] - [target_name]</B>", 0)
 
 		// Fingerprints
-		if(fingerprints && fingerprints.len)
+		if(length(fingerprints))
 			sleep(30)
 			add_log("<span class='info'><B>Prints:</B></span>")
 			for(var/finger in fingerprints)
@@ -120,7 +114,7 @@
 			found_something = 1
 
 		// Blood
-		if (blood && blood.len)
+		if (length(blood))
 			sleep(30)
 			add_log("<span class='info'><B>Blood:</B></span>")
 			found_something = 1
@@ -128,7 +122,7 @@
 				add_log("Type: <font color='red'>[blood[B]]</font> DNA: <font color='red'>[B]</font>")
 
 		//Fibers
-		if(fibers && fibers.len)
+		if(length(fibers))
 			sleep(30)
 			add_log("<span class='info'><B>Fibers:</B></span>")
 			for(var/fiber in fibers)
@@ -136,7 +130,7 @@
 			found_something = 1
 
 		//Reagents
-		if(reagents && reagents.len)
+		if(length(reagents))
 			sleep(30)
 			add_log("<span class='info'><B>Reagents:</B></span>")
 			for(var/R in reagents)