Readded detective work, with much bugfixing and optimizations.

Any PDA that can access the Security Records can, via the forensic scanner function (that was already there) store data on what was scanned, the same way that the Detective's scanner can.
Scanning a PDA with said stored data in the Detective's computer-o-doom will transfer the data from the PDA to the computer's database.
Made some area names improper as needed (Only ones where it makes sense to be improper.)
Updated changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3713 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/closets/secure/security.dm

@@ -170,6 +170,8 @@
 		new /obj/item/weapon/storage/fcard_kit(src)
 		new /obj/item/weapon/fcardholder(src)
 		new /obj/item/weapon/clipboard(src)
+		new /obj/item/device/detective_scanner(src)
+		new /obj/item/weapon/storage/box/evidence(src)
 		return
 
 

code/game/objects/devices/PDA/PDA.dm

@@ -835,9 +835,8 @@
 				else
 					user << "\blue Blood found on [C]. Analysing..."
 					spawn(15)
-						for(var/i = 1, i < C:blood_DNA.len, i++)
-							var/list/templist = C:blood_DNA[i]
-							user << "\blue Blood type: [templist[2]]\nDNA: [templist[1]]"
+						for(var/blood in C:blood_DNA)
+							user << "\blue Blood type: [C:blood_DNA[blood]]\nDNA: [blood]"
 
 			if(4)
 				for (var/mob/O in viewers(C, null))
@@ -852,23 +851,26 @@
 /obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob)
 	switch(scanmode)
 		if(2)
-			if (!A.fingerprints)
-				user << "\blue Unable to locate any fingerprints on [A]!"
-			else
-				user << "\blue Isolated [A:fingerprints.len] fingerprints."
-				var/list/prints = A:fingerprints
-				var/list/complete_prints = list()
-				for(var/i in prints)
-					var/list/templist = params2list(i)
-					var/temp = stringpercent(templist["2"])
-					if(temp <= 6)
-						complete_prints += templist["2"]
-				if(complete_prints.len < 1)
-					user << "\blue No intact prints found"
+			if(!istype(A, /obj/item/weapon/f_card))
+				if (!A.fingerprints)
+					user << "\blue Unable to locate any fingerprints on [A]!"
 				else
-					user << "\blue Found [complete_prints.len] intact prints"
-					for(var/i in complete_prints)
-						user << "\blue " + i
+					user << "\blue Isolated [A:fingerprints.len] fingerprints."
+					var/list/prints = A:fingerprints
+					var/list/complete_prints = list()
+					for(var/i in prints)
+						var/print = prints[i]
+						if(stringpercent(print) <= FINGERPRINT_COMPLETE)
+							complete_prints += print
+					if(complete_prints.len < 1)
+						user << "\blue No intact prints found"
+					else
+						user << "\blue Found [complete_prints.len] intact prints"
+						for(var/i in complete_prints)
+							user << "\blue [i]"
+				if(cartridge && cartridge.access_security)
+					cartridge.add_data(A)
+					user << "Data added to internal storage.  Scan with a High-Resolution Scanner to retreive."
 
 		if(3)
 			if(!isnull(A.reagents))

code/game/objects/devices/PDA/cart.dm

@@ -30,6 +30,7 @@
 	var/list/powermonitors = list()
 	var/message1	// used for status_displays
 	var/message2
+	var/list/stored_data = list()
 
 	engineering
 		name = "Power-ON Cartridge"
@@ -598,6 +599,43 @@ Code:
 				else
 					menu += "ERROR: Unable to determine current location."
 
+	proc/add_data(atom/A as mob|obj|turf|area)
+		//I love hashtables.
+		var/list/data_entry = stored_data["\ref [A]"]
+		if(islist(data_entry)) //Yay, it was already stored!
+			//Merge the fingerprints.
+			var/list/data_prints = data_entry[1]
+			for(var/print in A.fingerprints)
+				var/merged_print = data_prints[print]
+				if(!merged_print)
+					data_prints[print] = A.fingerprints[print]
+				else
+					data_prints[print] = stringmerge(data_prints[print],A.fingerprints[print])
+
+			//Now the fibers
+			var/list/fibers = data_entry[2]
+			if(!fibers)
+				fibers = list()
+			if(A.suit_fibers && A.suit_fibers.len)
+				for(var/j = 1, j <= A.suit_fibers.len, j++)	//Fibers~~~
+					if(!fibers.Find(A.suit_fibers[j]))	//It isn't!  Add!
+						fibers += A.suit_fibers[j]
+			var/list/blood = data_entry[3]
+			if(!blood)
+				blood = list()
+			if(A.blood_DNA && A.blood_DNA.len)
+				for(var/main_blood in A.blood_DNA)
+					if(!blood[main_blood])
+						blood[main_blood] = A.blood_DNA[blood]
+			return 1
+		var/list/sum_list[4]	//Pack it back up!
+		sum_list[1] = A.fingerprints
+		sum_list[2] = A.suit_fibers
+		sum_list[3] = A.blood_DNA
+		sum_list[4] = "\The [A] in \the [get_area(A)]"
+		stored_data["\ref [A]"] = sum_list
+		return 0
+
 /obj/item/weapon/cartridge/Topic(href, href_list)
 	..()
 

code/game/objects/devices/scanners.dm

@@ -60,6 +60,168 @@ MASS SPECTROMETER
 				if(M)
 					M.invisibility = 2
 
+
+/obj/item/device/detective_scanner
+	name = "Scanner"
+	desc = "Used to scan objects for DNA and fingerprints."
+	icon_state = "forensic1"
+	var/amount = 20.0
+	var/list/stored = list()
+	w_class = 3.0
+	item_state = "electronic"
+	flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
+	slot_flags = SLOT_BELT
+
+	attackby(obj/item/weapon/f_card/W as obj, mob/user as mob)
+		..()
+		if (istype(W, /obj/item/weapon/f_card))
+			if (W.fingerprints)
+				return
+			if (src.amount == 20)
+				return
+			if (W.amount + src.amount > 20)
+				src.amount = 20
+				W.amount = W.amount + src.amount - 20
+			else
+				src.amount += W.amount
+				//W = null
+				del(W)
+			add_fingerprint(user)
+			if (W)
+				W.add_fingerprint(user)
+		return
+
+	attack(mob/living/carbon/human/M as mob, mob/user as mob)
+		if (!ishuman(M))
+			user << "\red [M] is not human and cannot have the fingerprints."
+			return 0
+		if (( !( istype(M.dna, /datum/dna) ) || M.gloves) )
+			user << "\blue No fingerprints found on [M]"
+			return 0
+		else
+			if (src.amount < 1)
+				user << text("\blue Fingerprints scanned on [M]. Need more cards to print.")
+			else
+				src.amount--
+				var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user.loc )
+				F.amount = 1
+				F.add_fingerprint(M)
+				F.icon_state = "fingerprint1"
+				F.name = text("FPrintC- '[M.name]'")
+
+				user << "\blue Done printing."
+			user << "\blue [M]'s Fingerprints: [md5(M.dna.uni_identity)]"
+		if ( !M.blood_DNA || !M.blood_DNA.len )
+			user << "\blue No blood found on [M]"
+			if(M.blood_DNA)
+				del(M.blood_DNA)
+		else
+			user << "\blue Blood found on [M]. Analysing..."
+			spawn(15)
+				for(var/blood in M.blood_DNA)
+					user << "\blue Blood type: [M.blood_DNA[blood]]\nDNA: [blood]"
+		return
+
+	afterattack(atom/A as obj|turf|area, mob/user as mob)
+		if(!in_range(A,user))
+			return
+		if(loc != user)
+			return
+		if(istype(A,/obj/machinery/computer/forensic_scanning)) //breaks shit.
+			return
+		if(istype(A,/obj/item/weapon/f_card))
+			user << "The scanner displays on the screen: \"ERROR 43: Object on Excluded Object List.\""
+			return
+
+		add_fingerprint(user)
+
+
+		//Special case for blood splaters.
+		if (istype(A, /obj/effect/decal/cleanable/blood) || istype(A, /obj/effect/rune))
+			if(!isnull(A.blood_DNA))
+				for(var/blood in A.blood_DNA)
+					user << "\blue Blood type: [A.blood_DNA[blood]]\nDNA: [blood]"
+			return
+
+		//General
+		if ((!A.fingerprints || !A.fingerprints.len) && !A.suit_fibers && !A.blood_DNA)
+			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
+			"\blue Unable to locate any fingerprints, materials, fibers, or blood on [A]!",\
+			"You hear a faint hum of electrical equipment.")
+			return 0
+
+		if(add_data(A))
+			user << "\blue Object already in internal memory. Consolidating data..."
+			return
+
+
+		//PRINTS
+		if(!A.fingerprints || !A.fingerprints.len)
+			if(A.fingerprints)
+				del(A.fingerprints)
+		else
+			user << "\blue Isolated [A.fingerprints.len] fingerprints: Data Stored: Scan with Hi-Res Forensic Scanner to retrieve."
+
+		//FIBERS
+		if(A.suit_fibers)
+			user << "\blue Fibers/Materials Data Stored: Scan with Hi-Res Forensic Scanner to retrieve."
+
+		//Blood
+		if (A.blood_DNA)
+			user << "\blue Blood found on [A]. Analysing..."
+			spawn(15)
+				for(var/blood in A.blood_DNA)
+					user << "Blood type: \red [A.blood_DNA[blood]] \t \black DNA: \red [blood]"
+		if(prob(5))
+			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
+			"You finish scanning \the [A].",\
+			"You hear a faint hum of electrical equipment.")
+			return 0
+		else
+			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]\n[user.gender == MALE ? "He" : "She"] seems to perk up slightly at the readout." ,\
+			"The results of the scan pique your interest.",\
+			"You hear a faint hum of electrical equipment, and someone making a thoughtful noise.")
+			return 0
+		return
+
+	proc/add_data(atom/A as mob|obj|turf|area)
+		//I love hashtables.
+		var/list/data_entry = stored["\ref [A]"]
+		if(islist(data_entry)) //Yay, it was already stored!
+			//Merge the fingerprints.
+			var/list/data_prints = data_entry[1]
+			for(var/print in A.fingerprints)
+				var/merged_print = data_prints[print]
+				if(!merged_print)
+					data_prints[print] = A.fingerprints[print]
+				else
+					data_prints[print] = stringmerge(data_prints[print],A.fingerprints[print])
+
+			//Now the fibers
+			var/list/fibers = data_entry[2]
+			if(!fibers)
+				fibers = list()
+			if(A.suit_fibers && A.suit_fibers.len)
+				for(var/j = 1, j <= A.suit_fibers.len, j++)	//Fibers~~~
+					if(!fibers.Find(A.suit_fibers[j]))	//It isn't!  Add!
+						fibers += A.suit_fibers[j]
+			var/list/blood = data_entry[3]
+			if(!blood)
+				blood = list()
+			if(A.blood_DNA && A.blood_DNA.len)
+				for(var/main_blood in A.blood_DNA)
+					if(!blood[main_blood])
+						blood[main_blood] = A.blood_DNA[blood]
+			return 1
+		var/list/sum_list[4]	//Pack it back up!
+		sum_list[1] = A.fingerprints
+		sum_list[2] = A.suit_fibers
+		sum_list[3] = A.blood_DNA
+		sum_list[4] = "\The [A] in \the [get_area(A)]"
+		stored["\ref [A]"] = sum_list
+		return 0
+
+
 /obj/item/device/healthanalyzer
 	name = "Health Analyzer"
 	icon_state = "health"

code/game/objects/gibs.dm

@@ -51,12 +51,13 @@
 								gib.viruses += viruus
 								viruus.holder = gib
 								viruus.spread_type = CONTACT_FEET
+					gib.blood_DNA = list()
 					if(MobDNA)
-						gib.blood_DNA = list(list(MobDNA.unique_enzymes, MobDNA.b_type))
+						gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.b_type
 					else if(istype(src, /obj/effect/gibspawner/xeno))
-						gib.blood_DNA = list(list("UNKNOWN DNA", "X*"))
+						gib.blood_DNA["UNKNOWN DNA"] = "X*"
 					else if(istype(src, /obj/effect/gibspawner/human)) // Probably a monkey
-						gib.blood_DNA = list(list("Non-human DNA", "A+"))
+						gib.blood_DNA["Non-human DNA"] = "A+"
 					var/list/directions = gibdirections[i]
 					if(directions.len)
 						gib.streak(directions)

code/game/objects/items/weapons/cards_ids.dm

@@ -192,18 +192,13 @@ FINGERPRINT CARD
 	return
 
 /obj/item/weapon/f_card/proc/display()
-	if(!fingerprints)	return
-	if (!istype(src.fingerprints, /list))
-		src.fingerprints = params2list(src.fingerprints)
-	if (length(src.fingerprints))
-		var/dat = "<B>Fingerprints on Card</B><HR>"
-		for(var/i = 1, i < (src.fingerprints.len + 1), i++)
-			var/list/L = params2list(src.fingerprints[i])
-			dat += text("[]<BR>", L["1"])
-			//Foreach goto(41)
-		return dat
-	else
+	if(!fingerprints || !fingerprints.len)
 		return "<B>There are no fingerprints on this card.</B>"
+	else
+		var/dat = "<B>Fingerprints on Card</B><HR>"
+		for(var/name in fingerprints)
+			dat += "[name]<BR>"
+		return dat
 	return
 
 /*