-Changed the CentComm. Report so it longer reports potential antags. It will just say the potential round type instead.

-Added reagent scanning to the detective's scanner. Can be used for scanning dead bodies for leftover poison or scanning drinks to see if they were spiked.

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

code/modules/detectivework/scanner.dm

@@ -1,5 +1,6 @@
 //CONTAINS: Detective's Scanner
 
+// TODO: Split everything into easy to manage procs.
 
 /obj/item/device/detective_scanner
 	name = "Scanner"
@@ -38,27 +39,37 @@
 		scanning = 1
 		spawn(0)
 
-			var/scanned_something = 0
+			var/found_something = 0
 			user << "<span class='notice'>You scan [M]. The scanner is analysing the results...</span>"
 			add_log(null, "<B>[time2text(world.time + 432000, "hh:mm:ss")] - [M]</B>")
+			// Fingerprints
 			if(ishuman(M))
 				if (istype(M.dna, /datum/dna) && !M.gloves)
 					sleep(30)
 					add_log(user, "<span class='info'><B>Prints:</B></span>")
 					add_log(user, "[md5(M.dna.uni_identity)]")
-					scanned_something = 1
+					found_something = 1
 
+			// Blood
 			if ( !M.blood_DNA || !M.blood_DNA.len )
 				if(M.blood_DNA)
 					del(M.blood_DNA)
 			else
 				sleep(30)
 				add_log(user, "<span class='info'><B>Blood:</B></span>")
-				scanned_something = 1
+				found_something = 1
 				for(var/blood in M.blood_DNA)
 					add_log(user, "Type: <font color='red'>[M.blood_DNA[blood]]</font> DNA: <font color='red'>[blood]</font>")
 
-			if(!scanned_something)
+			//Reagents
+			if(M.reagents && M.reagents.reagent_list.len)
+				sleep(30)
+				add_log(user, "<span class='info'><B>Reagents:</B></span>")
+				for(var/datum/reagent/R in M.reagents.reagent_list)
+					add_log(user, "Reagent: <font color='red'>[R.name]</font> Volume: <font color='red'>[R.volume]</font>")
+				found_something = 1
+
+			if(!found_something)
 				add_log(null, "<I># No forensic traces found #</I>")
 				user.visible_message("\The [user] scans \the [M] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
 				"<span class='notice'>Unable to locate any fingerprints, materials, fibers, or blood on [M]!</span>",\
@@ -86,6 +97,7 @@
 
 		spawn(0)
 
+			var/found_something = 0
 			user << "<span class='notice'>You scan [A]. The scanner is analysing the results...</span>"
 			add_log(null, "<B>[time2text(world.time + 432000, "hh:mm:ss")] - [capitalize(A.name)]</B>")
 			//PRINTS
@@ -105,6 +117,7 @@
 					add_log(user, "<span class='info'><B>Prints:</B></span>")
 					for(var/i in completed_prints)
 						add_log(user, "[i]")
+					found_something = 1
 
 			//FIBERS
 			if(A.suit_fibers && A.suit_fibers.len)
@@ -112,6 +125,7 @@
 				add_log(user, "<span class='info'><B>Fibers:</B></span>")
 				for(var/fiber in A.suit_fibers)
 					add_log(user, "[fiber]")
+				found_something = 1
 
 			//Blood
 			if (A.blood_DNA && A.blood_DNA.len)
@@ -119,9 +133,18 @@
 				add_log(user, "<span class='info'><B>Blood:</B></span>")
 				for(var/blood in A.blood_DNA)
 					add_log(user, "Type: <font color='red'>[A.blood_DNA[blood]]</font> DNA: <font color='red'>[blood]</font>")
+				found_something = 1
+
+			//Reagents
+			if(A.reagents && A.reagents.reagent_list.len)
+				sleep(30)
+				add_log(user, "<span class='info'><B>Reagents:</B></span>")
+				for(var/datum/reagent/R in A.reagents.reagent_list)
+					add_log(user, "Reagent: <font color='red'>[R.name]</font> Volume: <font color='red'>[R.volume]</font>")
+				found_something = 1
 
 			//General
-			if ((!A.fingerprints || !A.fingerprints.len) && (!A.suit_fibers || !A.suit_fibers.len) && (!A.blood_DNA || !A.blood_DNA.len))
+			if (!found_something)
 				add_log(null, "<I># No forensic traces found #</I>")
 				user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
 				"<span class='notice'>Unable to locate any fingerprints, materials, fibers, or blood on [A]!</span>",\