BS12 Detective Work port.

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

code/defines/atom.dm

@@ -3,11 +3,10 @@
 	var/level = 2
 	var/flags = FPRINT
 	var/flags_inv //This flag is used to determine when items in someone's inventory cover others. IE helmets making it so you can't see glasses, etc.
-	var/fingerprints = null
-	var/list/fingerprintshidden = new/list()
+	var/list/fingerprints = list()
+	var/list/fingerprintshidden = list()
 	var/fingerprintslast = null
-	var/blood_DNA = null
-	var/blood_type = null
+	var/list/blood_DNA = list()
 	var/last_bumped = 0
 	var/pass_flags = 0
 
@@ -18,6 +17,9 @@
 	// replaced by OPENCONTAINER flags and atom/proc/is_open_container()
 	///Chemistry.
 
+	//Detective Work, used for the duplicate data points kept in the scanners
+	var/atom/original_atom = null
+
 	proc/assume_air(datum/air_group/giver)
 		del(giver)
 		return null

code/defines/obj/decal.dm

@@ -49,8 +49,7 @@
 	icon_state = "floor1"
 	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
 	var/list/viruses = list()
-	blood_DNA = null
-	blood_type = null
+	blood_DNA = list()
 	//var/datum/disease2/disease/virus2 = null
 
 	Del()

code/defines/obj/vending.dm

@@ -176,8 +176,8 @@
 	icon_state = "sec"
 	icon_deny = "sec-deny"
 	req_access_txt = "1"
-	product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut"
-	product_amounts = "8;4;5;12"
+	product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut;/obj/item/weapon/storage/box/evidence"
+	product_amounts = "8;4;5;12;6"
 	product_hidden = "/obj/item/clothing/glasses/sunglasses;/obj/item/kitchen/donut_box"
 	product_hideamt = "2;2"
 	product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"

code/defines/procs/helpers.dm

@@ -1505,4 +1505,37 @@ proc/oview_or_orange(distance = world.view , center = usr , type)
 		list += found_string
 		found_char = findtext(cur_text,character,last_found)
 	list += copytext(cur_text,last_found,length(cur_text)+1)
-	return list
+	return list
+
+/proc/stringmerge(var/text,var/compare,replace = "*")
+//This proc fills in all spaces with the "replace" var (* by default) with whatever
+//is in the other string at the same spot (assuming it is not a replace char).
+//This is used for fingerprints
+	var/newtext = text
+	if(lentext(text) != lentext(compare))
+		return 0
+	for(var/i = 1, i < lentext(text), i++)
+		var/a = copytext(text,i,i+1)
+		var/b = copytext(compare,i,i+1)
+//if it isn't both the same letter, or if they are both the replacement character
+//(no way to know what it was supposed to be)
+		if(a != b)
+			if(a == replace) //if A is the replacement char
+				newtext = copytext(newtext,1,i) + b + copytext(newtext, i+1)
+			else if(b == replace) //if B is the replacement char
+				newtext = copytext(newtext,1,i) + a + copytext(newtext, i+1)
+			else //The lists disagree, Uh-oh!
+				return 0
+	return newtext
+
+/proc/stringpercent(var/text,character = "*")
+//This proc returns the number of chars of the string that is the character
+//This is used for detective work to determine fingerprint completion.
+	if(!text || !character)
+		return 0
+	var/count = 0
+	for(var/i = 1, i <= lentext(text), i++)
+		var/a = copytext(text,i,i+1)
+		if(a == character)
+			count++
+	return count