Merge pull request #477 from SkyMarshal/master

Added some delagging to the singularity, DNA superpowers all work, now.

code/modules/DetectiveWork/detective_work.dm

@@ -0,0 +1,792 @@
+//gloves w_uniform wear_suit shoes
+
+atom/var/list/suit_fibers
+
+atom/proc/add_fibers(mob/living/carbon/human/M)
+	if(M.gloves)
+		if(M.gloves.transfer_blood)
+			if(add_blood(M.gloves.bloody_hands_mob))
+				M.gloves.transfer_blood--
+				//world.log << "[M.gloves] added blood to [src] from [M.gloves.bloody_hands_mob]"
+	else if(M.bloody_hands)
+		if(add_blood(M.bloody_hands_mob))
+			M.bloody_hands--
+			//world.log << "[M] added blood to [src] from [M.bloody_hands_mob]"
+	if(!suit_fibers) suit_fibers = list()
+	var/fibertext
+	var/item_multiplier = istype(src,/obj/item)?1.2:1
+	if(M.wear_suit)
+		fibertext = "Material from \a [M.wear_suit]."
+		if(prob(10*item_multiplier) && !(fibertext in suit_fibers))
+			//world.log << "Added fibertext: [fibertext]"
+			suit_fibers += fibertext
+		if(!(M.wear_suit.body_parts_covered & 32))
+			if(M.w_uniform)
+				fibertext = "Fibers from \a [M.w_uniform]."
+				if(prob(12*item_multiplier) && !(fibertext in suit_fibers)) //Wearing a suit means less of the uniform exposed.
+					//world.log << "Added fibertext: [fibertext]"
+					suit_fibers += fibertext
+		if(!(M.wear_suit.body_parts_covered & 64))
+			if(M.gloves)
+				fibertext = "Material from a pair of [M.gloves.name]."
+				if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
+					//world.log << "Added fibertext: [fibertext]"
+					suit_fibers += fibertext
+	else if(M.w_uniform)
+		fibertext = "Fibers from \a [M.w_uniform]."
+		if(prob(15*item_multiplier) && !(fibertext in suit_fibers))
+			// "Added fibertext: [fibertext]"
+			suit_fibers += fibertext
+		if(M.gloves)
+			fibertext = "Material from a pair of [M.gloves.name]."
+			if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
+				//world.log << "Added fibertext: [fibertext]"
+				suit_fibers += "Material from a pair of [M.gloves.name]."
+	else if(M.gloves)
+		fibertext = "Material from a pair of [M.gloves.name]."
+		if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
+			//world.log << "Added fibertext: [fibertext]"
+			suit_fibers += "Material from a pair of [M.gloves.name]."
+	if(!suit_fibers.len) del suit_fibers
+
+#define FINGERPRINT_COMPLETE 6	//This is the output of the stringpercent(print) proc, and means about 80% of
+								//the print must be there for it to be complete.  (Prints are 32 digits)
+
+obj/machinery/computer/forensic_scanning
+	name = "High-Res Forensic Scanning Computer"
+	icon_state = "forensic"
+	var
+		obj/item/scanning
+		temp = ""
+		canclear = 1
+		authenticated = 0
+
+//Here's the structure for files: each entry is a list, and entry one in that list is the string of their
+//full and scrambled fingerprint.  This acts as the method to arrange evidence.  Each subsequent entry is list
+//in the form (from entries):
+//	1: Object
+//	2: All prints on the object
+//	3: All fibers on the object
+//	4: All blood on the object
+//This is then used to show what objects were used to "find" the full print, as well as the fibers on it.
+		list/files
+//This holds objects (1) without prints, and their fibers(2) and blood(3).
+		list/misc
+		obj/item/weapon/f_card/card
+
+		scan_data = ""
+		scan_name = ""
+		scan_process = 0
+
+	req_access = list(access_forensics_lockers)
+
+
+	New()
+		..()
+		new /obj/item/weapon/book/manual/detective(get_turf(src))
+		return
+
+
+	attack_ai(mob/user)
+		return attack_hand(user)
+
+
+	attack_hand(mob/user)
+		if(..())
+			return
+		user.machine = src
+		var/dat = ""
+		var/isai = 0
+		if(istype(usr,/mob/living/silicon))
+			isai = 1
+		if(temp)
+			dat += "<tt>[temp]</tt><br><br>"
+			if(canclear) dat += "<a href='?src=\ref[src];operation=clear'>{Clear Screen}</a>"
+		else
+			if(!authenticated)
+				dat += "<a href='?src=\ref[src];operation=login'>{Log In}</a>"
+			else
+				dat += "<a href='?src=\ref[src];operation=logout'>{Log Out}</a><br><hr><br>"
+				if(scanning)
+					if(scan_process)
+						dat += "Scan Object: {[scanning.name]}<br>"
+						dat += "<a href='?src=\ref[src];operation=cancel'>{Cancel Scan}</a> {Print}<br>"
+					else
+						if(isai) dat += "Scan Object: {[scanning.name]}<br>"
+						else dat += "Scan Object: <a href='?src=\ref[src];operation=eject'>{[scanning.name]}</a><br>"
+						dat += "<a href='?src=\ref[src];operation=scan'>{Scan}</a> <a href='?src=\ref[src];operation=print'>{Print}</a><br>"
+				else
+					if(isai) dat += "{No Object Inserted}<br>"
+					else dat += "<a href='?src=\ref[src];operation=insert'>{No Object Inserted}</a><br>"
+					dat += "{Scan} <a href='?src=\ref[src];operation=print'>{Print}</a><br>"
+				dat += "<a href='?src=\ref[src];operation=database'>{Access Database}</a><br><br>"
+				dat += "<tt>[scan_data]</tt>"
+				if(scan_data && !scan_process)
+					dat += "<br><a href='?src=\ref[src];operation=erase'>{Erase Data}</a>"
+		user << browse(dat,"window=scanner")
+		onclose(user,"scanner")
+
+
+	Topic(href,href_list)
+		switch(href_list["operation"])
+			if("login")
+				var/mob/M = usr
+				if(istype(M,/mob/living/silicon))
+					authenticated = 1
+					updateDialog()
+					return
+				var/obj/item/weapon/card/id/I = M.equipped()
+				if (I && istype(I))
+					if(src.check_access(I))
+						authenticated = 1
+						//usr << "\green Access Granted"
+				//if(!authenticated)
+					//usr << "\red Access Denied"
+			if("logout")
+				authenticated = 0
+			if("clear")
+				if(canclear)
+					temp = null
+			if("eject")
+				if(scanning)
+					scanning.loc = loc
+					scanning = null
+				else
+					temp = "Eject Failed: No Object"
+			if("insert")
+				var/mob/M = usr
+				var/obj/item/I = M.equipped()
+				if(I && istype(I))
+					if(istype(I, /obj/item/weapon/evidencebag))
+						scanning = I.contents[1]
+						scanning.loc = src
+						I.overlays -= scanning
+						I.icon_state = "evidenceobj"
+					else
+						scanning = I
+						M.drop_item()
+						I.loc = src
+				else
+					temp = "Invalid Object Rejected."
+			if("card")
+				var/mob/M = usr
+				var/obj/item/I = M.equipped()
+				if(I && istype(I,/obj/item/weapon/f_card))
+					card = I
+					M.drop_item()
+					I.loc = src
+					process_card()
+					usr << "You insert the card, and it is destroyed by the machinery in the process of comparing prints."
+				else
+					usr << "\red Invalid Object Rejected."
+			if("database")
+				canclear = 1
+				if((!misc || !misc.len) && (!files || !files.len))
+					temp = "Database is empty."
+				else
+					if(files && files.len)
+						temp = "<b>Criminal Evidence Database</b><br><br>"
+						temp += "Consolidated data points:<br>"
+						for(var/i = 1, i <= files.len, i++)
+							temp += "<a href='?src=\ref[src];operation=record;identifier=[i]'>{Dossier [i]}</a><br>"
+						temp += "<br><a href='?src=\ref[src];operation=card'>{Insert Finger Print Card}</a><br><br><br>"
+					else
+						temp = ""
+					if(misc && misc.len)
+						if(href_list["delete"])
+							delete_record(text2num(href_list["delete"]))
+						temp += "<b>Auxiliary Evidence Database</b><br><br>"
+						temp += "This is where anything without fingerprints goes.<br><br>"
+						for(var/i = 1, i <= misc.len, i++)
+							var/list/temp_list = misc[i]
+							var/item_name = get_name(temp_list[1])
+							temp += "<a href='?src=\ref[src];operation=auxiliary;identifier=[i]'>{[item_name]}</a><br>"
+			if("record")
+				canclear = 0
+				if(files)
+					temp = "<b>Criminal Evidence Database</b><br><br>"
+					temp += "Consolidated data points: Dossier [href_list["identifier"]]<br>"
+					var/identifier = text2num(href_list["identifier"])
+					var/list/dossier = files[identifier]
+					var/list/prints = params2list(dossier[1])
+					var/print_string = "Fingerprints: Print not complete!<br>"
+					if(stringpercent(prints[num2text(2)]) <= FINGERPRINT_COMPLETE)
+						print_string = "Fingerprints: (80% or higher completion reached)<br>" + prints[num2text(2)] + "<br>"
+					temp += print_string
+					for(var/i = 2, i <= dossier.len, i++)
+						var/list/outputs = dossier[i]
+						var/item_name = get_name(outputs[1])
+						var/list/prints_len = outputs[2]
+						temp += "Object: [item_name]<br>"
+						temp += "&nbsp;&nbsp;&nbsp;&nbsp;[prints_len.len] Unique fingerprints found.<br>"
+						var/list/fibers = outputs[3]
+						if(fibers && fibers.len)
+							var/dat = "[fibers[1]]"
+							for(var/j = 2, j <= fibers.len, j++)
+								dat += ",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]"
+							temp += "&nbsp;&nbsp;&nbsp;&nbsp;Fibers: [dat]<br>"
+						else
+							temp += "&nbsp;&nbsp;&nbsp;&nbsp;No fibers found.<br>"
+						var/list/blood = outputs[4]
+						if(blood && blood.len)
+							var/dat = "[blood[1]]"
+							if(blood.len > 1)
+								for(var/j = 2, j <= blood.len, j++)
+									dat += ",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[blood[j]]"
+							temp += "&nbsp;&nbsp;&nbsp;&nbsp;Blood: [dat]<br>"
+						else
+							temp += "&nbsp;&nbsp;&nbsp;&nbsp;No blood found.<br>"
+				else
+					temp = "ERROR.  Database not found!<br>"
+				temp += "<br><a href='?src=\ref[src];operation=delete;identifier=[href_list["identifier"]]'>{delete}</a>"
+				temp += "<br><a href='?src=\ref[src];operation=databaseprint;identifier=[href_list["identifier"]]'>{Print}</a>"
+				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
+			if("databaseprint")
+				if(files)
+					var/obj/item/weapon/paper/P = new(loc)
+					P.name = "Database File (Dossier [href_list["identifier"]])"
+					P.overlays += "paper_words"
+					P.info = "<b>Criminal Evidence Database</b><br><br>"
+					P.info += "Consolidated data points: Dossier [href_list["identifier"]]<br>"
+					var/list/dossier = files[text2num(href_list["identifier"])]
+					var/list/prints = params2list(dossier[1])
+					var/print_string = "Fingerprints: Print not complete!<br>"
+					if(stringpercent(prints[num2text(2)]) <= FINGERPRINT_COMPLETE)
+						print_string = "Fingerprints: " + prints[num2text(2)] + "<BR>"
+					P.info += print_string
+					for(var/i = 2, i <= dossier.len, i++)
+						var/list/outputs = dossier[i]
+						var/item_name = get_name(outputs[1])
+						var/list/prints_len = outputs[2]
+						P.info += "Object: [item_name]<br>"
+						P.info += "&nbsp;&nbsp;&nbsp;&nbsp;[prints_len.len] Unique fingerprints found.<br>"
+						var/list/fibers = outputs[3]
+						if(fibers && fibers.len)
+							var/dat = "[fibers[1]]"
+							for(var/j = 2, j <= fibers.len, j++)
+								dat += ",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]"
+							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;Fibers: [dat]<br>"
+						else
+							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;No fibers found.<br>"
+						var/list/blood = outputs[4]
+						if(blood && blood.len)
+							var/dat = "[blood[1]]"
+							if(blood.len > 1)
+								for(var/j = 2, j <= blood.len, j++)
+									dat += ",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[blood[j]]"
+							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;Blood: [dat]<br>"
+						else
+							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;No blood found."
+				else
+					usr << "ERROR.  Database not found!<br>"
+			if("auxiliary")
+				canclear = 0
+				if(misc)
+					temp = "<b>Auxiliary Evidence Database</b><br><br>"
+					var/identifier = text2num(href_list["identifier"])
+					var/list/outputs = misc[identifier]
+					var/item_name = get_name(outputs[1])
+					temp += "Consolidated data points: [item_name]<br>"
+					var/list/fibers = outputs[2]
+					if(fibers && fibers.len)
+						var/dat = "[fibers[1]]"
+						for(var/j = 2, j <= fibers.len, j++)
+							dat += "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]"
+						temp += "&nbsp;&nbsp;&nbsp;&nbsp;Fibers: [dat]<br>"
+					else
+						temp += "&nbsp;&nbsp;&nbsp;&nbsp;No fibers found."
+					var/list/blood = outputs[3]
+					if(blood && blood.len)
+						var/dat = "[blood[1]]"
+						for(var/j = 2, j <= blood.len, j++)
+							dat += "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[blood[j]]"
+						temp += "&nbsp;&nbsp;&nbsp;&nbsp;Blood: [dat]<br>"
+					else
+						temp += "&nbsp;&nbsp;&nbsp;&nbsp;No blood found.<br>"
+				else
+					temp = "ERROR.  Database not found!<br>"
+				temp += "<br><a href='?src=\ref[src];operation=delete_aux;identifier=[href_list["identifier"]]'>{Delete This Record}</a>"
+				temp += "<br><a href='?src=\ref[src];operation=auxiliaryprint;identifier=[href_list["identifier"]]'>{Print}</a>"
+				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
+			if("auxiliaryprint")
+				if(misc)
+					var/obj/item/weapon/paper/P = new(loc)
+					var/identifier = text2num(href_list["identifier"])
+					var/list/outputs = misc[identifier]
+					var/item_name = get_name(outputs[1])
+					P.name = "Auxiliary Database File ([item_name])"
+					P.overlays += "paper_words"
+					P.info = "<b>Auxiliary Evidence Database</b><br><br>"
+					P.info += "Consolidated data points: [item_name]<br>"
+					var/list/fibers = outputs[2]
+					if(fibers && fibers.len)
+						var/dat = "[fibers[1]]"
+						for(var/j = 2, j <= fibers.len, j++)
+							dat += "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]"
+						P.info += "&nbsp;&nbsp;&nbsp;&nbsp;Fibers: [dat]<br>"
+					else
+						P.info += "&nbsp;&nbsp;&nbsp;&nbsp;No fibers found."
+					var/list/blood = outputs[3]
+					if(blood && blood.len)
+						var/dat = "[blood[1]]"
+						for(var/j = 2, j <= blood.len, j++)
+							dat += "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[blood[j]]"
+						P.info += "&nbsp;&nbsp;&nbsp;&nbsp;Blood: [dat]<br>"
+					else
+						P.info += "&nbsp;&nbsp;&nbsp;&nbsp;No blood found.<br>"
+				else
+					usr << "ERROR.  Database not found!<br>"
+			if("scan")
+				if(istype(scanning,/obj/item/weapon/f_card))
+					card = scanning
+					scanning = initial(scanning)
+					process_card()
+				else if(scanning)
+					scan_process = 3
+					scan_data = "Scanning [scanning]: 25% complete"
+					updateDialog()
+					sleep(50)
+					if(!scan_process)
+						scan_data = null
+						updateDialog()
+						return
+					scan_data = "Scanning [scanning]: 50% complete"
+					updateDialog()
+					scan_process = 2
+					sleep(50)
+					if(!scan_process)
+						scan_data = null
+						updateDialog()
+						return
+					scan_data = "Scanning [scanning]: 75% complete"
+					updateDialog()
+					scan_process = 1
+					sleep(50)
+					if(!scan_process)
+						scan_data = null
+						updateDialog()
+						return
+					scan_process = 0
+					scan_name = scanning.name
+					scan_data = "<u>[scanning]</u><br><br>"
+					if (scanning.blood_DNA.len)
+						scan_data += "Blood Found:<br>"
+						for(var/i = 1, i <= scanning.blood_DNA.len, i++)
+							var/list/templist = scanning.blood_DNA[i]
+							scan_data += "-Blood type: [templist[2]]\nDNA: [templist[1]]<br><br>"
+					else
+						scan_data += "No Blood Found<br><br>"
+					if (!length(scanning.fingerprints))
+						scan_data += "No Fingerprints Found<br><br>"
+					else
+						var/list/L = scanning.fingerprints
+						scan_data += "Isolated [L.len] Fingerprints.  Loaded into database.<br>"
+						add_data(scanning)
+
+					if(!scanning.suit_fibers)
+						/*if(istype(scanning,/obj/item/device/detective_scanner))
+							var/obj/item/device/detective_scanner/scanner = scanning
+							if(scanner.stored_name)
+								scan_data += "Fibers/Materials Data - [scanner.stored_name]:<br>"
+								for(var/data in scanner.stored_fibers)
+									scan_data += "- [data]<br>"
+							else
+								scan_data += "No Fibers/Materials Data<br>"
+						else*/
+						scan_data += "No Fibers/Materials Located<br>"
+					else
+						/*if(istype(scanning,/obj/item/device/detective_scanner))
+							var/obj/item/device/detective_scanner/scanner = scanning
+							if(scanner.stored_name)
+								scan_data += "Fibers/Materials Data - [scanner.stored_name]:<br>"
+								for(var/data in scanner.stored_fibers)
+									scan_data += "- [data]<br>"
+							else
+								scan_data += "No Fibers/Materials Data<br>"*/
+
+						scan_data += "Fibers/Materials Found:<br>"
+						for(var/data in scanning.suit_fibers)
+							scan_data += "- [data]<br>"
+					if(istype(scanning,/obj/item/device/detective_scanner))
+						scan_data += "<br><b>Data transfered from Scanner to Database.</b><br>"
+						add_data_scanner(scanning)
+					else if(!length(scanning.fingerprints))
+						scan_data += "<br><b><a href='?src=\ref[src];operation=add'>Add to Database?</a></b><br>"
+				else
+					temp = "Scan Failed: No Object"
+
+
+			if("print")
+				if(scan_data)
+					temp = "Scan Data Printed."
+					var/obj/item/weapon/paper/P = new(loc)
+					P.name = "Scan Data ([scan_name])"
+					P.info = "<tt>[scan_data]</tt>"
+					P.overlays += "paper_words"
+				else
+					temp = "Print Failed: No Data"
+			if("erase")
+				scan_data = ""
+			if("delete_aux")
+				delete_record(text2num(href_list["identifier"]))
+			if("delete")
+				delete_dossier(text2num(href_list["identifier"]))
+			if("cancel")
+				scan_process = 0
+			if("add")
+				if(scanning)
+					add_data(scanning)
+				else
+					temp = "Data Transfer Failed: No Object."
+		updateUsrDialog()
+
+	verb/reset()
+		set name = "Reset Database"
+		set category = "Object"
+		set src in oview(1)
+		temp = ""
+		add_fingerprint(usr)
+		files = list()
+		misc = list()
+		return
+
+
+	ex_act()
+		return
+
+
+	proc/add_data_scanner(var/obj/item/device/detective_scanner/W)
+		for(var/i = 1, i <= W.stored.len, i++)
+			var/list/data = W.stored[i]
+			add_data(data[1],1,data[2],data[3],data[4])
+		W.stored = list()
+
+
+	proc/add_data(var/atom/A, var/override = 0, var/tempfingerprints, var/tempsuit_fibers,var/tempblood_DNA)
+//What follows is massive.  It cross references all stored data in the scanner with the other stored data,
+//and what is already in the computer.  Not sure how bad the lag may/may not be.
+		var
+			backup_prints
+			backup_fibers
+			backup_DNA
+		if(override)
+			backup_prints = A.fingerprints
+			A.fingerprints = tempfingerprints
+			backup_fibers = A.suit_fibers
+			A.suit_fibers = tempsuit_fibers
+			backup_DNA = A.blood_DNA
+			A.blood_DNA = tempblood_DNA
+		if((!A.fingerprints || !length(A.fingerprints)))	//No prints
+			var/merged = 0
+			if(!misc)
+				misc = list()
+			if(misc)
+				for(var/i = 1, i <= misc.len, i++)	//Lets see if we can find it.
+					var/list/templist = misc[i]
+					var/check = templist[1]
+					if(check == A) //There it is!
+						merged = 1
+						var/list/fibers = templist[2]
+						if(!fibers)
+							fibers = list()
+						if(A.suit_fibers)
+							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 = templist[3]
+						if(!blood)
+							blood = list()
+						if(A.blood_DNA)
+							for(var/j = 1, j <= A.blood_DNA.len, j++)	//Blood~~~
+								if(!blood.Find(A.blood_DNA[j]))	//It isn't!  Add!
+									blood += A.blood_DNA[j]
+						var/list/sum_list[3]	//Pack it back up!
+						sum_list[1] = A
+						sum_list[2] = fibers
+						sum_list[3] = blood
+						misc[i] = sum_list	//Store it!
+						break	//We found it, we're done here.
+			if(!merged)	//Nope!  Guess we have to add it!
+				var/list/templist[3]
+				templist[1] = A
+				templist[2] = A.suit_fibers
+				templist[3] = A.blood_DNA
+				misc.len++
+				misc[misc.len] = templist	//Store it!
+			return !merged
+		else //Has prints.
+			var/list/found_prints[A.fingerprints.len + 1]
+			for(var/i = 1, i <= found_prints.len, i++)
+				found_prints[i] = 0
+			if(!files)
+				files = list()
+			for(var/i = 1, i <= files.len, i++)	//Lets see if we can find the owner of the prints
+				var/list/perp_list = files[i]
+				var/list/perp_prints = params2list(perp_list[1])
+				var/perp = perp_prints[num2text(1)]
+				var/found2 = 0
+				for(var/m = 1, m <= A.fingerprints.len, m++)	//Compare database prints with prints on object.
+					var/list/test_prints_list = params2list(A.fingerprints[m])
+					var/checker = test_prints_list[num2text(1)]
+					if(checker == perp)	//Found 'em!  Merge!
+						found_prints[m] = 1
+						for(var/n = 2, n <= perp_list.len, n++)	//Lets see if it is already in the database
+							var/list/target = perp_list[n]
+							if(target[1] == A)	//Found the original object!
+								found2 = 1
+								var/list/prints = target[2]
+								if(!prints)
+									prints = list()
+								if(A.fingerprints)
+									for(var/j = 1, j <= A.fingerprints.len, j++)	//Fingerprints~~~
+										var/list/print_test1 = params2list(A.fingerprints[j])
+										var/test_print1 = print_test1[num2text(1)]
+										var/found = 0
+										for(var/k = 1, k <= prints.len, k++)	//Lets see if the print is already in there
+											var/list/print_test2 = params2list(prints[k])
+											var/test_print2 = print_test2[num2text(1)]
+											if(test_print2 == test_print1)	//It is!  Merge!
+												prints[k] = "1=" + test_print2 + "&2=" + stringmerge(print_test2[num2text(2)],print_test1[num2text(2)])
+												found = 1
+												break	//We found it, we're done here.
+										if(!found)	//It isn't!  Add!
+											prints += A.fingerprints[j]
+								var/list/fibers = target[3]
+								if(!fibers)
+									fibers = list()
+								if(A.suit_fibers)
+									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 = target[4]
+								if(!blood)
+									blood = list()
+								if(A.blood_DNA)
+									for(var/j = 1, j < A.blood_DNA.len, j++)	//Blood~~~
+										if(!blood.Find(A.blood_DNA[j]))	//It isn't!  Add!
+											blood += A.blood_DNA[j]
+								var/list/sum_list[4]	//Pack it back up!
+								sum_list[1] = A
+								sum_list[2] = prints
+								sum_list[3] = fibers
+								sum_list[4] = blood
+								perp_list[n] = sum_list	//Store it!
+								files[i] = perp_list
+								break	//We found it, we're done here.
+						if(!found2) //Add a new datapoint to this perp!
+							var/list/sum_list[4]
+							sum_list[1] = A
+							sum_list[2] = A.fingerprints
+							sum_list[3] = A.suit_fibers
+							sum_list[4] = A.blood_DNA
+							perp_list.len++
+							perp_list[perp_list.len] = sum_list
+							files[i] = perp_list
+			for(var/m = 1, m < found_prints.len, m++)	//Uh Oh!  A print wasn't used!  New datapoint!
+				if(found_prints[m] == 0)
+					var/list/newperp[2]
+					var/list/sum_list[4]
+					sum_list[1] = A
+					sum_list[2] = A.fingerprints
+					sum_list[3] = A.suit_fibers
+					sum_list[4] = A.blood_DNA
+					newperp[2] = sum_list
+					newperp[1] = A.fingerprints[m]
+					if(!files)
+						files = newperp
+					else
+						files.len++
+						files[files.len] = newperp
+			update_fingerprints()	//Lets update the calculated sum of the stored prints.
+			if(override)
+				A.fingerprints = backup_prints
+				A.suit_fibers = backup_fibers
+				A.blood_DNA = backup_DNA
+			return
+
+
+	proc/update_fingerprints()	//I am tired, but this updates the master print, which is used to determine completion of a print.
+		for(var/k = 1, k <= files.len, k++)
+			var/list/perp_list = files[k]
+			var/list/perp_prints = params2list(perp_list[1])
+			var/perp = perp_prints[num2text(1)]
+			var/list/found_prints = list()
+			for(var/i = 2, i <= perp_list.len, i++)
+				var/list/test_list = perp_list[i]
+				var/list/test_prints = test_list[2]
+				for(var/j = 1, j <= test_prints.len, j++)
+					var/list/test_list_2 = params2list(test_prints[j])
+					var/test_prints_2 = test_list_2[num2text(1)]
+					if(test_prints_2 == perp)
+						found_prints += test_list_2[num2text(2)]
+						break
+			for(var/prints in found_prints)
+				perp_prints[num2text(2)] = stringmerge(perp_prints[num2text(2)],prints)
+			perp_list[1] = "1=" + perp + "&2=" + perp_prints[num2text(2)]
+			files[k] = perp_list
+		return
+
+	proc/process_card()	//I am tired, but this updates the master print from a fingerprint card
+						//which is used to determine completion of a print.
+		if(card.fingerprints)
+			for(var/k = 1, k <= card.fingerprints.len, k++)
+				var/list/test_prints = params2list(card.fingerprints[k])
+				var/print = test_prints[num2text(1)]
+				for(var/i = 1, i <= files.len, i++)
+					var/list/test_list = files[i]
+					var/list/perp_prints = params2list(test_list[1])
+					var/perp = perp_prints[num2text(1)]
+					if(perp == print)
+						test_list[1] = "1=" + print + "&2=" + print
+						files[i] = test_list
+						break
+		del(card)
+		return
+
+	proc/delete_record(var/location)
+		if(misc && misc.len)
+			for(var/i = location, i < misc.len, i++)
+				misc[i] = misc[i+i]
+			misc.len--
+		return
+
+	proc/get_name(var/atom/A)
+		return A.name
+
+	proc/delete_dossier(var/location)
+		if(files && files.len)
+			if(files.len < location)
+				for(var/i = location, i < files.len, i++)
+					files[i] = files[i + 1]
+			if(files.len <= location)
+				files[files.len] = list()
+				files.len--
+		return
+
+	detective
+		icon_state = "old"
+		name = "PowerScan Mk.I"
+
+obj/item/clothing/shoes/var
+	track_blood = 0
+	mob/living/carbon/human/track_blood_mob
+mob/var
+	bloody_hands = 0
+	mob/living/carbon/human/bloody_hands_mob
+	track_blood
+	mob/living/carbon/human/track_blood_mob
+obj/item/clothing/gloves/var
+	transfer_blood = 0
+	mob/living/carbon/human/bloody_hands_mob
+
+
+obj/effect/decal/cleanable/blood/var
+	track_amt = 3
+	mob/blood_owner
+
+turf/Exited(mob/living/carbon/human/M)
+	if(istype(M,/mob/living))
+		if(!istype(src, /turf/space))  // Bloody tracks code starts here
+			if(M.track_blood > 0)
+				M.track_blood--
+				src.add_bloody_footprints(M.track_blood_mob,1,M.dir,get_tracks(M))
+			else if(istype(M,/mob/living/carbon/human))
+				if(M.shoes)
+					if(M.shoes.track_blood > 0)
+						M.shoes.track_blood--
+						src.add_bloody_footprints(M.shoes.track_blood_mob,1,M.dir,M.shoes.name) // And bloody tracks end here
+	. = ..()
+turf/Entered(mob/living/carbon/human/M)
+	if(istype(M,/mob/living))
+		if(M.track_blood > 0)
+			M.track_blood--
+			src.add_bloody_footprints(M.track_blood_mob,0,M.dir,get_tracks(M))
+		else if(istype(M,/mob/living/carbon/human))
+			if(M.shoes && !istype(src,/turf/space))
+				if(M.shoes.track_blood > 0)
+					M.shoes.track_blood--
+					src.add_bloody_footprints(M.shoes.track_blood_mob,0,M.dir,M.shoes.name)
+
+//REMOVED until we improve it.
+//		for(var/obj/effect/decal/cleanable/blood/B in src)
+//			if(B.track_amt <= 0) continue
+//			if(B.type != /obj/effect/decal/cleanable/blood/tracks)
+//				if(istype(M,/mob/living/carbon/human))
+//					if(M.shoes)
+//						M.shoes.add_blood(B.blood_owner)
+//						M.shoes.track_blood_mob = B.blood_owner
+//						M.shoes.track_blood = max(M.shoes.track_blood,8)
+//				else
+//					M.add_blood(B.blood_owner)
+//					M.track_blood_mob = B.blood_owner
+//					M.track_blood = max(M.track_blood,rand(4,8))
+//				B.track_amt--
+//				break
+	. = ..()
+
+turf/proc/add_bloody_footprints(mob/living/carbon/human/M,leaving,d,info)
+	for(var/obj/effect/decal/cleanable/blood/tracks/T in src)
+		if(T.dir == d)
+			if((leaving && T.icon_state == "steps2") || (!leaving && T.icon_state == "steps1"))
+				T.desc = "These bloody footprints appear to have been made by [info]."
+				if(istype(M,/mob/living/carbon/human))
+					T.blood_DNA.len++
+					T.blood_DNA[T.blood_DNA.len] = list(M.dna.unique_enzymes,M.dna.b_type)
+				return
+	var/obj/effect/decal/cleanable/blood/tracks/this = new(src)
+	this.icon = 'footprints.dmi'
+	if(leaving)
+		this.icon_state = "blood2"
+	else
+		this.icon_state = "blood1"
+	this.dir = d
+	this.desc = "These bloody footprints appear to have been made by [info]."
+	if(istype(M,/mob/living/carbon/human))
+		if(this.blood_DNA.len)
+			this.blood_DNA.len++
+			this.blood_DNA[this.blood_DNA.len] = list(M.dna.unique_enzymes,M.dna.b_type)
+		else
+			this.blood_DNA = list(list(M.dna.unique_enzymes,M.dna.b_type))
+
+proc/get_tracks(mob/M)
+	if(istype(M,/mob/living))
+		if(istype(M,/mob/living/carbon/human))
+			. = "human feet"
+		else if(istype(M,/mob/living/carbon/monkey))
+			. = "monkey paws"
+		else if(istype(M,/mob/living/silicon/robot))
+			. = "robot feet"
+		else
+			. = "an unknown creature"
+
+proc/blood_incompatible(donor,receiver)
+	var
+		donor_antigen = copytext(donor,1,lentext(donor))
+		receiver_antigen = copytext(receiver,1,lentext(receiver))
+		donor_rh = findtext("+",donor)
+		receiver_rh = findtext("+",receiver)
+	if(donor_rh && !receiver_rh) return 1
+	switch(receiver_antigen)
+		if("A")
+			if(donor_antigen != "A" && donor_antigen != "O") return 1
+		if("B")
+			if(donor_antigen != "B" && donor_antigen != "O") return 1
+		if("O")
+			if(donor_antigen != "O") return 1
+		//AB is a universal receiver.
+	return 0
+
+/obj/item/weapon/rag
+	name = "damp rag"
+	desc = "For cleaning up messes, I suppose."
+	w_class = 1
+	icon = 'toy.dmi'
+	icon_state = "rag"
+
+	afterattack(atom/A as obj|turf|area, mob/user as mob)
+		if(istype(A))
+			user.visible_message("[user] starts to wipe the prints and blood off of [A] with \the [src]!")
+			if(do_after(user,30))
+				user.visible_message("[user] finishes wiping away the evidence!")
+				A.clean_blood()
+		return

code/modules/DetectiveWork/evidence.dm

@@ -0,0 +1,74 @@
+//CONTAINS:
+//Evidence bags and stuff
+///////////
+//Shamelessly ripped from Mini's old code.
+
+/obj/item/weapon/evidencebag
+	name = "evidence bag"
+	desc = "An empty evidence bag."
+	icon = 'storage.dmi'
+	icon_state = "evidenceobj"
+	w_class = 1
+
+/* buggy and stuff
+/obj/item/weapon/evidencebag/attackby(obj/item/weapon/O, mob/user as mob)
+	return src.afterattack(O, user)
+*/
+
+/obj/item/weapon/evidencebag/afterattack(obj/item/O, mob/user as mob)
+	if(istype(O, /obj/item/weapon/storage) && O in user)
+		user << "You put the evidence bag into the [O]."
+		return ..()
+	if(!(O && istype(O)) || O.anchored == 1)
+		user << "You can't put that inside the [src]!"
+		return ..()
+	if(O in user)
+		user << "You are wearing that."
+		return
+	if(src.contents.len > 0)
+		user << "The [src] already has something inside it."
+		return ..()
+	if(istype(O.loc,/obj/item/weapon/storage))
+		var/obj/item/weapon/storage/U = O.loc
+		user.client.screen -= O
+		U.contents.Remove(O)
+	if(istype(O.loc,/obj/item/clothing/suit/storage/))
+		var/obj/item/clothing/suit/storage/U = O.loc
+		user.client.screen -= O
+		U.contents.Remove(O)
+	user << "You put the [O] inside the [src]."
+	icon_state = "evidence"
+	src.overlays += O
+	desc = "An evidence bag containing \a [O]. [O.desc]"
+	O.loc = src
+	w_class = O.w_class
+	return
+
+
+/obj/item/weapon/evidencebag/attack_self(mob/user as mob)
+	if (src.contents.len > 0)
+		var/obj/item/I = src.contents[1]
+		user << "You take the [I] out of the [src]."
+		src.overlays -= I
+		I.loc = get_turf(user.loc)
+		w_class = 1
+		src.icon_state = "evidenceobj"
+		desc = "An empty evidence bag."
+	else
+		user << "[src] is empty."
+		src.icon_state = "evidenceobj"
+	return
+
+/obj/item/weapon/storage/box/evidence
+	name = "evidence bag box"
+	desc = "A box claiming to contain evidence bags."
+	New()
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/evidencebag(src)
+		new /obj/item/weapon/f_card(src)
+		..()
+		return

code/modules/admin/admin_verbs.dm

@@ -867,6 +867,7 @@
 	M.update_body()
 	M.update_face()
 	M.update_clothing()
+	M.check_dna(M)
 
 
 /client/proc/radioalert()

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -549,7 +549,7 @@
 			if (src.stat != 2)
 				if (src.machine)
 					if (!( src.machine.check_eye(src) ))
-						src.reset_view(null)
+						reset_view(null)
 				else
 					if(!client.adminobs)
 						reset_view(null)

code/modules/mob/living/carbon/human/human.dm

@@ -775,8 +775,8 @@
 
 	// lol
 	var/fat = ""
-	/*if (mutations & FAT)
-		fat = "fat"*/
+	if (mutations & FAT)
+		fat = "fat"
 
 	if (mutations & HULK)
 		overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk[fat][!lying ? "_s" : "_l"]")
@@ -879,10 +879,10 @@
 			var/t1 = w_uniform.color
 			if (!t1)
 				t1 = icon_state
-			/*if (mutations & FAT)
+			if (mutations & FAT)
 				overlays += image("icon" = 'uniform_fat.dmi', "icon_state" = "[t1][!lying ? "_s" : "_l"]", "layer" = MOB_LAYER)
-			else*/
-			overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(lying) ? "_s" : "_l")), "layer" = MOB_LAYER)
+			else
+				overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(lying) ? "_s" : "_l")), "layer" = MOB_LAYER)
 			if (w_uniform.blood_DNA.len)
 				var/icon/stain_icon = icon('blood.dmi', "uniformblood[!lying ? "" : "2"]")
 				overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
@@ -1289,7 +1289,7 @@
 	lying_icon = new /icon('human.dmi', "torso_l")
 
 	var/husk = (mutations & HUSK)
-	//var/obese = (mutations & FAT)
+	var/obese = (mutations & FAT)
 
 	stand_icon.Blend(new /icon('human.dmi', "chest_[g]_s"), ICON_OVERLAY)
 	lying_icon.Blend(new /icon('human.dmi', "chest_[g]_l"), ICON_OVERLAY)
@@ -1326,9 +1326,9 @@
 
 		stand_icon.Blend(husk_s, ICON_OVERLAY)
 		lying_icon.Blend(husk_l, ICON_OVERLAY)
-	/*else if(obese)
+	else if(obese)
 		stand_icon.Blend(new /icon('human.dmi', "fatbody_s"), ICON_OVERLAY)
-		lying_icon.Blend(new /icon('human.dmi', "fatbody_l"), ICON_OVERLAY)*/
+		lying_icon.Blend(new /icon('human.dmi', "fatbody_l"), ICON_OVERLAY)
 
 	// Skin tone
 	if (s_tone >= 0)
@@ -2524,6 +2524,7 @@ It can still be worn/put on as normal.
 	update_body()
 	update_face()
 	update_clothing()
+	check_dna()
 
 	for(var/mob/M in view())
 		M.show_message("[src.name] just morphed!")
@@ -2543,35 +2544,43 @@ It can still be worn/put on as normal.
 	if(target.mutations & mRemotetalk)
 		target.show_message("\blue You hear [src.real_name]'s voice: [say]")
 	else
-		target.show_message("\blue You hear a voice: [say]")
+		target.show_message("\blue You hear a voice that seems to echo around the room: [say]")
+		target << "\red This ain't an admin message, this is IC.  Act like it.  If someone's abusing it, pretending to be us, adminhelp it."
 	usr.show_message("\blue You project your mind into [target.real_name]: [say]")
 	for(var/mob/dead/observer/G in world)
 		G.show_message("<i>Telepathic message from <b>[src]</b> to <b>[target]</b>: [say]</i>")
+/mob/living/carbon/human
+	var/mob/remoteobserve
 
 /mob/living/carbon/human/proc/remoteobserve()
 	set name = "Remote View"
 	set category = "Superpower"
 
 	if(!(src.mutations & mRemote))
-		client.eye = client.mob
+		reset_view(0)
+		remoteobserve = null
 		src.verbs -= /mob/living/carbon/human/proc/remoteobserve
 		return
 
 	if(client.eye != client.mob)
-		client.eye = client.mob
+		reset_view(0)
+		remoteobserve = null
 		return
 
 	var/list/mob/creatures = list()
 
 	for(var/mob/living/carbon/h in world)
 		creatures += h
-	client.perspective = EYE_PERSPECTIVE
-
-
 
 	var/mob/target = input ("Who do you want to project your mind to ?") as mob in creatures
 
 	if (target)
-		client.eye = target
+		reset_view(target)
+		remoteobserve = target
 	else
-		client.eye = client.mob
+		reset_view(0)
+		remoteobserve = null
+
+/mob/living/carbon/human/proc/check_dna()
+	dna.check_integrity(src)
+	return

code/modules/mob/living/carbon/human/life.dm

@@ -130,6 +130,10 @@
 					var/pr = 50
 					if(prob(pr))
 						adjustToxLoss(1)
+			else
+				if(!lying)
+					lying = 1 //Seriously, stay down :x
+					update_clothing()
 
 		clamp_values()
 
@@ -154,7 +158,7 @@
 
 
 		handle_disabilities()
-			if (mutations & mHallucination)
+			if(mutations2 & mHallucination)
 				hallucination = 100
 				halloss = 0
 
@@ -175,27 +179,25 @@
 				for(var/atom/a in hallucinations)
 					del a
 
-
-			if(mutations & mSmallsize)
-				if(!(flags & PASSTABLE))
-					flags |= PASSTABLE
+			if(mutations2 & mSmallsize)
+				if(!(pass_flags & PASSTABLE))
+					pass_flags |= PASSTABLE
 			else
-				if(flags & PASSTABLE)
-					flags &= ~PASSTABLE
+				if(pass_flags & PASSTABLE)
+					pass_flags &= ~PASSTABLE
 
 
 
 			if (mutations & mRegen)
-				src.bruteloss -= 2
-				src.fireloss -= 2
-				src.oxyloss -= 2
-				src.toxloss -= 2
+				adjustBruteLoss(-2)
+				adjustToxLoss(-2)
+				adjustOxyLoss(-2)
+				adjustFireLoss(-2)
 
 				for(var/datum/organ/external/org in organs)
-					org.brute_dam -= 2
-					org.burn_dam -= 2
-					org.brute_dam = max(org.brute_dam, 0)
-					org.burn_dam = max(org.burn_dam, 0)
+					org.brute_dam = max(org.brute_dam - 2, 0)
+					org.burn_dam = max(org.burn_dam - 2, 0)
+				updatehealth()
 
 			if(!(/mob/living/carbon/human/proc/morph in src.verbs))
 				if(mutations & mMorph)
@@ -209,7 +211,7 @@
 					src.verbs += /mob/living/carbon/human/proc/remoteobserve
 			else
 				if(!(mutations & mRemote))
-					src.verbs += /mob/living/carbon/human/proc/remoteobserve
+					src.verbs -= /mob/living/carbon/human/proc/remoteobserve
 
 			if(!(/mob/living/carbon/human/proc/remotesay in src.verbs))
 				if(mutations & mRemotetalk)
@@ -250,7 +252,7 @@
 						pixel_x = old_x
 						pixel_y = old_y
 			if (disabilities & 16)
-				if (prob(20))//Instant Chad Ore!
+				if (prob(10))//Instant Chad Ore!
 					stuttering = max(10, stuttering)
 
 			if (brainloss >= 60 && stat != 2)
@@ -312,6 +314,8 @@
 							emote("gasp")
 						updatehealth()
 
+			//As close as I could find to where to put it
+			grav_delay = max(grav_delay-3,0)
 
 		breathe()
 
@@ -1147,9 +1151,10 @@
 				if (machine)
 					if (!( machine.check_eye(src) ))
 						reset_view(null)
-				else
-					if(!client.adminobs)
-						reset_view(null)
+				else if(!(mutations & mRemote) && !client.adminobs)
+					reset_view(null)
+					if(remoteobserve)
+						remoteobserve = null
 
 			return 1
 

code/modules/mob/living/carbon/human/whisper.dm

@@ -53,7 +53,7 @@
 	message = capitalize(message)
 
 	if (src.stuttering)
-		message = stutter(message)
+		message = NewStutter(message,stunned)
 	if (src.slurring)
 		message = slur(message)
 

code/modules/mob/living/living.dm

@@ -17,7 +17,7 @@
 //sort of a legacy burn method for /electrocute, /shock, and the e_chair
 /mob/living/proc/burn_skin(burn_amount)
 	if(istype(src, /mob/living/carbon/human))
-		if(src.mutations & mShock)
+		if(src.mutations2 & mShock)
 			return 0
 		//world << "DEBUG: burn_skin(), mutations=[mutations]"
 		if (src.mutations & COLD_RESISTANCE) //fireproof

code/modules/mob/living/say.dm

@@ -157,10 +157,10 @@
 			message = uppertext(message)
 			message += "[stutter(pick("!", "!!", "!!!"))]"
 		if(!stuttering && prob(15))
-			message = stutter(message)
+			message = NewStutter(message,stunned)
 
 	if (stuttering)
-		message = stutter(message)
+		message = NewStutter(message,stunned)
 	if (slurring)
 		message = slur(message)
 

code/modules/mob/living/silicon/pai/software.dm

@@ -550,7 +550,7 @@
 
 	var/obj/machinery/machine = src.cable.machine
 	dat += "<font color=#55FF55>Connected</font> <br>"
-	if(!istype(machine, /obj/machinery/door))
+	if(!istype(machine, /obj/machinery/door) || istype(machine, /obj/machinery/door/airlock/secure/centcom))
 		dat += "Connected device's firmware does not appear to be compatible with Airlock Jack protocols.<br>"
 		return dat
 //	var/obj/machinery/airlock/door = machine

code/modules/mob/mob_movement.dm

@@ -185,6 +185,7 @@
 //					move_delay += mob.organStructure.legs.moveWalkDelay
 				move_delay += 5
 		move_delay += mob.movement_delay()
+		move_delay += mob.grav_delay
 
 		//We are now going to move
 		moving = 1

code/modules/power/singularity/singularity.dm

@@ -2,7 +2,6 @@ var/global/list/uneatable = list(
 	/turf/space,
 	/obj/effect,
 	/obj/effect/overlay,
-	/obj/effect/decal/cleanable,
 	/obj/effect/rune
 	)
 
@@ -212,15 +211,19 @@ var/global/list/uneatable = list(
 				consume(X)
 			for(var/atom/movable/X in orange(grav_pull,src))
 				if(is_type_in_list(X, uneatable))	continue
-				if(((X) &&(!X:anchored) && (!istype(X,/mob/living/carbon/human)))|| (src.current_size >= 9))
-					step_towards(X,src)
+				if((((X) && (!X:anchored)) || (src.current_size >= 9)) && (!istype(X,/mob/living/carbon/human)))
+					spawn(rand(0,15))
+						step_towards(X,src)
 				else if(istype(X,/mob/living/carbon/human))
 					var/mob/living/carbon/human/H = X
-					if(istype(H.shoes,/obj/item/clothing/shoes/magboots))
+					H << "\red The singularity has you in it's gravitational pull!  It's hard to break free!"
+					H.grav_delay = 20 //No running this time!
+					if(istype(H.shoes,/obj/item/clothing/shoes/magboots) && !(src.current_size >= 9))
 						var/obj/item/clothing/shoes/magboots/M = H.shoes
 						if(M.magpulse)
 							continue
-					step_towards(H,src)
+					spawn(rand(0,15))
+						step_towards(H,src)
 			if(defer_powernet_rebuild != 2)
 				defer_powernet_rebuild = 0
 			return
@@ -236,7 +239,8 @@ var/global/list/uneatable = list(
 					gain = 100
 				spawn()
 					A:gib()
-				sleep(1)
+//Sleep being called in process() :|
+//				sleep(1)
 			else if(istype(A,/obj/))
 
 				if (istype(A,/obj/item/weapon/storage/backpack/holding))
@@ -258,8 +262,8 @@ var/global/list/uneatable = list(
 					O.y = 2
 					O.z = 2
 				else
-					A:ex_act(1.0)
-					if(A) del(A)
+					spawn(rand(0,10)) //Spreading shit out
+						del(A)
 				gain = 2
 			else if(isturf(A))
 				var/turf/T = A
@@ -271,6 +275,9 @@ var/global/list/uneatable = list(
 							src.consume(O)
 				A:ReplaceWithSpace()
 				gain = 2
+			else
+				spawn(rand(0,10)) //Spreading shit out
+					del(A)
 			src.energy += gain
 			return