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

code/modules/mob/living/carbon/carbon.dm

@@ -446,7 +446,7 @@
 		var/obj/item/organ/alien/plasmavessel/vessel = getorgan(/obj/item/organ/alien/plasmavessel)
 		if(vessel)
 			stat(null, "Plasma Stored: [vessel.storedPlasma]/[vessel.max_plasma]")
-		if(locate(/obj/item/device/assembly/health) in src)
+		if(locate(/obj/item/assembly/health) in src)
 			stat(null, "Health: [health]")
 
 	add_abilities_to_panel()

code/modules/mob/living/carbon/carbon_movement.dm

@@ -1,6 +1,6 @@
 /mob/living/carbon/movement_delay()
 	var/FP = FALSE
-	var/obj/item/device/flightpack/F = get_flightpack()
+	var/obj/item/flightpack/F = get_flightpack()
 	if(istype(F) && F.flight)
 		FP = TRUE
 	. = ..(FP)
@@ -33,7 +33,7 @@
 	if(!isturf(loc))
 		return 0
 
-	var/obj/item/device/flightpack/F = get_flightpack()
+	var/obj/item/flightpack/F = get_flightpack()
 	if(istype(F) && (F.flight) && F.allow_thrust(0.01, src))
 		return 1
 

code/modules/mob/living/carbon/human/human.dm

@@ -852,7 +852,7 @@
 /mob/living/carbon/human/Collide(atom/A)
 	..()
 	var/crashdir = get_dir(src, A)
-	var/obj/item/device/flightpack/FP = get_flightpack()
+	var/obj/item/flightpack/FP = get_flightpack()
 	if(FP)
 		FP.flight_impact(A, crashdir)
 

code/modules/mob/living/carbon/human/human_helpers.dm

@@ -16,7 +16,7 @@
 	if(id)
 		. = id.assignment
 	else
-		var/obj/item/device/pda/pda = wear_id
+		var/obj/item/pda/pda = wear_id
 		if(istype(pda))
 			. = pda.ownjob
 		else
@@ -30,7 +30,7 @@
 	var/obj/item/card/id/id = get_idcard()
 	if(id)
 		return id.registered_name
-	var/obj/item/device/pda/pda = wear_id
+	var/obj/item/pda/pda = wear_id
 	if(istype(pda))
 		return pda.owner
 	return if_no_id
@@ -64,9 +64,9 @@
 //Useful when player is being seen by other mobs
 /mob/living/carbon/human/proc/get_id_name(if_no_id = "Unknown")
 	var/obj/item/storage/wallet/wallet = wear_id
-	var/obj/item/device/pda/pda = wear_id
+	var/obj/item/pda/pda = wear_id
 	var/obj/item/card/id/id = wear_id
-	var/obj/item/device/modular_computer/tablet/tablet = wear_id
+	var/obj/item/modular_computer/tablet/tablet = wear_id
 	if(istype(wallet))
 		id = wallet.front_id
 	if(istype(id))

code/modules/mob/living/carbon/human/life.dm

@@ -48,7 +48,7 @@
 		return ONE_ATMOSPHERE
 	if(istype(loc, /obj/belly))
 		return ONE_ATMOSPHERE
-	if(istype(loc, /obj/item/device/dogborg/sleeper))
+	if(istype(loc, /obj/item/dogborg/sleeper))
 		return ONE_ATMOSPHERE
 	else
 		return pressure
@@ -126,7 +126,7 @@
 /mob/living/carbon/human/proc/get_thermal_protection()
 	var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures
 	//CITADEL EDIT Vore code required overrides
-	if(istype(loc, /obj/item/device/dogborg/sleeper))
+	if(istype(loc, /obj/item/dogborg/sleeper))
 		return FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
 	if(ismob(loc))
 		return FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
@@ -241,7 +241,7 @@
 	if(has_trait(TRAIT_RESISTCOLD))
 		return TRUE
 //CITADEL EDIT Mandatory for vore code.
-	if(istype(loc, /obj/item/device/dogborg/sleeper))
+	if(istype(loc, /obj/item/dogborg/sleeper))
 		return TRUE //freezing to death in sleepers ruins fun.
 	if(isbelly(loc))
 		return TRUE

code/modules/mob/living/carbon/human/say.dm

@@ -69,7 +69,7 @@
 
 /mob/living/carbon/human/binarycheck()
 	if(ears)
-		var/obj/item/device/radio/headset/dongle = ears
+		var/obj/item/radio/headset/dongle = ears
 		if(!istype(dongle))
 			return 0
 		if(dongle.translate_binary)

code/modules/mob/living/carbon/human/species.dm

@@ -1019,7 +1019,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 				if(!disable_warning)
 					to_chat(H, "The [I.name] is too big to attach.") //should be src?
 				return FALSE
-			if( istype(I, /obj/item/device/pda) || istype(I, /obj/item/pen) || is_type_in_list(I, H.wear_suit.allowed) )
+			if( istype(I, /obj/item/pda) || istype(I, /obj/item/pen) || is_type_in_list(I, H.wear_suit.allowed) )
 				return TRUE
 			return FALSE
 		if(slot_handcuffed)
@@ -1205,7 +1205,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/flightpack = 0
 	var/ignoreslow = 0
 	var/gravity = 0
-	var/obj/item/device/flightpack/F = H.get_flightpack()
+	var/obj/item/flightpack/F = H.get_flightpack()
 	if(istype(F) && F.flight)
 		flightpack = 1
 	if(H.movement_type & FLYING)

code/modules/mob/living/carbon/human/species_types/humans.dm

@@ -25,7 +25,7 @@
 	. = ..()
 
 /datum/species/human/space_move(mob/living/carbon/human/H)
-	var/obj/item/device/flightpack/F = H.get_flightpack()
+	var/obj/item/flightpack/F = H.get_flightpack()
 	if(istype(F) && (F.flight) && F.allow_thrust(0.01, src))
 		return TRUE
 

code/modules/mob/living/carbon/human/species_types/shadowpeople.dm

@@ -203,8 +203,8 @@
 			disintegrate(I)
 
 /obj/item/light_eater/proc/disintegrate(obj/item/O)
-	if(istype(O, /obj/item/device/pda))
-		var/obj/item/device/pda/PDA = O
+	if(istype(O, /obj/item/pda))
+		var/obj/item/pda/PDA = O
 		PDA.set_light(0)
 		PDA.fon = FALSE
 		PDA.f_lum = 0

code/modules/mob/living/carbon/human/whisper.dm

@@ -76,14 +76,14 @@
 	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"[attach_spans(message, spans)]\"</span></span>"
 
 	for(var/atom/movable/AM in listening)
-		if(istype(AM,/obj/item/device/radio))
+		if(istype(AM,/obj/item/radio))
 			continue
 		AM.Hear(rendered, src, language, message, , spans)
 
 	message = stars(message)
 	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"[attach_spans(message, spans)]\"</span></span>"
 	for(var/atom/movable/AM in eavesdropping)
-		if(istype(AM,/obj/item/device/radio))
+		if(istype(AM,/obj/item/radio))
 			continue
 		AM.Hear(rendered, src, language, message, , spans)
 

code/modules/mob/living/carbon/life.dm

@@ -48,7 +48,7 @@
 		return
 	if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
 		return
-	if(istype(loc, /obj/item/device/dogborg/sleeper))
+	if(istype(loc, /obj/item/dogborg/sleeper))
 		return
 	if(ismob(loc))
 		return