Pretty much all new click code

code/modules/DetectiveWork/evidence.dm

@@ -8,16 +8,14 @@
 	item_state = ""
 	w_class = 1
 
-/obj/item/weapon/evidencebag/afterattack(obj/item/I, mob/user as mob)
+/obj/item/weapon/evidencebag/afterattack(obj/item/I, mob/user as mob, proximity)
+	if(!proximity) return
 	if(!in_range(I, user))
 		return
 
 	if(!istype(I) || I.anchored == 1)
 		return ..()
 
-	if(istype(I, /obj/item/weapon/storage))
-		return ..()
-
 	if(istype(I, /obj/item/weapon/evidencebag))
 		user << "<span class='notice'>You find putting an evidence bag in another evidence bag to be slightly absurd.</span>"
 		return

code/modules/DetectiveWork/footprints_and_rag.dm

@@ -37,7 +37,8 @@
 	else
 		..()
 
-/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob)
+/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob, proximity)
+	if(!proximity) return
 	if(istype(A) && src in user)
 		user.visible_message("[user] starts to wipe down [A] with [src]!")
 		if(do_after(user,30))

code/modules/DetectiveWork/scanner.dm

@@ -9,7 +9,7 @@
 	var/list/stored = list()
 	w_class = 3.0
 	item_state = "electronic"
-	flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
+	flags = FPRINT | TABLEPASS | CONDUCT | NOBLUDGEON
 	slot_flags = SLOT_BELT
 
 	attackby(obj/item/weapon/f_card/W as obj, mob/user as mob)
@@ -64,9 +64,8 @@
 					user << "\blue Blood type: [M.blood_DNA[blood]]\nDNA: [blood]"
 		return
 
-	afterattack(atom/A as obj|turf|area, mob/user as mob)
-		if(!in_range(A,user))
-			return
+	afterattack(atom/A as obj|turf|area, mob/user as mob, proximity)
+		if(!proximity) return
 		if(loc != user)
 			return
 		if(istype(A,/obj/machinery/computer/forensic_scanning)) //breaks shit.