Merge branch 'master' into w_class

code/modules/detective_work/evidence.dm

@@ -21,6 +21,10 @@
 	if(!istype(I) || I.anchored == 1)
 		return
 
+	if(istype(I, /obj/item/weapon/storage/box))
+		to_chat(user, "<span class='notice'>This box is too big to fit in the evidence bag.</span>")
+		return
+
 	if(istype(I, /obj/item/weapon/evidencebag))
 		to_chat(user, "<span class='notice'>You find putting an evidence bag in another evidence bag to be slightly absurd.</span>")
 		return 1 //now this is podracing

code/modules/detective_work/scanner.dm

@@ -18,7 +18,7 @@
 /obj/item/device/detective_scanner/attack_self(var/mob/user)
 	var/search = input(user, "Enter name, fingerprint or blood DNA.", "Find record", "")
 
-	if (!search || user.stat || user.incapacitated())
+	if(!search || user.stat || user.incapacitated())
 		return
 
 	search = lowertext(search)
@@ -29,21 +29,21 @@
 
 	// I really, really wish I didn't have to split this into two seperate loops. But the datacore is awful.
 
-	for (var/record in data_core.general)
+	for(var/record in data_core.general)
 		var/datum/data/record/S = record
 		if(S && (search == lowertext(S.fields["fingerprint"]) || search == lowertext(S.fields["name"])))
 			name = S.fields["name"]
 			fingerprint = S.fields["fingerprint"]
 			continue
 
-	for (var/record in data_core.medical)
+	for(var/record in data_core.medical)
 		var/datum/data/record/M = record
-		if (M && ( search == lowertext(M.fields["b_dna"]) || name == M.fields["name"]) )
+		if(M && ( search == lowertext(M.fields["b_dna"]) || name == M.fields["name"]) )
 			dna = M.fields["b_dna"]
 
 			if(fingerprint == "FINGERPRINT NOT FOUND") // We have searched by DNA, and do not have the relevant information from the fingerprint records.
 				name = M.fields["name"]
-				for (var/gen_record in data_core.general)
+				for(var/gen_record in data_core.general)
 					var/datum/data/record/S = gen_record
 					if(S && (name == S.fields["name"]))
 						fingerprint = S.fields["fingerprint"]
@@ -132,7 +132,7 @@
 		if(ishuman(A))
 
 			var/mob/living/carbon/human/H = A
-			if (istype(H.dna, /datum/dna) && !H.gloves)
+			if(istype(H.dna, /datum/dna) && !H.gloves)
 				fingerprints += md5(H.dna.uni_identity)
 
 		else if(!ismob(A))
@@ -170,7 +170,7 @@
 				found_something = 1
 
 			// Blood
-			if (blood && blood.len)
+			if(blood && blood.len)
 				sleep(30)
 				add_log("<span class='info'><B>Blood:</B></span>")
 				found_something = 1