Some comments, tweaks, and improvements to detective work, evidence bags, and packages.

code/modules/DetectiveWork/detective_work.dm

@@ -166,7 +166,7 @@ obj/machinery/computer/forensic_scanning
 						I.loc = src
 				else
 					usr << "Invalid Object Rejected."
-			if("card")
+			if("card")  //Processing a fingerprint card.
 				var/mob/M = usr
 				var/obj/item/I = M.equipped()
 				if(!(I && istype(I,/obj/item/weapon/f_card)))
@@ -186,7 +186,7 @@ obj/machinery/computer/forensic_scanning
 					process_card()
 				else
 					usr << "\red Invalid Object Rejected."
-			if("database")
+			if("database") //Viewing all records in each database
 				canclear = 1
 				if(href_list["delete_record"])
 					delete_dossier(href_list["delete_record"])
@@ -211,7 +211,7 @@ obj/machinery/computer/forensic_scanning
 						for(var/atom in misc)
 							var/list/data_entry = misc[atom]
 							temp += "<a href='?src=\ref[src];operation=auxiliary;identifier=[atom]'>{[data_entry[3]]}</a><br>"
-			if("record")
+			if("record") //Viewing a record from the "files" database.
 				canclear = 0
 				if(files)
 					temp = "<b>Criminal Evidence Database</b><br><br>"
@@ -245,7 +245,7 @@ obj/machinery/computer/forensic_scanning
 				else
 					temp = "ERROR.  Database not found!<br>"
 				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
-			if("databaseprint")
+			if("databaseprint") //Printing from the "files" database.
 				if(files)
 					var/obj/item/weapon/paper/P = new(loc)
 					P.name = "Database File (Dossier [files.Find(href_list["identifier"])])"
@@ -274,12 +274,11 @@ obj/machinery/computer/forensic_scanning
 						var/list/blood = outputs[3]
 						if(blood && blood.len)
 							P.info += "&nbsp<b>Blood:</b><br>"
-							for(var/j = 1, j <= blood.len, j++)
-								var/list/templist2 = blood[j]
-								P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [templist2[2]], DNA: [templist2[1]]<br>"
+							for(var/named in blood)
+								P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [blood[named]], DNA: [named]<br>"
 				else
 					usr << "ERROR.  Database not found!<br>"
-			if("auxiliary")
+			if("auxiliary") //Viewing a record from the "misc" database.
 				canclear = 0
 				if(misc)
 					temp = "<b>Auxiliary Evidence Database</b><br><br>"
@@ -301,7 +300,7 @@ obj/machinery/computer/forensic_scanning
 				else
 					temp = "ERROR.  Database not found!<br>"
 				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
-			if("auxiliaryprint")
+			if("auxiliaryprint") //Printing from the "misc" database.
 				if(misc)
 					var/obj/item/weapon/paper/P = new(loc)
 					var/list/outputs = misc[href_list["identifier"]]
@@ -402,7 +401,7 @@ obj/machinery/computer/forensic_scanning
 					temp = "Scan Failed: No Object"
 
 
-			if("print")
+			if("print") //Printing scan data
 				if(scan_data)
 					temp = "Scan Data Printed."
 					var/obj/item/weapon/paper/P = new(loc)
@@ -415,7 +414,7 @@ obj/machinery/computer/forensic_scanning
 				scan_data = ""
 			if("cancel")
 				scan_process = 0
-			if("add")
+			if("add") //Adding an object (Manually) to the database.
 				if(scanning)
 					add_data(scanning)
 				else
@@ -540,7 +539,7 @@ obj/machinery/computer/forensic_scanning
 		if(master)
 			master[1] = stringmerge(master[1],new_print)
 		else
-			CRASH("Fucking hell.  Something went wrong, and it tried to update a null print or something.  Tell SkyMarshal")
+			CRASH("Fucking hell.  Something went wrong, and it tried to update a null print or something.  Tell SkyMarshal (and give him this call stack)")
 		return
 
 	proc/process_card()	//Same as above, but for fingerprint cards
@@ -768,7 +767,7 @@ proc/blood_incompatible(donor,receiver)
 			..()
 
 	afterattack(atom/A as obj|turf|area, mob/user as mob)
-		if(istype(A))
+		if(istype(A) && src in user)
 			user.visible_message("[user] starts to wipe down [A] with [src]!")
 			if(do_after(user,30))
 				user.visible_message("[user] finishes wiping off the [A]!")
@@ -776,7 +775,7 @@ proc/blood_incompatible(donor,receiver)
 		return
 
 	examine()
-		if (!( usr ))
+		if (!usr)
 			return
 		usr << "That's \a [src]."
 		usr << desc

code/modules/DetectiveWork/evidence.dm

@@ -1,8 +1,6 @@
 //CONTAINS:
 //Evidence bags and stuff
 ///////////
-//Shamelessly ripped from Mini's old code.
-
 /obj/item/weapon/evidencebag
 	name = "evidence bag"
 	desc = "An empty evidence bag."
@@ -10,34 +8,43 @@
 	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(!in_range(O,user))
+		return
+
 	if(istype(O, /obj/item/weapon/storage) && O in user)
 		return ..()
+
 	if(!(O && istype(O)) || O.anchored == 1)
-		user << "You can't put that inside the [src]!"
+		user << "You can't put that inside \the [src]!"
 		return ..()
-	if(O in user)
+
+	if(istype(O, /obj/item/weapon/evidencebag))
+		user << "You find putting an evidence bag in another evidence bag to be slightly absurd."
+		return
+
+	if(O in user && (user.l_hand != O && user.r_hand != O)) //If it is in their inventory, but not in their hands, don't grab it off of them.
 		user << "You are wearing that."
 		return
-	if(src.contents.len > 0)
+
+	if(contents.len)
 		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]."
+
+	user.visible_message("\The [user] puts \a [O] into \a [src]", "You put \the [O] inside \the [src].",\
+	"You hear a rustle as someone puts something into a plastic bag.")
 	icon_state = "evidence"
-	src.overlays += O
+	overlays += O
 	desc = "An evidence bag containing \a [O]. [O.desc]"
 	O.loc = src
 	w_class = O.w_class
@@ -45,17 +52,19 @@
 
 
 /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)
+	if (contents.len)
+		var/obj/item/I = contents[1]
+		user.visible_message("\The [user] takes \a [I] out of \a [src]", "You take \the [I] out of \the [src].",\
+		"You hear someone rustle around in a plastic bag, and remove something.")
+		overlays -= I
+		user.put_in_hands(I)
 		w_class = 1
-		src.icon_state = "evidenceobj"
+		icon_state = "evidenceobj"
 		desc = "An empty evidence bag."
+
 	else
-		user << "[src] is empty."
-		src.icon_state = "evidenceobj"
+		user << "\The [src] is empty."
+		icon_state = "evidenceobj"
 	return
 
 /obj/item/weapon/storage/box/evidence