here we go again (#2456)

code/modules/detectivework/evidence.dm

@@ -1,6 +1,6 @@
 //CONTAINS: Evidence bags
 
-/obj/item/weapon/evidencebag
+/obj/item/evidencebag
 	name = "evidence bag"
 	desc = "An empty evidence bag."
 	icon = 'icons/obj/storage.dmi'
@@ -8,20 +8,20 @@
 	item_state = ""
 	w_class = WEIGHT_CLASS_TINY
 
-/obj/item/weapon/evidencebag/afterattack(obj/item/I, mob/user,proximity)
+/obj/item/evidencebag/afterattack(obj/item/I, mob/user,proximity)
 	if(!proximity || loc == I)
 		return
 	evidencebagEquip(I, user)
 
-/obj/item/weapon/evidencebag/attackby(obj/item/I, mob/user, params)
+/obj/item/evidencebag/attackby(obj/item/I, mob/user, params)
 	if(evidencebagEquip(I, user))
 		return 1
 
-/obj/item/weapon/evidencebag/proc/evidencebagEquip(obj/item/I, mob/user)
+/obj/item/evidencebag/proc/evidencebagEquip(obj/item/I, mob/user)
 	if(!istype(I) || I.anchored == 1)
 		return
 
-	if(istype(I, /obj/item/weapon/evidencebag))
+	if(istype(I, /obj/item/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
 
@@ -34,8 +34,8 @@
 		return
 
 	if(!isturf(I.loc)) //If it isn't on the floor. Do some checks to see if it's in our hands or a box. Otherwise give up.
-		if(istype(I.loc, /obj/item/weapon/storage))	//in a container.
-			var/obj/item/weapon/storage/U = I.loc
+		if(istype(I.loc, /obj/item/storage))	//in a container.
+			var/obj/item/storage/U = I.loc
 			U.remove_from_storage(I, src)
 		if(user.is_holding(I))
 			user.dropItemToGround(I)
@@ -60,7 +60,7 @@
 	w_class = I.w_class
 	return 1
 
-/obj/item/weapon/evidencebag/attack_self(mob/user)
+/obj/item/evidencebag/attack_self(mob/user)
 	if(contents.len)
 		var/obj/item/I = contents[1]
 		user.visible_message("[user] takes [I] out of [src].", "<span class='notice'>You take [I] out of [src].</span>",\
@@ -76,16 +76,16 @@
 		icon_state = "evidenceobj"
 	return
 
-/obj/item/weapon/storage/box/evidence
+/obj/item/storage/box/evidence
 	name = "evidence bag box"
 	desc = "A box claiming to contain evidence bags."
 
-/obj/item/weapon/storage/box/evidence/New()
-	new /obj/item/weapon/evidencebag(src)
-	new /obj/item/weapon/evidencebag(src)
-	new /obj/item/weapon/evidencebag(src)
-	new /obj/item/weapon/evidencebag(src)
-	new /obj/item/weapon/evidencebag(src)
-	new /obj/item/weapon/evidencebag(src)
+/obj/item/storage/box/evidence/New()
+	new /obj/item/evidencebag(src)
+	new /obj/item/evidencebag(src)
+	new /obj/item/evidencebag(src)
+	new /obj/item/evidencebag(src)
+	new /obj/item/evidencebag(src)
+	new /obj/item/evidencebag(src)
 	..()
 	return

code/modules/detectivework/footprints_and_rag.dm

@@ -6,7 +6,7 @@
 	var/transfer_blood = 0
 
 
-/obj/item/weapon/reagent_containers/glass/rag
+/obj/item/reagent_containers/glass/rag
 	name = "damp rag"
 	desc = "For cleaning up messes, you suppose."
 	w_class = WEIGHT_CLASS_TINY
@@ -19,11 +19,11 @@
 	volume = 5
 	spillable = 0
 
-/obj/item/weapon/reagent_containers/glass/rag/suicide_act(mob/user)
+/obj/item/reagent_containers/glass/rag/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is smothering [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return (OXYLOSS)
 
-/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
+/obj/item/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
 	if(!proximity)
 		return
 	if(iscarbon(A) && A.reagents && reagents.total_volume)

code/modules/detectivework/scanner.dm

@@ -31,7 +31,7 @@
 
 /obj/item/device/detective_scanner/proc/PrintReport()
 	// Create our paper
-	var/obj/item/weapon/paper/P = new(get_turf(src))
+	var/obj/item/paper/P = new(get_turf(src))
 	P.name = "paper- 'Scanner Report'"
 	P.info = "<center><font size='6'><B>Scanner Report</B></font></center><HR><BR>"
 	P.info += jointext(log, "<BR>")