Kills off /obj/item/device (#6561)

code/datums/components/chasm.dm

@@ -70,8 +70,8 @@
 			return FALSE
 	if(ishuman(AM))
 		var/mob/living/carbon/human/H = AM
-		if(istype(H.belt, /obj/item/device/wormhole_jaunter))
-			var/obj/item/device/wormhole_jaunter/J = H.belt
+		if(istype(H.belt, /obj/item/wormhole_jaunter))
+			var/obj/item/wormhole_jaunter/J = H.belt
 			//To freak out any bystanders
 			H.visible_message("<span class='boldwarning'>[H] falls into [parent]!</span>")
 			J.chasm_react(H)

code/datums/components/spooky.dm

@@ -42,11 +42,11 @@
 		var/T = get_turf(H)
 		if(too_spooky)
 			if(prob(30))
-				new/obj/item/device/instrument/saxophone/spectral(T)
+				new/obj/item/instrument/saxophone/spectral(T)
 			else if(prob(30))
-				new/obj/item/device/instrument/trumpet/spectral(T)
+				new/obj/item/instrument/trumpet/spectral(T)
 			else if(prob(30))
-				new/obj/item/device/instrument/trombone/spectral(T)
+				new/obj/item/instrument/trombone/spectral(T)
 			else
 				to_chat(H, "The spooky gods forgot to ship your instrument. Better luck next unlife.")
 		to_chat(H, "<B>You are the spooky skeleton!</B>")

code/datums/components/storage/concrete/pockets.dm

@@ -39,7 +39,7 @@
 		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
 		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
 		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
-		/obj/item/device/firing_pin
+		/obj/item/firing_pin
 		))
 
 /datum/component/storage/concrete/pockets/shoes/clown/Initialize()
@@ -49,7 +49,7 @@
 		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
 		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
 		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
-		/obj/item/device/firing_pin, /obj/item/bikehorn))
+		/obj/item/firing_pin, /obj/item/bikehorn))
 
 /datum/component/storage/concrete/pockets/pocketprotector
 	max_items = 3
@@ -61,5 +61,5 @@
 		/obj/item/pen,
 		/obj/item/toy/crayon,
 		/obj/item/lipstick,
-		/obj/item/device/flashlight/pen,
+		/obj/item/flashlight/pen,
 		/obj/item/clothing/mask/cigarette))