Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

code/WorkInProgress/autopsy.dm

@@ -2,10 +2,18 @@
 //moved these here from code/defines/obj/weapon.dm
 //please preference put stuff where it's easy to find - C
 
-/obj/item/weapon/autopsy_scanner/var/list/datum/autopsy_data_scanner/wdata = list()
-/obj/item/weapon/autopsy_scanner/var/list/datum/autopsy_data_scanner/chemtraces = list()
-/obj/item/weapon/autopsy_scanner/var/target_name = null
-/obj/item/weapon/autopsy_scanner/var/timeofdeath = null
+/obj/item/weapon/autopsy_scanner
+	name = "autopsy scanner"
+	desc = "Extracts information on wounds."
+	icon = 'icons/obj/autopsy_scanner.dmi'
+	icon_state = ""
+	flags = FPRINT | TABLEPASS | CONDUCT
+	w_class = 1.0
+	origin_tech = "materials=1;biotech=1"
+	var/list/datum/autopsy_data_scanner/wdata = list()
+	var/list/datum/autopsy_data_scanner/chemtraces = list()
+	var/target_name = null
+	var/timeofdeath = null
 
 /datum/autopsy_data_scanner
 	var/weapon = null // this is the DEFINITE weapon type that was used
@@ -74,10 +82,6 @@
 		usr << "No."
 		return
 
-	if(wdata.len == 0 && chemtraces.len == 0)
-		usr << "<b>* There is no data about any wounds in the scanner's database. You may have to scan more bodyparts, or otherwise this wound type may not be in the scanner's database."
-		return
-
 	var/scan_data = ""
 
 	if(timeofdeath)
@@ -179,6 +183,8 @@
 	if(target_name != M.name)
 		target_name = M.name
 		src.wdata = list()
+		src.chemtraces = list()
+		src.timeofdeath = null
 		user << "\red A new patient has been registered.. Purging data for previous patient."
 
 	src.timeofdeath = M.timeofdeath