The Great Conflictening 2.0: Removes /obj/item/device

code/modules/modular_computers/file_system/programs/command/comms.dm

@@ -223,8 +223,8 @@
 				var/mob/living/carbon/human/L = usr
 				var/obj/item/card = L.get_active_hand()
 				var/obj/item/card/id/I = (card && card.GetID()) || L.wear_id || L.wear_pda
-				if(istype(I, /obj/item/device/pda))
-					var/obj/item/device/pda/pda = I
+				if(istype(I, /obj/item/pda))
+					var/obj/item/pda/pda = I
 					I = pda.id
 				if(I && istype(I))
 					if(access_captain in I.access)

code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm

@@ -15,7 +15,7 @@
 	var/download_completion = 0 //GQ of downloaded data.
 	var/download_netspeed = 0
 	var/downloaderror = ""
-	var/obj/item/device/modular_computer/my_computer = null
+	var/obj/item/modular_computer/my_computer = null
 
 /datum/computer_file/program/ntnetdownload/proc/begin_file_download(filename)
 	if(downloaded_file)

code/modules/modular_computers/file_system/programs/research/airestorer.dm

@@ -52,7 +52,7 @@
 	..()
 	if(!restoring)	//Put the check here so we don't check for an ai all the time
 		return
-	var/obj/item/device/aicard/cardhold = get_ai(2)
+	var/obj/item/aicard/cardhold = get_ai(2)
 
 	var/obj/item/computer_hardware/ai_slot/ai_slot = get_ai(1)
 
@@ -93,7 +93,7 @@
 	// A shortcut for getting the AI stored inside the computer. The program already does necessary checks.
 	AI = get_ai()
 
-	var/obj/item/device/aicard/aicard = get_ai(2)
+	var/obj/item/aicard/aicard = get_ai(2)
 
 	if(!aicard)
 		data["nocard"] = TRUE
@@ -102,7 +102,7 @@
 		if(!AI)
 			data["error"] = "No AI located"
 		else
-			var/obj/item/device/aicard/cardhold = AI.loc
+			var/obj/item/aicard/cardhold = AI.loc
 			if(cardhold.flush)
 				data["error"] = "Flush in progress"
 			else