Merge pull request #7964 from Baystation12/dev-freeze

Dev-Freezer -> Master v0.1.17 Botswan Punchout

code/modules/detectivework/evidence.dm

@@ -93,9 +93,9 @@
 		icon_state = "evidenceobj"
 	return
 
-/obj/item/weapon/evidencebag/examine()
-	..()
-	if (stored_item) stored_item.examine()
+/obj/item/weapon/evidencebag/examine(mob/user)
+	..(user)
+	if (stored_item) user.examinate(stored_item)
 
 /obj/item/weapon/storage/box/evidence
 	name = "evidence bag box"

code/modules/detectivework/footprints_and_rag.dm

@@ -23,7 +23,7 @@
 	possible_transfer_amounts = list(5)
 	volume = 5
 	can_be_placed_into = null
-	flags = FPRINT | TABLEPASS | OPENCONTAINER | NOBLUDGEON
+	flags = OPENCONTAINER | NOBLUDGEON
 
 /obj/item/weapon/reagent_containers/glass/rag/attack_self(mob/user as mob)
 	return
@@ -45,10 +45,3 @@
 			user.visible_message("[user] finishes wiping off the [A]!")
 			A.clean_blood()
 	return
-
-/obj/item/weapon/reagent_containers/glass/rag/examine()
-	if (!usr)
-		return
-	usr << "That's \a [src]."
-	usr << desc
-	return

code/modules/detectivework/scanner.dm

@@ -5,7 +5,7 @@
 	var/list/stored = list()
 	w_class = 3.0
 	item_state = "electronic"
-	flags = FPRINT | TABLEPASS | CONDUCT | NOBLUDGEON
+	flags = CONDUCT | NOBLUDGEON
 	slot_flags = SLOT_BELT
 
 /obj/item/device/detective_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob)