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

code/game/objects/effects/anomalies.dm

@@ -8,7 +8,7 @@
 	anchored = TRUE
 	light_range = 3
 	var/movechance = 70
-	var/obj/item/device/assembly/signaler/anomaly/aSignal = null
+	var/obj/item/assembly/signaler/anomaly/aSignal = null
 	var/area/impact_area
 
 	var/lifespan = 990
@@ -73,7 +73,7 @@
 
 
 /obj/effect/anomaly/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/device/analyzer))
+	if(istype(I, /obj/item/analyzer))
 		to_chat(user, "<span class='notice'>Analyzing... [src]'s unstable field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code].</span>")
 
 ///////////////////////
@@ -193,9 +193,9 @@
 	var/turf/T = safepick(get_area_turfs(impact_area))
 	if(T)
 			// Calculate new position (searches through beacons in world)
-		var/obj/item/device/beacon/chosen
+		var/obj/item/beacon/chosen
 		var/list/possible = list()
-		for(var/obj/item/device/beacon/W in GLOB.teleportbeacons)
+		for(var/obj/item/beacon/W in GLOB.teleportbeacons)
 			possible += W
 
 		if(possible.len > 0)
@@ -218,7 +218,7 @@
 			var/y_distance = TO.y - FROM.y
 			var/x_distance = TO.x - FROM.x
 			for (var/atom/movable/A in urange(12, FROM )) // iterate thru list of mobs in the area
-				if(istype(A, /obj/item/device/beacon))
+				if(istype(A, /obj/item/beacon))
 					continue // don't teleport beacons because that's just insanely stupid
 				if(A.anchored)
 					continue

code/game/objects/effects/effect_system/effects_other.dm

@@ -88,8 +88,8 @@
 	auto_process = FALSE
 
 /datum/effect_system/trail_follow/ion/flight/set_dir(obj/effect/particle_effect/ion_trails/I)
-	if(istype(holder, /obj/item/device/flightpack))
-		var/obj/item/device/flightpack/F = holder
+	if(istype(holder, /obj/item/flightpack))
+		var/obj/item/flightpack/F = holder
 		if(istype(F.wearer))
 			I.setDir(F.wearer.dir)
 

code/game/objects/effects/spawners/bombspawner.dm

@@ -8,7 +8,7 @@
 
 /obj/effect/spawner/newbomb/Initialize()
 	. = ..()
-	var/obj/item/device/transfer_valve/V = new(src.loc)
+	var/obj/item/transfer_valve/V = new(src.loc)
 	var/obj/item/tank/internals/plasma/full/PT = new(V)
 	var/obj/item/tank/internals/oxygen/OT = new(V)
 
@@ -21,7 +21,7 @@
 	OT.master = V
 	
 	if(assembly_type)
-		var/obj/item/device/assembly/A = new assembly_type(V)
+		var/obj/item/assembly/A = new assembly_type(V)
 		V.attached_device = A
 		A.holder = V
 		A.toggle_secure()
@@ -31,16 +31,16 @@
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/spawner/newbomb/timer
-	assembly_type = /obj/item/device/assembly/timer
+	assembly_type = /obj/item/assembly/timer
 
 /obj/effect/spawner/newbomb/timer/syndicate
 	btemp1 = 150
 	btemp2 = 20
 
 /obj/effect/spawner/newbomb/proximity
-	assembly_type = /obj/item/device/assembly/prox_sensor
+	assembly_type = /obj/item/assembly/prox_sensor
 
 /obj/effect/spawner/newbomb/radio
-	assembly_type = /obj/item/device/assembly/signaler
+	assembly_type = /obj/item/assembly/signaler